- Timestamp:
- Jul 3, 2007 10:32:10 PM (17 years ago)
- Location:
- trunk
- Files:
-
- 3 edited
-
Config.kmk (modified) (5 diffs)
-
Makefile.kmk (modified) (3 diffs)
-
src/VBox/Frontends/VirtualBox/Makefile.kmk (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
-
trunk/Config.kmk
r3401 r3405 270 270 271 271 # Most stuff doesn't build yet on the new targets. 272 ifeq ($(filter-out os2 freebsd solaris,$(BUILD_TARGET)),) 272 ifeq ($(BUILD_TARGET),os2) 273 VBOX_WITH_DEBUGGER_GUI= 274 VBOX_WITH_INSTALLER= 275 VBOX_WITH_SECURELABEL= 276 VBOX_WITH_VRDP= 277 VBOX_WITH_VRDP_AUTHMOD= 278 VBOX_WITH_VRDP_RDESKTOP= 279 VBOX_WITH_TESTSUITE= 280 VBOX_WITH_USB= 281 VBOX_WITH_DOCS= 282 endif 283 284 # Most stuff doesn't build yet on the new targets. 285 ifeq ($(filter-out freebsd solaris,$(BUILD_TARGET)),) 273 286 #VBOX_WITH_VBOXBFE= 274 287 VBOX_WITH_MAIN= … … 788 801 ifneq ($(BUILD_TARGET),win) 789 802 VBOX_WITH_XPCOM = 1 790 VBOX_XPIDL ?= $( PATH_OBJ)/src/libs/xpcom18a4/xpidl/xpidl$(HOSTSUFF_EXE)803 VBOX_XPIDL ?= $(VBOX_PATH_SDK)/bin/xpidl$(HOSTSUFF_EXE) 791 804 VBOX_PATH_XPCOM_IDL ?= $(VBOX_PATH_SDK)/idl 792 805 VBOX_XPCOM_INCS ?= \ … … 804 817 endif 805 818 endif 819 820 ## @todo isn't worth to teach kmk_ash.exe to do the following for every .EXE it runs? 821 ifeq ($(BUILD_TARGET),os2) 822 VBOX_XPIDL := cmd.exe /c "set BEGINLIBPATH=$(dir $(VBOX_XPIDL)) & $(VBOX_XPIDL)" 823 endif 824 #$(error $(VBOX_XPIDL)) 806 825 807 826 # The X11 LIBPATH. (The amd64 hack is for RHEL4.) … … 1085 1104 QTDIR := $(call lastword,$(QTDIR)) 1086 1105 endif 1087 1106 else ifeq ($(BUILD_TARGET),os2) 1107 QTDIR ?= $(PATH_DEVTOOLS_TRG)/qt/v3.3.1 1108 VBOX_PATH_QT ?= $(QTDIR) 1109 LIB_QT ?= $(lastword $(sort $(wildcard $(VBOX_PATH_QT)/lib/qt331*.lib))) 1110 QTDIR := $(VBOX_PATH_QT) 1088 1111 else ifeq ($(BUILD_TARGET),darwin) 1089 1112 ifndef VBOX_PATH_QT … … 1116 1139 VBOX_LUPDATE ?= $(VBOX_PATH_QT_HOST)/bin/lupdate$(HOSTSUFF_EXE) 1117 1140 VBOX_LRELEASE ?= $(VBOX_PATH_QT_HOST)/bin/lrelease$(HOSTSUFF_EXE) 1141 1142 ## @todo isn't worth to teach kmk_ash.exe to do the following for every .EXE it runs? 1143 ifeq ($(BUILD_TARGET),os2) 1144 VBOX_UIC := cmd.exe /c "set BEGINLIBPATH=$(dir $(VBOX_UIC)) & $(VBOX_UIC)" 1145 VBOX_MOC := cmd.exe /c "set BEGINLIBPATH=$(dir $(VBOX_MOC)) & $(VBOX_MOC)" 1146 VBOX_LUPDATE := cmd.exe /c "set BEGINLIBPATH=$(dir $(VBOX_LUPDATE)) & $(VBOX_LUPDATE)" 1147 VBOX_LRELEASE := cmd.exe /c "set BEGINLIBPATH=$(dir $(VBOX_LRELEASE)) & $(VBOX_LRELEASE)" 1148 endif 1118 1149 1119 1150 # -
trunk/Makefile.kmk
r3150 r3405 56 56 endif 57 57 58 58 59 # The Qt DLLs. 59 #ifeq ($(filter-out win os2,$(BUILD_TARGET)),) 60 ifeq ($(filter-out win,$(BUILD_TARGET)),) 61 ifneq ($(VBOX_WITH_QTGUI),) 60 ifneq ($(VBOX_WITH_QTGUI),) 61 ifeq ($(BUILD_TARGET),win) 62 62 #include $(PATH_KBUILD)/sdks/QT3.kmk 63 63 #bin_SOURCES += \ … … 74 74 $(VBOX_DLL_QT)=>$(not-dir $(VBOX_DLL_QT)) 75 75 endif 76 endif 77 endif 78 79 # The GLIB and LIBIDL DLLs. 80 ifeq ($(filter-out os2,$(BUILD_TARGET)),) 81 # static libraries of these may be provided instead, 82 # so copy DLLs only when they are present 83 bin_SOURCES += $(wildcard $(VBOX_PATH_GLIB)/lib/glib.dll) 84 bin_SOURCES += $(wildcard $(VBOX_PATH_LIBIDL)/lib/libIDL.dll) 85 endif 86 87 ifeq ($(BUILD_TARGET),darwin) 88 ifneq ($(VBOX_WITH_QTGUI),) 76 else ifeq ($(BUILD_TARGET),os2) 77 VBOX_DLL_QT ?= $(lastword $(sort $(wildcard $(VBOX_PATH_QT)/bin/qt*.dll))) 78 ifdef VBOX_DLL_QT 79 bin_SOURCES += \ 80 $(VBOX_DLL_QT)=>$(not-dir $(VBOX_DLL_QT)) 81 endif 82 else ifeq ($(BUILD_TARGET),darwin) 89 83 ifdef LIB_QT 90 84 bin_SOURCES += \ … … 93 87 endif 94 88 endif 89 95 90 96 91 # The compiler runtime DLLs. -
trunk/src/VBox/Frontends/VirtualBox/Makefile.kmk
r3401 r3405 84 84 # Sources containing local definitions of classes that use the Q_OBJECT macro 85 85 VirtualBox_QT_MOCSRCS = src/VBoxSelectorWnd.cpp 86 if neq ($(BUILD_TARGET),win)86 ifdef VBOX_WITH_XPCOM 87 87 VirtualBox_QT_MOCSRCS += src/COMDefs.cpp 88 88 endif … … 159 159 ## @todo GCC3 seems to lack -Wno-missing-base-class-initializer, so we use 160 160 # more generic -Wno-extra 161 if neq ($(BUILD_TARGET),win)161 ifdef VBOX_WITH_XPCOM 162 162 src/COMDefs.cpp_CXXFLAGS = $(VBOX_GCC_Wno-extra) 163 163 endif
Note:
See TracChangeset
for help on using the changeset viewer.

