Changeset 957 in vbox for trunk/src/VBox/Frontends/VirtualBox/Makefile

Timestamp:

Feb 17, 2007 4:43:22 AM (18 years ago)

Author:

vboxsync

Message:

Qt portability.

File:

• trunk/src/VBox/Frontends/VirtualBox/Makefile (modified) (6 diffs)

trunk/src/VBox/Frontends/VirtualBox/Makefile

@@ -39 +39 @@
 VirtualBox_SDKS.win = WINPSDK DXSDK
 VirtualBox_SDKS.linux = LIBSDL
+VirtualBox_SDKS.darwin = LIBSDL
 
 
@@ -65 +66 @@
 
 # Sources containing local definitions of classes that use the Q_OBJECT macro
-ifeq ($(BUILD_TARGET),linux)
+ifneq ($(BUILD_TARGET),win)
 VirtualBox_QT_MOCSRCS = src/COMDefs.cpp
 endif
@@ -85 +86 @@
 
 
-VirtualBox_SOURCES    = \
+VirtualBox_SOURCES = \
         $(VirtualBox_GENSRCS) \
         src/main.cpp \
@@ -120 +121 @@
 endif
 
-VirtualBox_CXXFLAGS.win = \
-        -nologo -Zm200 -W3 -MD -EHsc -DUNICODE -DQT_DLL -DQT_THREAD_SUPPORT -DQT_NO_DEBUG
-VirtualBox_CXXFLAGS.linux = \
-        -DQT_NO_DEBUG -DQT_THREAD_SUPPORT -D_REENTRANT
-
+VirtualBox_DEFS           = VBOX_GUI_SEPARATE_VM_PROCESS
 VirtualBox_DEFS.debug     = VBOX_GUI_DEBUG VBOX_CHECK_STATE # QT_FATAL_ASSERT
-VirtualBox_DEFS           += VBOX_GUI_SEPARATE_VM_PROCESS
-
+VirtualBox_DEFS.win       = UNICODE QT_DLL
 ifeq ($(BUILD_TYPE),release)
-VirtualBox_DEFS.win       += VBOX_GUI_USE_QIMAGE
-VirtualBox_DEFS.linux     += VBOX_GUI_USE_SDL
+ VirtualBox_DEFS.win     += VBOX_GUI_USE_QIMAGE
+ VirtualBox_DEFS.linux   += VBOX_GUI_USE_SDL
+ VirtualBox_DEFS.darwin  += VBOX_GUI_USE_SDL
 else
-VirtualBox_DEFS           += VBOX_WITH_DEBUGGER_GUI_MENU
-VirtualBox_DEFS.win       += \
+ VirtualBox_DEFS         += VBOX_WITH_DEBUGGER_GUI_MENU
+ VirtualBox_DEFS.win     += \
         VBOX_GUI_USE_REFRESH_TIMER \
         VBOX_GUI_USE_QIMAGE \
         VBOX_GUI_USE_DDRAW
-VirtualBox_DEFS.linux     += \
+ VirtualBox_DEFS.linux   += \
         VBOX_GUI_USE_REFRESH_TIMER \
         VBOX_GUI_USE_QIMAGE \
         VBOX_GUI_USE_SDL
-endif
-
+ VirtualBox_DEFS.darwin  += \
+        VBOX_GUI_USE_REFRESH_TIMER \
+        VBOX_GUI_USE_QIMAGE \
+        VBOX_GUI_USE_SDL
+endif
+ifdef VBOX_WITH_ALSA
+ VirtualBox_DEFS         += VBOX_WITH_ALSA
+endif
 ifdef VBOX_OSE
- VirtualBox_DEFS          += VBOX_OSE
-endif
-ifdef VBOX_WITH_ALSA
- VirtualBox_DEFS          += VBOX_WITH_ALSA
+ VirtualBox_DEFS         += VBOX_OSE
 endif
 
@@ -160 +160 @@
  VirtualBox_LDFLAGS.win  += /SUBSYSTEM:windows
 else
- VirtualBox_LDFLAGS.linux += -rdynamic # for backtrace_symbols()
+ VirtualBox_LDFLAGS.linux+= -rdynamic # for backtrace_symbols()
  ifeq ($(USERNAME),dmik)
   VirtualBox_LDFLAGS.win += /SUBSYSTEM:windows
@@ -167 +167 @@
  endif
 endif
-VirtualBox_LIBS.win   = \
+VirtualBox_LIBS.win       = \
         $(PATH_SDK_WINPSDK_LIB)/Htmlhelp.Lib \
         $(PATH_SDK_DXSDK_LIB)/ddraw.lib \
         $(PATH_SDK_DXSDK_LIB)/dxguid.lib
 
-VirtualBox_LIBS.linux     = \
-        $(LIB_QT) Xext X11 m $(LIB_PTHREAD) \
-        $(PATH_LIB)/VBoxXPCOM$(VBOX_SUFF_LIB) \
-        $(LIB_RUNTIME) \
-        $(PATH_BIN)/VBoxXML.so \
-        $(LIB_REM) \
-        $(LIB_VMM) \
-        $(PATH_BIN)/VBoxXPCOM.so \
-        $(PATH_LIB)/VBoxXPCOMGlue$(VBOX_SUFF_LIB)
-
 ifdef VBOX_WITH_DEBUGGER_GUI
-VirtualBox_LIBS.win   += $(PATH_LIB)/VBoxDbg.lib
-VirtualBox_LIBS.linux += $(PATH_DLL)/VBoxDbg.so
+ ifeq ($(BUILD_TARGET),win)
+  VirtualBox_LIBS        += $(PATH_LIB)/VBoxDbg$(VBOX_SUFF_LIB)
+ else
+  VirtualBox_LIBS        += $(PATH_DLL)/VBoxDbg$(VBOX_SUFF_DLL)
+ endif
 endif