Changeset 960 in vbox for trunk/Config.kmk

Timestamp:

Feb 17, 2007 9:12:10 AM (18 years ago)

Author:

vboxsync

Message:

Darwin hacking.

File:

• trunk/Config.kmk (modified) (6 diffs)

trunk/Config.kmk

@@ -49 +49 @@
 # Install paths.
 PATH_INS            := $(PATH_OUT)
-PATH_BIN             = $(PATH_INS)/bin
-PATH_DLL             = $(PATH_INS)/bin
-PATH_SYS             = $(PATH_INS)/bin
-PATH_LIB             = $(PATH_INS)/lib
-PATH_DOC             = $(PATH_INS)/doc
-INST_TESTCASE        = bin/testcase/
-INST_ADDITIONS       = bin/additions/
-INST_ADDITIONS_LIB   = lib/additions/
-INST_SDK             = bin/sdk
-INST_SDK_SAMPLES     = $(INST_SDK)/samples
+ifeq ($(BUILD_TARGET),darwin)
+ INST_DIST            = dist/
+ INST_SDK             = $(INST_DIST)sdk/
+ INST_SDK_SAMPLES     = $(INST_SDK)samples
+
+ # the bundles
+ INST_VIRTUALBOX      = $(INST_DIST)VirtualBox.app/
+ INST_VBOXDRV         = $(INST_DIST)VBoxDrv.kext/
+ INST_VBOXTAP         = $(INST_DIST)VBoxTAP.kext/
+ INST_VBOXUSB         = $(INST_DIST)VBoxUSB.kext/
+
+ # put everything in the VirtualBox app bundle.
+ INST_BIN             = $(INST_VIRTUALBOX)Contents/MacOS/
+ INST_DLL             = $(INST_BIN)
+ INST_SYS             = $(INST_BIN)
+ INST_TESTCASE        = $(INST_BIN)testcase/
+ INST_ADDITIONS       = $(INST_BIN)MacOS/additions/
+
+ # other paths
+ INST_LIB             = lib/
+ INST_ADDITIONS_LIB   = $(PATH_LIB)/additions/
+
+else
+
+ INST_BIN             = bin/
+ INST_DIST            = $(INST_BIN)
+ INST_DLL             = $(INST_BIN)
+ INST_SDK             = $(INST_BIN)sdk/
+ INST_SDK_SAMPLES     = $(INST_SDK)samples
+ INST_DLL             = $(INST_BIN)
+ INST_SYS             = $(INST_BIN)
+ INST_TESTCASE        = $(INST_BIN)testcase/
+ INST_ADDITIONS       = $(INST_BIN)additions/
+
+ INST_LIB             = lib/
+ INST_ADDITIONS_LIB   = $(INST_LIB)additions/
+endif
+
+PATH_BIN              = $(patsubst %/,%,$(PATH_INS)/$(INST_BIN))
+PATH_DLL              = $(patsubst %/,%,$(PATH_INS)/$(INST_DLL))
+PATH_SYS              = $(patsubst %/,%,$(PATH_INS)/$(INST_SYS))
+PATH_LIB              = $(patsubst %/,%,$(PATH_INS)/$(INST_LIB))
+PATH_DOC              = $(PATH_OUT)/doc
+VBOX_PATH_SDK         = $(patsubst %/,%,$(PATH_INS)/$(INST_SDK))
+
+
 
 # Delete targets on failure.
@@ -602 +638 @@
  LIB_VMM         = $(PATH_BIN)/VBoxVMM.dylib
  LIB_VMMGC       = $(PATH_BIN)/VMMGC.gc
- LIB_REM         = $(PATH_BIN)/VBoxREMImp.dylib
+ LIB_REM         = $(PATH_LIB)/VBoxREMImp.dylib
 endif
 ifeq ($(BUILD_TARGET),l4)
@@ -701 +737 @@
  VBOX_WITH_XPCOM      = 1
  VBOX_XPIDL          ?= $(PATH_OBJ)/src/libs/xpcom18a4/xpidl/xpidl$(HOSTSUFF_EXE)
- VBOX_PATH_XPCOM_IDL ?= $(PATH_BIN)/sdk/idl
+ VBOX_PATH_XPCOM_IDL ?= $(VBOX_PATH_SDK)/idl
  VBOX_XPCOM_INCS     ?= \
-        $(PATH_BIN)/sdk/include \
-        $(PATH_BIN)/sdk/include/xpcom \
-        $(PATH_BIN)/sdk/include/xpcom/nsprpub \
-        $(PATH_BIN)/sdk/include/xpcom/string \
-        $(PATH_BIN)/sdk/include/xpcom/xpcom \
-        $(PATH_BIN)/sdk/include/xpcom/ipcd
+        $(VBOX_PATH_SDK)/include \
+        $(VBOX_PATH_SDK)/include/xpcom \
+        $(VBOX_PATH_SDK)/include/xpcom/nsprpub \
+        $(VBOX_PATH_SDK)/include/xpcom/string \
+        $(VBOX_PATH_SDK)/include/xpcom/xpcom \
+        $(VBOX_PATH_SDK)/include/xpcom/ipcd
  # libIDL-config (for xpcom18a4)
  ifeq ($(origin VBOX_LIBIDL_CONFIG),undefined)
@@ -1523 +1559 @@
 TEMPLATE_VBOXMAINCLIENT_EXTENDS     = VBOXMAINEXE
 TEMPLATE_VBOXMAINCLIENT_INCS        = $(TEMPLATE_VBOXMAINEXE_INCS) \
-        $(PATH_BIN)/sdk/include
+        $(VBOX_PATH_SDK)/include
 ifdef VBOX_WITH_XPCOM
 TEMPLATE_VBOXMAINCLIENT_INCS       += \
@@ -1564 +1600 @@
 TEMPLATE_VBOXQTGUIEXE_DEFS = IN_RING3 QT_NO_DEBUG QT_THREAD_SUPPORT $(ARCH_BITS_DEFS)
 TEMPLATE_VBOXQTGUIEXE_INCS = \
-        $(PATH_BIN)/sdk/include \
+        $(VBOX_PATH_SDK)/include \
         $(VBOX_PATH_QT)/include
 
@@ -1785 +1821 @@
 TEMPLATE_VBOXW32GUESTR3_CFLAGS.kprofile     = $(TEMPLATE_VBOXW32GUESTR3_CXXFLAGS.kprofile)
 TEMPLATE_VBOXW32GUESTR3_INCS                = \
-        $(PATH_BIN)/sdk/include
+        $(VBOX_PATH_SDK)/include
 TEMPLATE_VBOXW32GUESTR3_LDFLAGS             = \
         /NOD /INCREMENTAL:NO /MAPINFO:EXPORTS /LARGEADDRESSAWARE \