Changeset 3526 for trunk/kProfile/Makefile.kmk

Timestamp:

Aug 20, 2007, 12:46:14 AM (18 years ago)

Author:

bird

Message:

made it build again.

File:

• trunk/kProfile/Makefile.kmk (moved) (moved from trunk/kProfile/Makefile ) (5 diffs)

trunk/kProfile/Makefile.kmk

@@ -25 +25 @@
 #
 
-
-DEPTH = ../../../..
+DEPTH = ..
 include $(PATH_KBUILD)/header.kmk
 
 #LIBRARIES   = kPrf2GC kPrf2R0
 DLLS        = kPrf2
-PROGRAMS    = kPrf2Read tst
+PROGRAMS    = kPrf2Read
 
 
@@ -40 +39 @@
 TEMPLATE_kPrf2_TOOL             = GCC3
 TEMPLATE_kPrf2_TOOL.os2         = GCC3OMF
-TEMPLATE_kPrf2_TOOL.win32       = VCC70
-TEMPLATE_kPrf2_ASTOOL           = NASM
+TEMPLATE_kPrf2_TOOL.win.x86     = VCC70
+TEMPLATE_kPrf2_TOOL.win.amd64   = VCC80AMD64
+TEMPLATE_kPrf2_ASTOOL           = YASM
+TEMPLATE_kPrf2_ASTOOL.os2       = NASM
 
-TEMPLATE_kPrf2_DEFS.freebsd     = __FREEBSD__
-TEMPLATE_kPrf2_DEFS.l4          = __L4__
-TEMPLATE_kPrf2_DEFS.linux       = __LINUX__
-TEMPLATE_kPrf2_DEFS.os2         = __OS2__
-TEMPLATE_kPrf2_DEFS.win32       = __WIN32__
-TEMPLATE_kPrf2_DEFS.win64       = __WIN64__
+TEMPLATE_kPrf2_SDKS.win         = WINPSDK
+
+TEMPLATE_kPrf2_DEFS.freebsd     = KPRF_OS_FREEBSD
+TEMPLATE_kPrf2_DEFS.linux       = KPRF_OS_LINUX
+TEMPLATE_kPrf2_DEFS.os2         = KPRF_OS_OS2
+TEMPLATE_kPrf2_DEFS.win         = KPRF_OS_WINDOWS
 
 TEMPLATE_kPrf2_CXXFLAGS.freebsd = -g
-TEMPLATE_kPrf2_CXXFLAGS.l4      = -g
 TEMPLATE_kPrf2_CXXFLAGS.linux   = -g
 TEMPLATE_kPrf2_CXXFLAGS.os2     = -g
-TEMPLATE_kPrf2_CXXFLAGS.win32   = -Zi -Zl -MD -W3 -GF -GR-
+TEMPLATE_kPrf2_CXXFLAGS.win     = -Zi -Zl -MD -W3 -GF -GR-
 ifneq ($(BUILD_TYPE),debug)
 TEMPLATE_kPrf2_CXXFLAGS.freebsd+= -O3
-TEMPLATE_kPrf2_CXXFLAGS.l4     += -O3
 TEMPLATE_kPrf2_CXXFLAGS.linux  += -O3
 TEMPLATE_kPrf2_CXXFLAGS.os2    += -O3
-TEMPLATE_kPrf2_CXXFLAGS.win32  += -O2xtg -Oi -Ob2
+TEMPLATE_kPrf2_CXXFLAGS.win    += -O2xtg -Oi -Ob2
 endif
-TEMPLATE_kPrf2_CXXFLAGS.win64   = $(TEMPLATE_kPrf2_CXXFLAGS.win32)
 
-TEMPLATE_kPrf2_ASFLAGS.freebsd  = -f elf32 -g
-TEMPLATE_kPrf2_ASFLAGS.l4       = -f elf32 -g
-TEMPLATE_kPrf2_ASFLAGS.linux    = -f elf32 -g
+TEMPLATE_kPrf2_ASFLAGS.freebsd  = -f elf
+TEMPLATE_kPrf2_ASFLAGS.linux    = -f elf
 TEMPLATE_kPrf2_ASFLAGS.os2      = -f omf
-TEMPLATE_kPrf2_ASFLAGS.win32    = -f win32 -g
+TEMPLATE_kPrf2_ASFLAGS.win.x86  = -f win32 -g cv8
+TEMPLATE_kPrf2_ASFLAGS.win.amd64 = -f win64 -g cv8
 
-TEMPLATE_kPrf2_INCS.win32           = \
-        $(PATH_DEV)/x86.win32/vcc70/include \
-        $(PATH_DEV)/x86.win32/sdk200209/include
+#TEMPLATE_kPrf2_INCS.win            = \
+#       $(PATH_DEV)/x86.win32/vcc70/include \
+#       $(PATH_DEV)/x86.win32/sdk200209/include
 
 TEMPLATE_kPrf2_LDFLAGS.freebsd  = -g
-TEMPLATE_kPrf2_LDFLAGS.l4       = -g
 TEMPLATE_kPrf2_LDFLAGS.linux    = -g
 TEMPLATE_kPrf2_LDFLAGS.os2      = -g
-TEMPLATE_kPrf2_LDFLAGS.win32    = /DEBUG
-TEMPLATE_kPrf2_LDFLAGS.win64    = /DEBUG
+TEMPLATE_kPrf2_LDFLAGS.win      = /DEBUG
 
 TEMPLATE_kPrf2_LIBS.freebsd     =
-TEMPLATE_kPrf2_LIBS.l4          =
 TEMPLATE_kPrf2_LIBS.linux       =
 TEMPLATE_kPrf2_LIBS.os2         =
-TEMPLATE_kPrf2_LIBS.win32       = \
+TEMPLATE_kPrf2_LIBS.win        = \
+        $(PATH_SDK_WINPSDK_LIB)/psapi.Lib
+TEMPLATE_kPrf2_LIBS.win.x86     = \
         $(PATH_TOOL_VCC70_LIB)/msvcrt.lib \
         $(PATH_TOOL_VCC70_LIB)/msvcprt.lib \
-        $(PATH_TOOL_VCC70_LIB)/oldnames.lib \
-        $(PATH_DEV)/x86.win32/sdk200209/lib/Kernel32.Lib \
-        $(PATH_DEV)/x86.win32/sdk200209/lib/psapi.Lib
+        $(PATH_TOOL_VCC70_LIB)/oldnames.lib
 
 
@@ -105 +100 @@
 #       kProfileR0.cpp
 
-kPrf2_SOURCES.win32 = \
-        dllmain-win32.cpp \
-        kPrf2-win32.def \
-        prfx86msc.asm
-prfx86msc.asm_DEFS.win32 = \
+kPrf2_SOURCES.win = \
+        dllmain-win.cpp \
+        prf$(BUILD_TARGET_ARCH)msc.asm \
+        kPrf2-win-$(BUILD_TARGET_ARCH).def
+prfx86msc.asm_DEFS.win.x86 = \
         KPRF_ENTER=_KPrfEnter \
         KPRF_LEAVE=_KPrfLeave
@@ -119 +114 @@
 #
 kPrf2Read_TEMPLATE = kPrf2
-kPrf2Read_INCS = \
-        $(PATH_CURRENT)/../include \
-        $(PATH_ROOT)/include
-kPrf2Read_DEFS = IN_RING3 IN_RT_R3
 kPrf2Read_SOURCES  = \
-        kPrf2Read.cpp \
+        kPrf2Read.cpp
+
+# kDbg stuff
+KDBG_ROOT ?= $(PATH_CURRENT)/../kProfile
+kPrf2Read_INCS += $(KDBG_ROOT)
+kPrf2Read_SOURCES += \
         dbgmodule.cpp \
         dbgline.cpp \
         dbgsymbol.cpp
-ifeq ($(filter-out win32 win64,$(BUILD_TARGET)),)
-kPrf2Read_SOURCES += dbgModPE-win32.cpp
+ifeq ($(BUILD_TARGET),win)
+kPrf2Read_SOURCES.win += dbgModPE-win.cpp
 else
 kPrf2Read_SOURCES += dbgModPE-generic.cpp
 endif
-kPrf2Read_LIBS  = \
-        $(LIB_RUNTIME)
-kPrf2Read_LIBS.win32 = \
-        $(PATH_DEV)/x86.win32/sdk200209/lib/uuid.Lib \
-        $(PATH_DEV)/x86.win32/sdk200209/lib/Version.Lib
+
+# kLdr stuff
+KLDR_ROOT ?= $(PATH_CURRENT)/../kLdr
+kPrf2Read_INCS += $(KLDR_ROOT)
+
+# IPRT stuff
+VBOX_ROOT ?= y:/coding/vbox/svn/trunk
+kPrf2Read_INCS += $(VBOX_ROOT)/include
+kPrf2Read_DEFS += IN_RING3 IN_RT_R3 KDBG_USE_IPRT KCOMMON_ALREADY_INCLUDED_STD_TYPES
+ifeq ($(BUILD_TARGET),win)
+kPrf2Read_LIBS = \
+        $(VBOX_ROOT)/out/$(BUILD_TARGET).$(BUILD_TARGET_ARCH)/$(BUILD_TYPE)/lib/VBoxRT$(SUFF_LIB)
+else
+kPrf2Read_LIBS = \
+        $(VBOX_ROOT)/out/$(BUILD_TARGET).$(BUILD_TARGET_ARCH)/$(BUILD_TYPE)/bin/VBoxRT$(SUFF_DLL)
+endif
 
 
-
+#
+# A simple testcase.
+#
+PROGRAMS.win.x86 += tst
 tst_TOOL = VCC70
+tst_SDKS = WINPSDK
 tst_CFLAGS = -GH -Gh -Zi -Zl -GR- -GX- -GF- -MD -W3 -wd4244
 tst_SOURCES = tst.c
@@ -150 +161 @@
         $(PATH_TOOL_VCC70_LIB)/msvcprt.lib \
         $(PATH_TOOL_VCC70_LIB)/oldnames.lib \
-        $(PATH_DEV)/x86.win32/sdk200209/lib/Kernel32.Lib \
         $(PATH_kPrf2)/kPrf2.lib