Changeset 15338 in vbox for trunk/src/recompiler_new

Timestamp:

Dec 11, 2008 9:08:48 PM (16 years ago)

Author:

vboxsync

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

40771

Message:

the right place.

File:

• trunk/src/recompiler_new/Makefile.kmk (modified) (3 diffs)

trunk/src/recompiler_new/Makefile.kmk

@@ -79 +79 @@
 ifeq ($(REM_MOD),VBoxREM2)
  SYSMODS += VBoxREM2
-endif
-
-ifndef VBOX_USE_REM64
- DLLS    += VBoxREM
+else
+ ifndef VBOX_USE_REM64
+  DLLS    += VBoxREM
+ endif
 endif
 
@@ -171 +171 @@
 $(REM_MOD)_LIBS            = \
         $(PATH_LIB)/RuntimeR3NoCRTGCC$(VBOX_SUFF_LIB)
-$(REM_MOD)_LIBS.win       += \
-        $(LIB_VMM)
 else
 $(REM_MOD)_LIBS            = \
@@ -190 +188 @@
 
 
-ifeq ($(REM_MOD),VBoxREM2)
+ifdef VBOX_USE_REM2
 #
 # The VBoxREM2 wrapper.
 #
-## @todo Note to self: Merge with VBoxREMSel, call it VBoxREMWrapper and use name.
-VBoxREM_TEMPLATE           = VBOXR3
-VBoxREM_DEFS               = IN_REM_R3 $(if $(VBOX_WITH_VMI),VBOX_WITH_VMI,)
-VBoxREM_DEFS              += VBOX_WITH_NEW_RECOMPILER
-VBoxREM_SOURCES            = \
+## @todo Note to self: Merge with VBoxREMSel.
+DLLS += VBoxREMWrapper
+VBoxREMWrapper_TEMPLATE    = VBOXR3
+VBoxREMWrapper_NAME        = VBoxREM
+VBoxREMWrapper_DEFS        = IN_REM_R3 $(if $(VBOX_WITH_VMI),VBOX_WITH_VMI,)
+VBoxREMWrapper_DEFS       += VBOX_WITH_NEW_RECOMPILER
+VBoxREMWrapper_SOURCES     = \
         VBoxREMWrapper.cpp \
         VBoxREMWrapperA.asm
+VBoxREMWrapper_LIBS        = \
+        $(LIB_VMM) \
+        $(LIB_RUNTIME)
 endif