Changeset 3406 in vbox

Timestamp:

Jul 3, 2007 11:43:34 PM (18 years ago)

Author:

vboxsync

Message:

Confing.kmk: Use kmk_ash instead of cmd.exe and don't kill inherited BEGINLIBPATH (OS/2).

File:

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

trunk/Config.kmk

@@ -818 +818 @@
 endif
 
-## @todo isn't worth to teach kmk_ash.exe to do the following for every .EXE it runs?
 ifeq ($(BUILD_TARGET),os2)
- VBOX_XPIDL    := cmd.exe /c "set BEGINLIBPATH=$(dir $(VBOX_XPIDL)) & $(VBOX_XPIDL)"
+ # search DLLs in the EXE directory first
+ VBOX_XPIDL    := BEGINLIBPATH="$(dir $(VBOX_XPIDL));$$BEGINLIBPATH" $(VBOX_XPIDL)
 endif
 #$(error $(VBOX_XPIDL))
@@ -1140 +1140 @@
 VBOX_LRELEASE ?= $(VBOX_PATH_QT_HOST)/bin/lrelease$(HOSTSUFF_EXE)
 
-## @todo isn't worth to teach kmk_ash.exe to do the following for every .EXE it runs?
 ifeq ($(BUILD_TARGET),os2)
- VBOX_UIC      := cmd.exe /c "set BEGINLIBPATH=$(dir $(VBOX_UIC)) & $(VBOX_UIC)"
- VBOX_MOC      := cmd.exe /c "set BEGINLIBPATH=$(dir $(VBOX_MOC)) & $(VBOX_MOC)"
- VBOX_LUPDATE  := cmd.exe /c "set BEGINLIBPATH=$(dir $(VBOX_LUPDATE)) & $(VBOX_LUPDATE)"
- VBOX_LRELEASE := cmd.exe /c "set BEGINLIBPATH=$(dir $(VBOX_LRELEASE)) & $(VBOX_LRELEASE)"
+ # search DLLs in the EXE directory first
+ VBOX_UIC      := BEGINLIBPATH="$(dir $(VBOX_UIC));$$BEGINLIBPATH" $(VBOX_UIC)
+ VBOX_MOC      := BEGINLIBPATH="$(dir $(VBOX_MOC));$$BEGINLIBPATH" $(VBOX_MOC)
+ VBOX_LUPDATE  := BEGINLIBPATH="$(dir $(VBOX_LUPDATE));$$BEGINLIBPATH" $(VBOX_LUPDATE)
+ VBOX_LRELEASE := BEGINLIBPATH="$(dir $(VBOX_LRELEASE));$$BEGINLIBPATH" $(VBOX_LRELEASE)
 endif