Changeset 5555 in vbox for trunk/src/VBox/Runtime

Timestamp:

Oct 30, 2007 1:07:19 AM (17 years ago)

Author:

vboxsync

Message:

kStuff on Darwin and OS/2, no more special magic in src/VBox/Runtime.

File:

• trunk/src/VBox/Runtime/Makefile.kmk (modified) (7 diffs)

trunk/src/VBox/Runtime/Makefile.kmk

@@ -60 +60 @@
 INCS += include
 
-ifndef IPRT_WITH_KSTUFF
- ifneq ($(wildcard ./kLdr/kLdrModMachO.c),)
-  ifeq ($(filter-out darwin win os2,$(BUILD_TARGET)),)
-   IPRT_WITH_KLDR=1
-   IPRT_PATH_KLDR=./kLdr
-  endif
- endif
-endif
-
 #
 # Unicode Specification reader used to regenerate unidata.cpp.
@@ -122 +113 @@
  RuntimeR3_DEFS        += LDR_WITH_KLDR
 endif
-ifdef IPRT_WITH_KLDR
- RuntimeR3_DEFS        += LDR_WITH_KLDR KLDR_USE_CRT
- RuntimeR3_DEFS.debug  += KLDRMOD_STRICT KLDRMODLX_STRICT KLDRMODPE_STRICT KLDRMODNATIVE_STRICT KLDRRDR_STRICT
-endif
 ifdef VBOX_MAIN_RELEASE_LOG ## @todo (dmik): temporary, until RTThreadSelf/RTThreadAdopt are properly updated
  RuntimeR3_DEFS         += RTCRITSECT_STRICT
@@ -134 +121 @@
  RuntimeR3_INCS        += \
         $(PATH_ROOT)/src/libs/kStuff/kStuff/include
-endif
-ifdef IPRT_WITH_KLDR
- RuntimeR3_INCS        += \
-        $(IPRT_PATH_KLDR)
 endif
 RuntimeR3_INCS.l4       = \
@@ -235 +218 @@
 endif
 
-ifdef IPRT_WITH_KLDR
- RuntimeR3_SOURCES += \
-        common/ldr/ldrkLdr.cpp \
-        $(IPRT_PATH_KLDR)/kLdrMod.c \
-        $(IPRT_PATH_KLDR)/kLdrModLX.c \
-        $(IPRT_PATH_KLDR)/kLdrModPE.c \
-        $(IPRT_PATH_KLDR)/kLdrModMachO.c \
-        $(IPRT_PATH_KLDR)/kLdrModNative.c \
-        $(IPRT_PATH_KLDR)/kLdrMisc.c \
-        $(IPRT_PATH_KLDR)/kLdrRdr.c \
-        $(IPRT_PATH_KLDR)/kLdrHlpStr.c
-# We Implement these using IPRT facilities.
-#   $(IPRT_PATH_KLDR)/kLdrHlp.c \
-#       $(IPRT_PATH_KLDR)/kLdrHlpHeap.c \
-#       $(IPRT_PATH_KLDR)/kLdrHlpSem.c \
-#       $(IPRT_PATH_KLDR)/kLdrHlpMem.c \
-#       $(IPRT_PATH_KLDR)/kLdrHlpPath.c
-
-endif
-
 # VBox specific stuff.
 RuntimeR3_SOURCES += \
@@ -504 +467 @@
 RuntimeW32GuestR3_SDKS         = WINPSDK W2K3DDK
 RuntimeW32GuestR3_DEFS         = IN_RT_R3 IN_SUP_R3 LDR_WITH_NATIVE LDR_WITH_ELF32 LDR_WITH_PE RT_WITH_VBOX
-ifdef IPRT_WITH_KLDR
- RuntimeW32GuestR3_DEFS       += LDR_WITH_KLDR KLDR_USE_CRT
- RuntimeW32GuestR3_DEFS.debug += KLDRMOD_STRICT KLDRMODLX_STRICT KLDRMODPE_STRICT KLDRMODNATIVE_STRICT KLDRRDR_STRICT
+ifdef IPRT_WITH_KSTUFF
+ RuntimeW32GuestR3_DEFS       += LDR_WITH_KLDR
 endif
 RuntimeW32GuestR3_SOURCES      = $(RuntimeR3_SOURCES.win) $(RuntimeR3_SOURCES)
@@ -517 +479 @@
 RuntimeLnx32GuestR3_TEMPLATE   = VBOXLNX32GUESTR3LIB
 RuntimeLnx32GuestR3_DEFS       = IN_RT_R3 IN_SUP_R3 LDR_WITH_NATIVE LDR_WITH_ELF32 LDR_WITH_PE RT_WITH_VBOX
-ifdef IPRT_WITH_KLDR
- RuntimeLnx32GuestR3_DEFS     += LDR_WITH_KLDR KLDR_USE_CRT
- RuntimeLnx32GuestR3_DEFS.debug += KLDRMOD_STRICT KLDRMODLX_STRICT KLDRMODPE_STRICT KLDRMODNATIVE_STRICT KLDRRDR_STRICT
+ifdef IPRT_WITH_KSTUFF
+ RuntimeLnx32GuestR3_DEFS     += LDR_WITH_KLDR
 endif
 RuntimeLnx32GuestR3_SOURCES    = $(RuntimeR3_SOURCES.linux) $(RuntimeR3_SOURCES)
@@ -530 +491 @@
 RuntimeOS2GuestR3_TEMPLATE     = VBOXOS2GUESTR3LIB
 RuntimeOS2GuestR3_DEFS         = IN_RT_R3 IN_SUP_R3 LDR_WITH_NATIVE LDR_WITH_ELF32 LDR_WITH_PE RT_WITH_VBOX
-ifdef IPRT_WITH_KLDR
- RuntimeOS2GuestR3_DEFS       += LDR_WITH_KLDR KLDR_USE_CRT
- RuntimeOS2GuestR3_DEFS.debug += KLDRMOD_STRICT KLDRMODLX_STRICT KLDRMODPE_STRICT KLDRMODNATIVE_STRICT KLDRRDR_STRICT
+ifdef IPRT_WITH_KSTUFF
+ RuntimeOS2GuestR3_DEFS       += LDR_WITH_KLDR
 endif
 RuntimeOS2GuestR3_SOURCES      = $(RuntimeR3_SOURCES.os2) $(RuntimeR3_SOURCES)