Changeset 3187 in vbox for trunk/src/libs/xpcom18a4/Makefile.kmk

Timestamp:

Jun 20, 2007 5:21:17 PM (18 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

22126

Message:

Moved the noisy GLIB and LIBIDL to src/libs/xpcom (OS/2 only - but should be done on the other platforms too).

File:

• trunk/src/libs/xpcom18a4/Makefile.kmk (modified) (1 diff)

trunk/src/libs/xpcom18a4/Makefile.kmk

@@ -547 +547 @@
 
 ifeq ($(filter-out os2,$(BUILD_TARGET)),)
- xpidl_INCS = $(VBOX_PATH_LIBIDL)/include $(VBOX_PATH_GLIB)/include
- xpidl_LIBS = $(VBOX_PATH_LIBIDL)/lib/libidl.lib $(VBOX_PATH_LIBIDL)/lib/glib.lib
+ # glib and libIDL needed by XPCOM on OS/2.
+ 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
+ xpidl_INCS = \
+        $(VBOX_PATH_LIBIDL)/include \
+        $(VBOX_PATH_GLIB)/include
+ xpidl_LIBS = \
+        $(VBOX_PATH_LIBIDL)/lib/libidl.lib \
+        $(VBOX_PATH_LIBIDL)/lib/glib.lib
 else
  # We do these ONCE.