]>
Commit | Line | Data |
---|---|---|
41ff14a6 | 1 | diff -urN VirtualBox-2.0.0.orig/Config.kmk VirtualBox-2.0.0/Config.kmk |
2 | --- VirtualBox-2.0.0.orig/Config.kmk 2008-09-03 20:16:30.000000000 +0200 | |
3 | +++ VirtualBox-2.0.0/Config.kmk 2008-09-04 20:06:51.000000000 +0200 | |
4 | @@ -1694,10 +1694,10 @@ | |
fd9fe955 | 5 | else |
6 | VBOX_PATH_QT_HOST ?= $(QTDIR) | |
7 | endif | |
8 | -VBOX_UIC ?= $(VBOX_PATH_QT_HOST)/bin/uic$(HOSTSUFF_EXE) | |
9 | -VBOX_MOC ?= $(VBOX_PATH_QT_HOST)/bin/moc$(HOSTSUFF_EXE) | |
10 | -VBOX_LUPDATE ?= $(VBOX_PATH_QT_HOST)/bin/lupdate$(HOSTSUFF_EXE) | |
11 | -VBOX_LRELEASE ?= $(VBOX_PATH_QT_HOST)/bin/lrelease$(HOSTSUFF_EXE) | |
12 | +VBOX_UIC ?= /usr/bin/uic$(HOSTSUFF_EXE) | |
13 | +VBOX_MOC ?= /usr/bin/moc$(HOSTSUFF_EXE) | |
14 | +VBOX_LUPDATE ?= /usr/bin/lupdate$(HOSTSUFF_EXE) | |
15 | +VBOX_LRELEASE ?= /usr/bin/lrelease$(HOSTSUFF_EXE) | |
16 | ||
41ff14a6 | 17 | ifeq ($(KBUILD_TARGET),os2) |
18 | # search DLLs in the EXE directory first (unless VBOX_DLL_QT is set) | |
19 | @@ -2686,7 +2686,7 @@ | |
20 | TEMPLATE_VBOXQTGUIEXE = VBox Qt GUI Executable | |
fd9fe955 | 21 | TEMPLATE_VBOXQTGUIEXE_DEFS = IN_RING3 QT_NO_DEBUG QT_THREAD_SUPPORT $(ARCH_BITS_DEFS) |
22 | TEMPLATE_VBOXQTGUIEXE_INCS = \ | |
fd9fe955 | 23 | - $(VBOX_PATH_QT)/include |
24 | + /usr/include/qt | |
25 | ||
41ff14a6 | 26 | ifeq ($(KBUILD_TARGET),win) |
27 | # drag in library configuration (we need QMAKE_PRL_DEFINES) | |
28 | @@ -2750,10 +2750,10 @@ | |
fd9fe955 | 29 | |
41ff14a6 | 30 | ifeq ($(KBUILD_TARGET_ARCH),amd64) |
210193ea | 31 | TEMPLATE_VBOXQTGUIEXE_LIBPATH = \ |
77342933 | 32 | - $(VBOX_PATH_QT)/lib64 $(VBOX_PATH_QT)/lib |
33 | + /usr/lib64 /usr/lib | |
210193ea | 34 | else |
35 | TEMPLATE_VBOXQTGUIEXE_LIBPATH = \ | |
77342933 | 36 | - $(VBOX_PATH_QT)/lib |
37 | + /usr/lib | |
210193ea | 38 | endif |
fd9fe955 | 39 | |
41ff14a6 | 40 | ifeq ($(KBUILD_TARGET),linux) |