Changeset 3404

Timestamp:

07/04/07 00:30:44 (2 years ago)

Author:

vboxsync

Message:

OS/2: Changed the default path to glib and libIDL to $(PATH_DEVTOOLS_TRG)/glibidl/gcc335 (so that the .zip from hobbes can be just unpacked to $(PATH_DEVTOOLS_TRG)); made install glib and libIDL headers to the same directory as xpidl.exe.

Files:

• trunk/src/libs/xpcom18a4/Makefile.kmk (modified) (3 diffs)

trunk/src/libs/xpcom18a4/Makefile.kmk

@@ -551 +551 @@
-        xpcom/typelib/xpt/src/xpt_xdr.c
-
-filter-out os2,$(BUILD_TARGET)),
+BUILD_TARGET),os2
- # glib and libIDL needed by XPCOM on OS/2.
-
-
-
-
-
-
+
+
+
+
- endif
-VBOX_PATH_LIBIDL
-wrong or not defined
+wildcard $(VBOX_PATH_LIBIDL)
+"$(VBOX_PATH_LIBIDL)" which is not a valid directory
- endif
- xpidl_INCS = \
@@ -569 +567 @@
-        $(VBOX_PATH_LIBIDL)/lib/libidl.lib \
-        $(VBOX_PATH_LIBIDL)/lib/glib.lib
+ # install necessary DLLs to the same place where xpidl goes
+ INSTALLS += xpidl-DLLS
+ xpidl_ORDERDEPS = xpidl-DLLS
+ xpidl-DLLS_INST = $(xpidl_INST)
+ # static libraries of these may be provided instead,
+ # so copy DLLs only when they are present
+ xpidl-DLLS_SOURCES += $(wildcard $(VBOX_PATH_GLIB)/lib/glib.dll)
+ xpidl-DLLS_SOURCES += $(wildcard $(VBOX_PATH_LIBIDL)/lib/libIDL.dll)
-else
- # We do these ONCE.
@@ -1443 +1449 @@
-        $$(call MSG_TOOL,xpidl,XPCOM,$$<,$$@)
-        $$(QUIET)$(MKDIR) -p $(VBOX_PATH_SDK)/include $(VBOX_PATH_SDK)/idl
-TARGET_xpidl
-TARGET_xpidl
+VBOX_XPIDL
+VBOX_XPIDL
-        $$(QUIET)$(CP) $$< $$(VBOX_PATH_SDK)/idl
-endef