Changeset 9 in kStuff for trunk/kProfiler2/Makefile.kmk

Timestamp:

Apr 20, 2008 3:47:01 AM (16 years ago)

Author:

bird

Message:

Use the kStuff template instead of cooking our own compiler setup.

File:

• trunk/kProfiler2/Makefile.kmk (modified) (6 diffs)

trunk/kProfiler2/Makefile.kmk

@@ -38 +38 @@
 #
 TEMPLATE_kPrf2 = kProfiler Template
+if1of ($(BUILD_TARGET), win)
+TEMPLATE_kPrf2_EXTENDS = kStuff
+
+else # Eliminate these
 TEMPLATE_kPrf2_TOOL             = GCC3
 TEMPLATE_kPrf2_TOOL.os2         = GCC3OMF
@@ -47 +51 @@
 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.linux   = -g
 TEMPLATE_kPrf2_CXXFLAGS.os2     = -g
-TEMPLATE_kPrf2_CXXFLAGS.win     = -Zi -Zl -MD -W3 -GF -GR-
+TEMPLATE_kPrf2_CXXFLAGS.win     = -Zi -Zl -W3 -GF -GR-
 TEMPLATE_kPrf2_CXXFLAGS.win.amd64 = -GS- #-FAcs
 ifneq ($(BUILD_TYPE),debug)
@@ -61 +60 @@
 TEMPLATE_kPrf2_CXXFLAGS.linux  += -O3
 TEMPLATE_kPrf2_CXXFLAGS.os2    += -O3
-TEMPLATE_kPrf2_CXXFLAGS.win    += -O2xtg -Oi -Ob2
+TEMPLATE_kPrf2_CXXFLAGS.win    += -O2b2
 endif
 
@@ -81 +80 @@
 TEMPLATE_kPrf2_LIBS.linux       =
 TEMPLATE_kPrf2_LIBS.os2         =
-TEMPLATE_kPrf2_LIBS.win        = \
+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)/libcmt.lib \
         $(PATH_TOOL_VCC70_LIB)/oldnames.lib
+TEMPLATE_kPrf2_LIBS.win.amd64   = \
+        $(PATH_TOOL_VCC80AMD64_LIB)/oldnames.lib \
+        $(PATH_TOOL_VCC80AMD64_LIB)/libcmt.lib
+endif
 
 
@@ -116 +118 @@
 # kPrf2Read - The read & producer of statistics.
 #
-#kPrf2Read_TEMPLATE = kPrf2
 kPrf2Read_TEMPLATE = kStuffEXE
 kPrf2Read_SOURCES  = \
@@ -132 +133 @@
 tst_TOOL = VCC70
 tst_SDKS = WINPSDK
-tst_CFLAGS = -GH -Gh -Zi -Zl -GR- -GX- -GF- -MD -W3 -wd4244
+tst_CFLAGS = -GH -Gh -Zi -Zl -GR- -GX- -GF- -W3 -wd4244
 tst_SOURCES = tst.c
 tst.c_CFLAGS = -Od