Changeset 42154 in vbox for trunk/src/VBox/Main

Timestamp:

Jul 13, 2012 11:00:53 PM (13 years ago)

Author:

vboxsync

Message:

VS2010 preps.

Location:

trunk/src/VBox/Main

Files:

• Makefile.kmk (modified) (7 diffs)
• webservice/Makefile.kmk (modified) (3 diffs)

trunk/src/VBox/Main/Makefile.kmk

@@ -39 +39 @@
  BLDDIRS += $(VBoxCOM_0_OUTDIR) $(PATH_STAGE_BIN)/components
  include $(KBUILD_PATH)/tools/VCC70.kmk
- include $(KBUILD_PATH)/sdks/WINPSDK.kmk
+ include $(KBUILD_PATH)/sdks/$(VBOX_WINPSDK).kmk
 endif # !VBOX_ONLY_SDK
 
@@ -245 +245 @@
 endif
 VBoxSVC_DEFS.win += VBOX_COM_OUTOFPROC_MODULE
-VBoxSVC_DEFS.win.x86 += _WIN32_WINNT=0x0500
-VBoxSVC_DEFS.win.amd64 += _WIN32_WINNT=0x0510
+VBoxSVC_DEFS.win += _WIN32_WINNT=0x0510
 # Try to load and use libhal at runtime for probing removable media
 # VBoxSVC_DEFS.linux += VBOX_USE_LIBHAL
@@ -376 +375 @@
 
 ifdef VBOX_WITH_NETFLT
- # Note! The includes from the TOOL has lower priority than the SDKs,
- #       since comdef.h is in both the DDK and VCC we want to make sure
- #       we're using the VCC since we're not using the DDK compiler/crt.
- #       Since this is potentially risky, restrict it to the source file
- #       needing it.
- src-server/win/NetIf-win.cpp_INCS.win += $(PATH_TOOL_$(VBOX_VCC_TOOL)_INC)
  VBoxSVC_LIBS.win += \
         $(PATH_STAGE_LIB)/WinNetConfig$(VBOX_SUFF_LIB) \
         $(PATH_STAGE_LIB)/VBoxDrvCfg$(VBOX_SUFF_LIB) \
-        $(PATH_SDK_W2K3DDK_LIB)/Newdev.lib \
+        $(PATH_SDK_$(VBOX_WINDDK)_LIB)/Newdev.lib \
         $(PATH_TOOL_$(VBOX_VCC_TOOL)_LIB)/comsupp.lib \
-        $(PATH_SDK_WINPSDK_LIB)/WbemUuid.Lib
+        $(PATH_SDK_$(VBOX_WINPSDK)_LIB)/WbemUuid.Lib
 endif
 VBoxSVC_LDFLAGS.darwin    = -framework IOKit -framework SystemConfiguration
@@ -566 +559 @@
         -framework IOKit
 VBoxC_LDFLAGS.win += /DELAYLOAD:VBoxVMM.dll
-ifdef VBOX_USE_VCC80
+ifndef VBOX_USE_VCC70
  VBoxC_LDFLAGS.win += /MANIFEST
 endif
@@ -577 +570 @@
  VBoxC_LIBS.win += \
         $(PATH_STAGE_LIB)/VBoxDrvCfg$(VBOX_SUFF_LIB) \
-        $(PATH_SDK_W2K3DDK_LIB)/Newdev.lib \
+        $(PATH_SDK_$(VBOX_WINDDK)_LIB)/Newdev.lib \
         $(PATH_STAGE_LIB)/WinNetConfig$(VBOX_SUFF_LIB) \
         $(PATH_TOOL_$(VBOX_VCC_TOOL)_LIB)/comsupp.lib \
-        $(PATH_SDK_WINPSDK_LIB)/WbemUuid.Lib \
+        $(PATH_SDK_$(VBOX_WINPSDK)_LIB)/WbemUuid.Lib \
         $(PATH_TOOL_$(VBOX_VCC_TOOL)_LIB)/delayimp.lib
 endif
@@ -803 +796 @@
 
 VBOX_MAIN_IDL ?= $(EXEC_X86_WIN32) $(call VBOX_FN_MAKE_WIN_PATH,$(firstword $(wildcard \
+        $(PATH_SDK_$(VBOX_WINPSDK)_BIN)/Midl.Exe\
+        $(PATH_SDK_$(VBOX_WINPSDK))/Bin/Midl.Exe\
         $(PATH_SDK_WINPSDK_BIN)/Midl.Exe\
         $(PATH_SDK_WINPSDK)/Bin/Midl.Exe\
@@ -828 +823 @@
                 /out $(call VBOX_FN_MAKE_WIN_PATH,$(VBoxCOM_0_OUTDIR)) \
                 /cpp_cmd $(subst $(EXEC_X86_WIN32),,$(call VBOX_FN_MAKE_WIN_PATH,$(TOOL_$(VBOX_VCC_TOOL)_CC))) \
-                /I $(call VBOX_FN_MAKE_WIN_PATH,$(PATH_SDK_WINPSDK_INC)) \
+                /I $(call VBOX_FN_MAKE_WIN_PATH,$(PATH_SDK_$(VBOX_WINPSDK)_INC)) \
                 /I idl \
                 $(call VBOX_FN_MAKE_WIN_PATH,$<)

trunk/src/VBox/Main/webservice/Makefile.kmk

@@ -207 +207 @@
  LIBRARIES += vboxsoap
  vboxsoap_TEMPLATE = VBOXWEBR3EXE
- ifdef VBOX_USE_VCC80
+ ifndef VBOX_USE_VCC70
   vboxsoap_CXXFLAGS.win += -bigobj
  endif
@@ -292 +292 @@
         $(VBOXWEB_OUT_DIR) \
         .
- ifdef VBOX_USE_VCC80
+ ifndef VBOX_USE_VCC70
   vboxwebsrv_CXXFLAGS.win += -bigobj
  endif
@@ -435 +435 @@
  PROGRAMS += webtest
  webtest_TEMPLATE = VBOXWEBR3EXE
- ifdef VBOX_USE_VCC80
+ ifndef VBOX_USE_VCC70
   webtest_CXXFLAGS.win += -bigobj
  endif