Changeset 12185 in vbox

Timestamp:

Sep 7, 2008 6:09:58 PM (16 years ago)

Author:

vboxsync

Message:

Config.kmk: Some qt3 unit changes. (conditional)

File:

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

trunk/Config.kmk

@@ -2746 +2746 @@
  TEMPLATE_VBOXQTGUIEXE_LDFLAGS.x86 = -m32
  TEMPLATE_VBOXQTGUIEXE_LDFLAGS.amd64 = -m64
- TEMPLATE_VBOXQTGUIEXE_LIBS = \
-        $(LIB_QT) \
+  ifndef USE_KBUILD_QT3_UNIT
+  TEMPLATE_VBOXQTGUIEXE_LIBS = \
+        $(LIB_QT)
+  endif
+ TEMPLATE_VBOXQTGUIEXE_LIBS += \
         $(LIB_SDL) \
         $(LIB_RUNTIME) \
@@ -2753 +2756 @@
         $(LIB_VMM)
 
- ifeq ($(KBUILD_TARGET_ARCH),amd64)
-  TEMPLATE_VBOXQTGUIEXE_LIBPATH = \
-        $(VBOX_PATH_QT)/lib64 $(VBOX_PATH_QT)/lib
- else
-  TEMPLATE_VBOXQTGUIEXE_LIBPATH = \
-        $(VBOX_PATH_QT)/lib
+ ifndef USE_KBUILD_QT3_UNIT
+  ifeq ($(KBUILD_TARGET_ARCH),amd64)
+   TEMPLATE_VBOXQTGUIEXE_LIBPATH = \
+        $(VBOX_PATH_QT)/lib64 $(VBOX_PATH_QT)/lib
+  else
+   TEMPLATE_VBOXQTGUIEXE_LIBPATH = \
+        $(VBOX_PATH_QT)/lib
+  endif
  endif
 
@@ -2783 +2788 @@
         $(VBOX_XCURSOR_INCS)
   TEMPLATE_VBOXQTGUIEXE_LIBS += \
-    $(VBOX_XCURSOR_LIBS) \
+        $(VBOX_XCURSOR_LIBS) \
         Xext \
         X11 \