Changeset 2870 for trunk

Timestamp:

Sep 4, 2016, 3:52:39 PM (9 years ago)

Author:

bird

Message:

updates

Location:

trunk

Files:

• Config.kmk (modified) (2 diffs)
• kBuild/tools/VCC100AMD64.kmk (modified) (2 diffs)
• kBuild/tools/VCC100X86.kmk (modified) (6 diffs)

trunk/Config.kmk

@@ -208 +208 @@
 TEMPLATE_BIN = Command line binary
 
-TEMPLATE_BIN_INCS               = $(PATH_ROOT)/src/lib
+TEMPLATE_BIN_INCS               = \
+        $(PATH_ROOT)/src/lib \
+        $(PATH_ROOT)/src/lib/kStuff/include
 TEMPLATE_BIN_DEFS.profile       = NDEBUG
 TEMPLATE_BIN_DEFS.release       = NDEBUG
@@ -290 +292 @@
         $(PATH_GNUMAKE_SRC)/w32/include \
         $(PATH_GNUMAKE_SRC)/glob
- TEMPLATE_BIN_LDFLAGS           = /SUBSYSTEM:console /INCREMENTAL:no /NOD /DEBUG /OPT:REF /OPT:ICF
+ TEMPLATE_BIN_LDFLAGS           = /SUBSYSTEM:console /INCREMENTAL:no /NOD /DEBUG /OPT:REF /OPT:ICF /LargeAddressAware
  ifeq ($(KBUILD_TYPE),profile)
   TEMPLATE_BIN_SDKS             = WINPSDKINCS

trunk/kBuild/tools/VCC100AMD64.kmk

@@ -5 +5 @@
 
 #
-# Copyright (c) 2004-2014 knut st. osmundsen <bird-kBuild-spam-xiv@anduin.net>
+# Copyright (c) 2004-2016 knut st. osmundsen <bird-kBuild-spam-xiv@anduin.net>
 #
 # This file is part of kBuild.
@@ -76 +76 @@
 TOOL_VCC100AMD64_MT  ?= $(EXEC_X86_WIN32) $(call TOOL_VCC100_FN_FIND_SDK_TOOL,mt.exe,[Mm][Tt].[Ee][Xx][Ee],TOOL_VCC100_MT_CACHED)
 ifdef TOOL_VCC100AMD64_USE_KSUBMIT
- ifeq ($(KBUILD_HOST).$(KBUILD_HOST_ARCH),win.amd64)
-  TOOL_VCC100AMD64_KSUBMIT ?= kmk_builtin_kSubmit --
+ ifeq ($(KBUILD_HOST),win)
+  ifneq ($(substr $(PATH_TOOL_VCC100AMD64_BIN),-9),x86_amd64)
+   TOOL_VCC100AMD64_KSUBMIT ?= kmk_builtin_kSubmit --64-bit --
+  else
+   TOOL_VCC100AMD64_KSUBMIT ?= kmk_builtin_kSubmit --32-bit --
+  endif
  endif
 endif

trunk/kBuild/tools/VCC100X86.kmk

@@ -5 +5 @@
 
 #
-# Copyright (c) 2004-2014 knut st. osmundsen <bird-kBuild-spam-xiv@anduin.net>
+# Copyright (c) 2004-2016 knut st. osmundsen <bird-kBuild-spam-xiv@anduin.net>
 #
 # This file is part of kBuild.
@@ -74 +74 @@
 TOOL_VCC100X86_RC  ?= $(EXEC_X86_WIN32) $(call TOOL_VCC100_FN_FIND_SDK_TOOL,rc.exe,[Rr][Cc].[Ee][Xx][Ee],TOOL_VCC100_RC_CACHED)
 TOOL_VCC100X86_MT  ?= $(EXEC_X86_WIN32) $(call TOOL_VCC100_FN_FIND_SDK_TOOL,mt.exe,[Mm][Tt].[Ee][Xx][Ee],TOOL_VCC100_MT_CACHED)
+ifdef TOOL_VCC100X86_USE_KSUBMIT
+ ifeq ($(KBUILD_HOST),win)
+  TOOL_VCC100X86_KSUBMIT ?= kmk_builtin_kSubmit --32-bit --
+ endif
+endif
 
 # The following in duplicated in VCC100.kmk and VCC100X86.kmk.
@@ -146 +151 @@
 TOOL_VCC100X86_COMPILE_C_USES_KOBJCACHE = 1
 TOOL_VCC100X86_COMPILE_C_OUTPUT = $(outbase).i
-TOOL_VCC100AMD64_COMPILE_C_OUTPUT_MAYBE =
+TOOL_VCC100X86_COMPILE_C_OUTPUT_MAYBE =
 define TOOL_VCC100X86_COMPILE_C_CMDS
         $(QUIET)$(KOBJCACHE) -f $(outbase).koc -d $(PATH_OBJCACHE) -t $(bld_trg).$(bld_trg_arch) -O2 -r\
@@ -165 +170 @@
 TOOL_VCC100X86_COMPILE_C_OUTPUT_MAYBE = $(call TOOL_VCC100X86_PDB, $(outbase)-obj,pdb)
 define TOOL_VCC100X86_COMPILE_C_CMDS
-        $(QUIET)$(TOOL_VCC100X86_CC) -c\
+        $(QUIET)$(TOOL_VCC100X86_KSUBMIT) $(TOOL_VCC100X86_CC) -c\
                 $(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
                 -Fd$(outbase)-obj.pdb \
@@ -194 +199 @@
 TOOL_VCC100X86_COMPILE_CXX_USES_KOBJCACHE = 1
 TOOL_VCC100X86_COMPILE_CXX_OUTPUT = $(outbase).ii
-TOOL_VCC100AMD64_COMPILE_CXX_OUTPUT_MAYBE =
+TOOL_VCC100X86_COMPILE_CXX_OUTPUT_MAYBE =
 define TOOL_VCC100X86_COMPILE_CXX_CMDS
         $(QUIET)$(KOBJCACHE) -f $(outbase).koc -d $(PATH_OBJCACHE) -t $(bld_trg).$(bld_trg_arch) -O2 -r\
@@ -213 +218 @@
 TOOL_VCC100X86_COMPILE_CXX_OUTPUT_MAYBE = $(call TOOL_VCC100X86_PDB, $(outbase)-obj,pdb)
 define TOOL_VCC100X86_COMPILE_CXX_CMDS
-        $(QUIET)$(TOOL_VCC100X86_CXX) -c\
+        $(QUIET)$(TOOL_VCC100X86_KSUBMIT) $(TOOL_VCC100X86_CXX) -c\
                 $(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
                 -Fd$(outbase)-obj.pdb \