Changeset 6083 in vbox

Timestamp:

Dec 15, 2007 1:13:38 PM (17 years ago)

Author:

vboxsync

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

26781

Message:

Just build libxml2 everywhere (hope this works better on the buildboxes).

File:

• trunk/Config.kmk (modified) (1 diff)

trunk/Config.kmk

@@ -1151 +1151 @@
 
 SDK_VBOX_LIBXML2          = .
-ifeq ($(filter-out win os2,$(BUILD_TARGET)),)
+#if1of ($(BUILD_TARGET),win os2)
  SDK_VBOX_LIBXML2_INCS   ?= $(PATH_ROOT)/src/libs/libxml2-2.6.30/include
  SDK_VBOX_LIBXML2_LIBS   ?= $(PATH_LIB)/VBox-libxml2$(VBOX_SUFF_LIB)
  SDK_VBOX_LIBXML2_DEFS   ?= LIBXML_STATIC
  SDK_VBOX_LIBXML2_DEFS.win += WIN32 _WINDOWS _MBCS
-else
-ifeq ($(filter-out linux,$(BUILD_TARGET)),)
- SDK_VBOX_LIBXML2_INCS      ?=
- SDK_VBOX_LIBXML2_LIBS      ?=
- SDK_VBOX_LIBXML2_CFLAGS    ?= $(shell pkg-config libxml-2.0 --cflags)
- SDK_VBOX_LIBXML2_CXXFLAGS  ?= $(SDK_VBOX_LIBXML2_CFLAGS)
- SDK_VBOX_LIBXML2_LDFLAGS   ?= $(shell pkg-config libxml-2.0 --libs)
-else
- SDK_VBOX_LIBXML2_INCS   ?=
- SDK_VBOX_LIBXML2_LIBS   ?= xml2
-endif
-endif
+#else if1of ($(BUILD_TARGET),linux)
+# SDK_VBOX_LIBXML2_INCS      ?=
+# SDK_VBOX_LIBXML2_LIBS      ?=
+# SDK_VBOX_LIBXML2_CFLAGS    ?= $(shell pkg-config libxml-2.0 --cflags)
+# SDK_VBOX_LIBXML2_CXXFLAGS  ?= $(SDK_VBOX_LIBXML2_CFLAGS)
+# SDK_VBOX_LIBXML2_LDFLAGS   ?= $(shell pkg-config libxml-2.0 --libs)
+#else
+# SDK_VBOX_LIBXML2_INCS   ?=
+# SDK_VBOX_LIBXML2_LIBS   ?= xml2
+#endif
 
 SDK_VBOX_LIBPNG       = .