- Timestamp:
- Aug 19, 2008 12:22:48 PM (16 years ago)
- Location:
- trunk
- Files:
-
- 3 edited
-
Config.kmk (modified) (4 diffs)
-
src/VBox/Frontends/VirtualBox4/Makefile.kmk (modified) (1 diff)
-
src/libs/xpcom18a4/Makefile.kmk (modified) (10 diffs)
Legend:
- Unmodified
- Added
- Removed
-
trunk/Config.kmk
r11414 r11482 2058 2058 TEMPLATE_VBOXR3_DEFS.l4 = $(TEMPLATE_VBOXR3EXE_DEFS.l4) __PIC__ 2059 2059 TEMPLATE_VBOXR3_DEFS.darwin = $(TEMPLATE_VBOXR3EXE_DEFS.darwin) PIC 2060 TEMPLATE_VBOXR3_LDFLAGS.darwin = $(TEMPLATE_VBOXR3EXE_LDFLAGS.darwin) -current_version $(VBOX_VERSION_MAJOR).$(VBOX_VERSION_MINOR).$(VBOX_VERSION_BUILD) 2060 2061 ifeq ($(filter-out solaris.x86 %.amd64,$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH)),) 2061 ifn eq ($(KBUILD_TARGET),win)2062 ifn1of ($(KBUILD_TARGET), darwin win) 2062 2063 TEMPLATE_VBOXR3_DEFS = $(TEMPLATE_VBOXR3EXE_DEFS) PIC 2063 2064 TEMPLATE_VBOXR3_CFLAGS = $(TEMPLATE_VBOXR3EXE_CFLAGS) -fPIC … … 2354 2355 TEMPLATE_VBOXMAINDLL_EXTENDS = VBOXMAINEXE 2355 2356 ifeq ($(filter-out solaris.x86 %.amd64,$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH)),) 2356 ifn eq ($(KBUILD_TARGET),win)2357 ifn1of ($(KBUILD_TARGET), darwin win) 2357 2358 TEMPLATE_VBOXMAINDLL_DEFS = PIC $(TEMPLATE_VBOXMAINEXE_DEFS) 2358 2359 TEMPLATE_VBOXMAINDLL_CFLAGS = -fPIC $(TEMPLATE_VBOXMAINEXE_CFLAGS) … … 2362 2363 endif 2363 2364 ifeq ($(KBUILD_TARGET),darwin) 2364 TEMPLATE_VBOXMAINDLL_LDFLAGS = $(filter-out -bind_at_load,$(TEMPLATE_VBOXMAINEXE_LDFLAGS)) 2365 TEMPLATE_VBOXMAINDLL_LDFLAGS = $(filter-out -bind_at_load,$(TEMPLATE_VBOXMAINEXE_LDFLAGS)) \ 2366 -current_version $(VBOX_VERSION_MAJOR).$(VBOX_VERSION_MINOR).$(VBOX_VERSION_BUILD) 2365 2367 endif 2366 2368 … … 2568 2570 TEMPLATE_VBOXQTGUI_LIBS = $(filter-out $(QTMAIN),$(TEMPLATE_VBOXQTGUIEXE_LIBS)) 2569 2571 ifeq ($(KBUILD_TARGET),darwin) 2570 TEMPLATE_VBOXQTGUI_LDFLAGS = $(filter-out -framework Carbon -framework QuickTime -bind_at_load,$(TEMPLATE_VBOXQTGUIEXE_LDFLAGS)) 2572 TEMPLATE_VBOXQTGUI_LDFLAGS = $(filter-out -framework Carbon -framework QuickTime -bind_at_load,$(TEMPLATE_VBOXQTGUIEXE_LDFLAGS)) \ 2573 -current_version $(VBOX_VERSION_MAJOR).$(VBOX_VERSION_MINOR).$(VBOX_VERSION_BUILD) 2571 2574 endif 2572 2575 ifeq ($(filter-out solaris.x86 %.amd64,$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH)),) -
trunk/src/VBox/Frontends/VirtualBox4/Makefile.kmk
r11422 r11482 259 259 TEMPLATE_VBOXQT4GUI_LIBS = $(filter-out $(QTMAIN),$(TEMPLATE_VBOXQT4GUIEXE_LIBS)) 260 260 ifeq ($(KBUILD_TARGET),darwin) 261 TEMPLATE_VBOXQT4GUI_LDFLAGS = $(filter-out -framework Carbon -framework QuickTime -bind_at_load,$(TEMPLATE_VBOXQT4GUIEXE_LDFLAGS)) 261 TEMPLATE_VBOXQT4GUI_LDFLAGS = $(filter-out -framework Carbon -framework QuickTime -bind_at_load,$(TEMPLATE_VBOXQT4GUIEXE_LDFLAGS)) \ 262 -current_version $(VBOX_VERSION_MAJOR).$(VBOX_VERSION_MINOR).$(VBOX_VERSION_BUILD) 262 263 endif 263 264 ifeq ($(filter-out solaris.x86 %.amd64,$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH)),) -
trunk/src/libs/xpcom18a4/Makefile.kmk
r11469 r11482 34 34 XPCOM_PYMOD = VBox-xpcom-pymod VBox-xpcom-helper 35 35 # bridge between PYMOD and VirtualBox, to minimize mods 36 XPCOM_VBOX_HELPER =VBox-xpcom-helper37 PYTHON_LIBS 36 XPCOM_VBOX_HELPER = VBox-xpcom-helper 37 PYTHON_LIBS = python2.5 38 38 endif 39 39 … … 96 96 TEMPLATE_XPCOM_LDFLAGS.darwin = $(TEMPLATE_VBOXR3NP_LDFLAGS.darwin) \ 97 97 -fshort-wchar -fno-rtti -fno-exceptions -fpascal-strings \ 98 -framework CoreServices -framework CoreFoundation -framework Foundation -framework AppKit -framework Carbon 98 -framework CoreServices -framework CoreFoundation -framework Foundation -framework AppKit -framework Carbon \ 99 -current_version $(VBOX_VERSION_MAJOR).$(VBOX_VERSION_MINOR).$(VBOX_VERSION_BUILD) 99 100 ifn1of ($(KBUILD_TARGET), os2 win) 100 101 TEMPLATE_XPCOM_CXXFLAGS += -fPIC … … 169 170 TEMPLATE_XPCOMEXE_LIBS.linux = dl $(LIB_PTHREAD) 170 171 TEMPLATE_XPCOMEXE_LIBS.l4 = $(LIB_RUNTIME) $(VBOX_GCC_LIBGCC) 171 TEMPLATE_XPCOMEXE_LDFLAGS.darwin = -bind_at_load $( TEMPLATE_XPCOM_LDFLAGS.darwin)172 TEMPLATE_XPCOMEXE_LDFLAGS.darwin = -bind_at_load $(filter-out -current_version $(VBOX_VERSION_MAJOR).$(VBOX_VERSION_MINOR).$(VBOX_VERSION_BUILD),$(TEMPLATE_XPCOM_LDFLAGS.darwin)) 172 173 TEMPLATE_XPCOMEXE_LDFLAGS.l4 = $(L4_DIR)/lib/x86_586/crt0.o \ 173 174 -T$(L4_DIR)/lib/x86_586/main_dyn.ld -nostdlib -lgcc \ … … 187 188 ## @todo Verify that this doesn't blow up because of template inheriance ordering. (we're assuming XPCOMEXE is expanded when this is being used.) 188 189 189 TEMPLATE_XPCOMBLDPROG_DEFS = $(TEMPLATE_BLDPROG_DEFS) $(TEMPLATE_XPCOMEXE_DEFS)190 TEMPLATE_XPCOMBLDPROG_DEFS = $(TEMPLATE_BLDPROG_DEFS) $(TEMPLATE_XPCOMEXE_DEFS) 190 191 TEMPLATE_XPCOMBLDPROG_DEFS.$(KBUILD_TARGET) = $(TEMPLATE_BLDPROG_DEFS.$(KBUILD_TARGET)) $(TEMPLATE_XPCOMEXE_DEFS.$(KBUILD_TARGET)) 191 192 TEMPLATE_XPCOMBLDPROG_DEFS.$(KBUILD_TARGET_ARCH) = $(TEMPLATE_BLDPROG_DEFS.$(KBUILD_TARGET_ARCH)) $(TEMPLATE_XPCOMEXE_DEFS.$(KBUILD_TARGET_ARCH)) … … 265 266 VBoxXPCOM \ 266 267 VBoxXPCOMIPCC \ 267 268 $(XPCOM_PYMOD) 268 269 269 270 ifdef VBOX_WITH_TESTCASES … … 1123 1124 $(TARGET_VBox-xpcom-nspr) \ 1124 1125 $(TARGET_$(XPCOM_PYTHON)) \ 1125 $(PYTHON_LIBS)\1126 $(TARGET_VBoxXPCOMGlue_s) 1126 $(PYTHON_LIBS) \ 1127 $(TARGET_VBoxXPCOMGlue_s) 1127 1128 1128 1129 ifeq ($(filter-out freebsd l4 linux netbsd openbsd,$(KBUILD_TARGET)),) # gnu ld. … … 1262 1263 1263 1264 1265 # 1264 1266 # Python XPCOM bindings 1267 # 1265 1268 VBox-xpcom-python_TEMPLATE = XPCOM 1266 1269 VBox-xpcom-python_NOINST = 1 1267 1270 VBox-xpcom-python_DEFS = _IMPL_NS_COM _IMPL_NS_BASE EXPORT_XPTI_API EXPORT_XPT_API VBOX_PYXPCOM 1268 1271 VBox-xpcom-python_INCS += /usr/include/python2.5 1269 VBox-xpcom-python_SOURCES = 1270 python/src/dllmain.cpp 1271 python/src/ErrorUtils.cpp\1272 python/src/PyGBase.cpp\1273 python/src/PyGInputStream.cpp\1274 python/src/PyGModule.cpp\1275 python/src/PyGStub.cpp\1276 python/src/PyGWeakReference.cpp\1277 python/src/PyIClassInfo.cpp\1278 python/src/PyIComponentManager.cpp\1279 python/src/PyIComponentManagerObsolete.cpp\1280 python/src/PyIEnumerator.cpp\1281 python/src/PyIID.cpp\1282 python/src/PyIInputStream.cpp\1283 python/src/PyIInterfaceInfo.cpp\1284 python/src/PyIInterfaceInfoManager.cpp\1285 python/src/PyISimpleEnumerator.cpp\1286 python/src/PyISupports.cpp\1287 python/src/PyIVariant.cpp\1288 python/src/Pyxpt_info.cpp\1289 python/src/TypeObject.cpp\1290 python/src/VariantUtils.cpp \ 1272 VBox-xpcom-python_SOURCES = \ 1273 python/src/dllmain.cpp \ 1274 python/src/ErrorUtils.cpp \ 1275 python/src/PyGBase.cpp \ 1276 python/src/PyGInputStream.cpp \ 1277 python/src/PyGModule.cpp \ 1278 python/src/PyGStub.cpp \ 1279 python/src/PyGWeakReference.cpp \ 1280 python/src/PyIClassInfo.cpp \ 1281 python/src/PyIComponentManager.cpp \ 1282 python/src/PyIComponentManagerObsolete.cpp \ 1283 python/src/PyIEnumerator.cpp \ 1284 python/src/PyIID.cpp \ 1285 python/src/PyIInputStream.cpp \ 1286 python/src/PyIInterfaceInfo.cpp \ 1287 python/src/PyIInterfaceInfoManager.cpp \ 1288 python/src/PyISimpleEnumerator.cpp \ 1289 python/src/PyISupports.cpp \ 1290 python/src/PyIVariant.cpp \ 1291 python/src/Pyxpt_info.cpp \ 1292 python/src/TypeObject.cpp \ 1293 python/src/VariantUtils.cpp 1291 1294 1292 1295 … … 1294 1297 VBox-xpcom-helper_TEMPLATE = VBOXMAINCLIENTDLL 1295 1298 VBox-xpcom-helper_NAME = VBoxHlp 1296 VBox-xpcom-helper_DEFS = 1297 VBox-xpcom-helper_SOURCES = 1298 1299 VBox-xpcom-helper_DEFS = 1300 VBox-xpcom-helper_SOURCES = \ 1301 python/src/module/helper.cpp 1299 1302 1300 1303 # Python Client Module 1301 PY_PATH =sdk/bindings/com/python/xpcom1302 PY_DEST =$(PATH_BIN)/$(PY_PATH)1303 PY_SAMPLE =$(PATH_BIN)/sdk/bindings/com/python/sample1304 PY_PATH = sdk/bindings/com/python/xpcom 1305 PY_DEST = $(PATH_BIN)/$(PY_PATH) 1306 PY_SAMPLE = $(PATH_BIN)/sdk/bindings/com/python/sample 1304 1307 1305 1308 VBox-xpcom-pymod_TEMPLATE = XPCOM … … 1309 1312 VBox-xpcom-pymod_DEFS = _IMPL_NS_COM _IMPL_NS_BASE EXPORT_XPTI_API EXPORT_XPT_API VBOX_PYXPCOM 1310 1313 VBox-xpcom-pymod_INCS += /usr/include/python2.5 python/src 1311 VBox-xpcom-pymod_SOURCES = 1312 python/src/module/_xpcom.cpp 1314 VBox-xpcom-pymod_SOURCES = \ 1315 python/src/module/_xpcom.cpp 1313 1316 VBox-xpcom-pymod_LIBS = $(TARGET_VBox-xpcom-helper) 1314 1317 VBox-xpcom-pymod_LDFLAGS += $(PATH_BIN)/VBoxXPCOM.so 1315 VBox-xpcom-pymod_DEPS = 1316 $(PY_DEST)/components.py\1317 $(PY_DEST)/file.py 1318 $(PY_DEST)/__init__.py 1319 $(PY_DEST)/nsError.py 1320 $(PY_DEST)/primitives.py 1321 $(PY_DEST)/xpcom_consts.py 1322 $(PY_DEST)/xpt.py\1323 $(PY_DEST)/client/__init__.py 1324 $(PY_DEST)/server/__init__.py 1318 VBox-xpcom-pymod_DEPS = \ 1319 $(PY_DEST)/components.py \ 1320 $(PY_DEST)/file.py \ 1321 $(PY_DEST)/__init__.py \ 1322 $(PY_DEST)/nsError.py \ 1323 $(PY_DEST)/primitives.py \ 1324 $(PY_DEST)/xpcom_consts.py \ 1325 $(PY_DEST)/xpt.py \ 1326 $(PY_DEST)/client/__init__.py \ 1327 $(PY_DEST)/server/__init__.py \ 1325 1328 $(PY_DEST)/server/enumerator.py \ 1326 $(PY_DEST)/server/factory.py 1327 $(PY_DEST)/server/loader.py 1328 $(PY_DEST)/server/module.py 1329 $(PY_DEST)/server/policy.py 1330 $(PY_SAMPLE)/vbox.py 1329 $(PY_DEST)/server/factory.py \ 1330 $(PY_DEST)/server/loader.py \ 1331 $(PY_DEST)/server/module.py \ 1332 $(PY_DEST)/server/policy.py \ 1333 $(PY_SAMPLE)/vbox.py \ 1331 1334 $(TARGET_VBox-xpcom-helper) 1332 1335 1333 1336 $(PY_DEST): 1334 $(QUIET)$(MKDIR) -p $@ 1335 $(QUIET)$(MKDIR) -p $(PY_SAMPLE) 1336 $(QUIET)$(MKDIR) -p $@/client 1337 $(QUIET)$(MKDIR) -p $@/server 1337 $(QUIET)$(MKDIR) -p -- \ 1338 $@ \ 1339 $(PY_SAMPLE) \ 1340 $@/client \ 1341 $@/server 1338 1342 1339 1343 $(PY_DEST)/%.py: $(PATH_SUB_CURRENT)/python/%.py $(PY_DEST) 1340 $(QUIET)$(CP) $< $@ 1344 $(QUIET)$(CP) -f -- $< $@ 1345 1341 1346 $(PY_SAMPLE)/%.py: $(PATH_SUB_CURRENT)/python/sample/%.py $(PY_DEST) 1342 $(QUIET)$(CP) $< $@1347 $(QUIET)$(CP) -f -- $< $@ 1343 1348 1344 1349 … … 1351 1356 ipc/ipcd/daemon/src/ipcCommandModule.cpp 1352 1357 ifeq ($(KBUILD_TARGET),win) 1353 VBoxXPCOMIPCD_SOURCES += \1354 ipc/ipcd/daemon/src/ipcdWin.cpp1358 VBoxXPCOMIPCD_SOURCES += \ 1359 ipc/ipcd/daemon/src/ipcdWin.cpp 1355 1360 else 1356 VBoxXPCOMIPCD_SOURCES += \1357 ipc/ipcd/daemon/src/ipcdUnix.cpp1361 VBoxXPCOMIPCD_SOURCES += \ 1362 ipc/ipcd/daemon/src/ipcdUnix.cpp 1358 1363 endif 1359 1364
Note:
See TracChangeset
for help on using the changeset viewer.
