Changeset 3150 in vbox for trunk/Config.kmk

Timestamp:

Jun 18, 2007 10:31:27 PM (17 years ago)

Author:

vboxsync

Message:

XPCOM: Ported necessary bits of IPC/DConnect tp OS/2.

File:

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

trunk/Config.kmk

@@ -682 +682 @@
  LIB_VMMGC       = $(PATH_BIN)/VMMGC.gc
  LIB_REM         = $(PATH_LIB)/VBoxREMImp.dylib
+ LIB_XPCOM       = $(PATH_BIN)/VBoxXPCOM.dylib
 endif
 ifeq ($(BUILD_TARGET),l4)
@@ -690 +691 @@
  LIB_VMMGC       = $(PATH_BIN)/VMMGC.gc
  LIB_REM         = $(PATH_BIN)/VBoxREMImp.s.so
+ LIB_XPCOM       = $(PATH_BIN)/VBoxXPCOM.s.so
 endif
 ifeq ($(filter-out linux freebsd netbsd openbsd solaris,$(BUILD_TARGET)),)
@@ -698 +700 @@
  LIB_VMMGC       = $(PATH_BIN)/VMMGC.gc
  LIB_REM         = $(PATH_BIN)/VBoxREMImp.so
+ LIB_XPCOM       = $(PATH_BIN)/VBoxXPCOM.so
 endif
 ifeq ($(BUILD_TARGET),os2)
@@ -706 +709 @@
  LIB_VMMGC       = $(PATH_LIB)/VMMGCImp.lib
  LIB_REM         = $(PATH_LIB)/VBoxREMImp.lib
+ LIB_XPCOM       = $(PATH_BIN)/VBoxXCOM.dll
  OBJ_SYS0        = $(PATH_OBJ)/src/VBox/Runtime/RuntimeR0/os2/sys0.obj
 endif
@@ -715 +719 @@
  LIB_VMMGC       = $(PATH_OUT)/obj/src/VBox/VMM/VMMGC/VMMGC.lib
  LIB_REM         = $(PATH_LIB)/VBoxREMImp.lib
+ LIB_XPCOM       = $(PATH_BIN)/VBoxXPCOM.dll
 endif
 
@@ -743 +748 @@
  VBOX_XSLTPROC ?= $(PATH_DEVTOOLS)/win.x86/bin/xsltproc.exe
 else
+ifeq ($(BUILD_PLATFORM),os2)
+ VBOX_XSLTPROC ?= $(PATH_DEVTOOLS)/os2.x86/bin/xsltproc.exe
+else
  VBOX_XSLTPROC ?= xsltproc$(HOSTSUFF_EXE)
+endif
 endif
 
@@ -773 +782 @@
 ifeq ($(filter-out win.x86 linux.x86, $(BUILD_PLATFORM).$(BUILD_PLATFORM_ARCH)),)
  PATH_TOOL_YASM ?= $(PATH_DEVTOOLS_BLD)/bin
+endif
+
+# glib and libIDL needed by XPCOM on OS/2.
+ifeq ($(BUILD_TARGET),os2)
+ VBOX_PATH_GLIB      ?= $(PATH_DEVTOOLS_TRG)/glibidl
+ VBOX_PATH_GLIB      := $(wildcard $(VBOX_PATH_GLIB))
+ VBOX_PATH_LIBIDL    ?= $(PATH_DEVTOOLS_TRG)/glibidl
+ VBOX_PATH_LIBIDL    := $(wildcard $(VBOX_PATH_LIBIDL))
+ ifeq ($(VBOX_PATH_GLIB),)
+  $(warning VBOX_PATH_GLIB is wrong or not defined!)
+ endif
+ ifeq ($(VBOX_PATH_LIBIDL),)
+  $(warning VBOX_PATH_LIBIDL is wrong or not defined!)
+ endif
 endif
 
@@ -787 +810 @@
         $(VBOX_PATH_SDK)/include/xpcom/xpcom \
         $(VBOX_PATH_SDK)/include/xpcom/ipcd
- # libIDL-config (for xpcom18a4)
- ifeq ($(origin VBOX_LIBIDL_CONFIG),undefined)
-  export VBOX_LIBIDL_CONFIG := $(firstword $(shell which libIDL-config-2 libIDL-config 2> /dev/null))
+ ifneq ($(BUILD_TARGET),os2)
+  # libIDL-config (for xpcom18a4)
+  ifeq ($(origin VBOX_LIBIDL_CONFIG),undefined)
+   export VBOX_LIBIDL_CONFIG := $(firstword $(shell which libIDL-config-2 libIDL-config 2> /dev/null))
+  endif
  endif
 endif
@@ -1754 +1779 @@
         $(PATH_LIB)/VBoxXPCOM$(VBOX_SUFF_LIB) \
         $(PATH_LIB)/VBoxXPCOMGlue$(VBOX_SUFF_LIB) \
-        $(PATH_BIN)/VBoxXPCOM$(VBOX_SUFF_DLL) \
+        $(LIB_XPCOM) \
         $(LIB_RUNTIME)
 
@@ -1847 +1872 @@
         $(LIB_VMM) \
         $(PATH_LIB)/VBoxXPCOMGlue$(VBOX_SUFF_LIB) \
-        $(PATH_BIN)/VBoxXPCOM$(VBOX_SUFF_DLL)
+        $(LIB_XPCOM)
 
  ifeq ($(BUILD_TARGET_ARCH),amd64)