Changeset 13792 in vbox

Timestamp:

Nov 4, 2008 5:08:06 PM (16 years ago)

Author:

vboxsync

Message:

Refined the VBoxREMImp.so/dylib hack: Installing it to PATH_LIB instead of PATH_BIN and using the correct name. Hopefully this will make the like editors somewhat happier.

Location:

trunk

Files:

• Config.kmk (modified) (3 diffs)
• src/recompiler/Makefile.kmk (modified) (1 diff)

trunk/Config.kmk

@@ -1122 +1122 @@
  LIB_VMM         = $(PATH_BIN)/VBoxVMM.dylib
  LIB_VMMGC       = $(PATH_BIN)/VMMGC.gc
- LIB_REM         = $(PATH_LIB)/VBoxREMImp.dylib
+ LIB_REM         = $(PATH_LIB)/VBoxREM.dylib
  LIB_XPCOM       = $(PATH_BIN)/VBoxXPCOM.dylib
  LIB_DDU         = $(PATH_BIN)/VBoxDDU.dylib
@@ -1133 +1133 @@
  LIB_VMM         = $(PATH_BIN)/VBoxVMM.s.so
  LIB_VMMGC       = $(PATH_BIN)/VMMGC.gc
- LIB_REM         = $(PATH_BIN)/VBoxREMImp.s.so
+ LIB_REM         = $(PATH_LIB)/VBoxREM.s.so
  LIB_XPCOM       = $(PATH_BIN)/VBoxXPCOM.s.so
  LIB_DDU         = $(PATH_BIN)/VBoxDDU.s.so
@@ -1144 +1144 @@
  LIB_VMM         = $(PATH_BIN)/VBoxVMM.so
  LIB_VMMGC       = $(PATH_BIN)/VMMGC.gc
- ifdef VBOX_WITH_NEW_RECOMPILER # bird: Not acceptable.
+ ifdef VBOX_WITH_NEW_RECOMPILER # bird: Not acceptable - it won't work because of build order (try a clean, recursive, build).
   LIB_REM        = $(PATH_BIN)/VBoxREM.so
  else
-  LIB_REM        = $(PATH_BIN)/VBoxREMImp.so
+  LIB_REM        = $(PATH_LIB)/VBoxREM.so
  endif
  LIB_XPCOM       = $(PATH_BIN)/VBoxXPCOM.so

trunk/src/recompiler/Makefile.kmk

@@ -305 +305 @@
 #
 VBoxREMImp_TEMPLATE         = VBOXR3
-ifeq ($(KBUILD_TARGET),darwin)
+if1of ($(KBUILD_TARGET), os2 win)
+VBoxREMImp_INST             = $(INST_LIB)
+else
+VBoxREMImp_NAME             = VBoxREM
 VBoxREMImp_INST             = $(INST_LIB)
 endif