Changeset 42220 in vbox

Timestamp:

Jul 19, 2012 1:11:05 AM (13 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

79238

Message:

More VS2010 preps.

Location:

trunk

Files:

• Config.kmk (modified) (5 diffs)
• src/VBox/Additions/WINNT/VBoxCredProv/Makefile.kmk (modified) (3 diffs)
• src/VBox/Additions/common/crOpenGL/Makefile.kmk (modified) (1 diff)
• src/VBox/Frontends/VirtualBox/Makefile.kmk (modified) (3 diffs)
• src/VBox/HostServices/SharedOpenGL/Makefile.kmk (modified) (1 diff)

trunk/Config.kmk

@@ -2159 +2159 @@
   VBOX_WINDOWS_ADDITIONS_ICON_FILE ?= $(PATH_ROOT)/src/VBox/Artwork/VirtualBoxGA-vista.ico
   VBOX_NSIS_ICON_FILE              ?= $(PATH_ROOT)/src/VBox/Artwork/VirtualBoxGA-nsis.ico
-  TOOL_VCC110X86_RC   := $(PATH_DEVTOOLS)/win.x86/ddk/6000/bin/x86/rc.exe
-  TOOL_VCC110AMD64_RC := $(PATH_DEVTOOLS)/win.x86/ddk/6000/bin/x86/rc.exe
-  TOOL_VCC100X86_RC   := $(PATH_DEVTOOLS)/win.x86/ddk/6000/bin/x86/rc.exe
-  TOOL_VCC100AMD64_RC := $(PATH_DEVTOOLS)/win.x86/ddk/6000/bin/x86/rc.exe
   TOOL_VCC80X86_RC    := $(PATH_DEVTOOLS)/win.x86/ddk/6000/bin/x86/rc.exe
   TOOL_VCC80AMD64_RC  := $(PATH_DEVTOOLS)/win.x86/ddk/6000/bin/x86/rc.exe
@@ -2869 +2865 @@
         $(PATH_SDK_$(VBOX_WINDDK)_LIB.x86)/int64.lib
   else
-   ifndef VBOX_NOINC_MISC
+   if !defined(VBOX_NOINC_MISC) && !defined(VBOX_USE_VCC100)
     include $(KBUILD_PATH)/sdks/W2K3DDKX86.kmk
    endif
   TEMPLATE_VBoxRc_LIBS               = \
-        $(PATH_SDK_W2K3DDKX86_LIB)/int64.lib
+        $(PATH_SDK_$(VBOX_WINDDK)_LIB.x86)/int64.lib
   endif
   TEMPLATE_VBoxRc_LIBS              += \
@@ -2930 +2926 @@
  ifeq ($(VBOX_LDR_FMT32),pe)
   TEMPLATE_VBoxRcExe_LDFLAGS = -Incremental:NO -MapInfo:Exports -NoD -Debug
-  TEMPLATE_VBoxRcExe_SDKS    = WIN32SDK
+  ifdef VBOX_USE_VCC100
+   TEMPLATE_VBoxRcExe_SDKS   = ReorderCompilerIncs $(VBOX_WINPSDK)
+  else
+   TEMPLATE_VBoxRcExe_SDKS   = WIN32SDK
+  endif
   ifndef VBOX_USE_VCC70
    TEMPLATE_VBoxRcExe_LIBS   = \
@@ -4663 +4663 @@
 #
 ifneq ($(KBUILD_HOST),win)
- TOOL_VCC100X86_RC   := $(EXEC_X86_WIN32) $(PATH_DEVTOOLS)/win.x86/bin/rc.exe
- TOOL_VCC100AMD64_RC := $(EXEC_X86_WIN32) $(PATH_DEVTOOLS)/win.x86/bin/rc.exe
  TOOL_VCC80X86_RC    := $(EXEC_X86_WIN32) $(PATH_DEVTOOLS)/win.x86/bin/rc.exe
  TOOL_VCC80AMD64_RC  := $(EXEC_X86_WIN32) $(PATH_DEVTOOLS)/win.x86/bin/rc.exe
@@ -4671 +4669 @@
 else
  WIN32_MC = $(EXEC_X86_WIN32) $(firstword $(wildcard \
+        $(PATH_SDK_$(VBOX_WINPSDK)_BIN)/MC.Exe\
         $(PATH_SDK_WINPSDK_BIN)/MC.Exe\
         $(PATH_SDK_WINPSDK)/Bin/MC.Exe\

trunk/src/VBox/Additions/WINNT/VBoxCredProv/Makefile.kmk

@@ -22 +22 @@
 VBoxCredProv_TEMPLATE    = VBOXGUESTR3DLL
 VBoxCredProv_DEFS        = VBGL_VBOXGUEST VBOX_WITH_HGCM VBOX_WITH_SENS UNICODE
+ifdef VBOX_USE_VCC100
+VBoxCredProv_SDKS        = ReorderCompilerIncs $(VBOX_WINPSDK_GST_WLH)
+else
 VBoxCredProv_SDKS.x86    = WINDDK
+endif
 VBoxCredProv_SOURCES  = \
         VBoxCredentialProvider.cpp \
@@ -33 +37 @@
         VBoxCredProvUtils.cpp
 
+ifndef VBOX_USE_VCC100
 #
 # Since this is not the default SDK we have to navigate manually to it.
@@ -53 +58 @@
         $(VBOX_PATH_PSDK_200702)/Lib/x64/ShLwApi.Lib \
         $(VBOX_PATH_PSDK_200702)/Lib/x64/NetAPI32.Lib
+endif
 
-VBoxCredProv_LIBS    += \
+VBoxCredProv_LIBS     = \
         $(VBOX_LIB_IPRT_GUEST_R3) \
         $(VBOX_LIB_VBGL_R3)
+ifdef VBOX_USE_VCC100
+VBoxCredProv_LIBS    += \
+        $(PATH_SDK_$(VBOX_WINPSDK_GST_WLH)_LIB)/credui.lib \
+        $(PATH_SDK_$(VBOX_WINPSDK_GST_WLH)_LIB)/Secur32.Lib \
+        $(PATH_SDK_$(VBOX_WINPSDK_GST_WLH)_LIB)/NetAPI32.Lib
+endif
 
 include $(FILE_KBUILD_SUB_FOOTER)

trunk/src/VBox/Additions/common/crOpenGL/Makefile.kmk

@@ -88 +88 @@
 ifdef VBOX_WITH_WDDM
  VBoxOGL_DEFS.win += VBOX_WITH_WDDM
- VBoxOGL_SDKS.win += WINDDKWLH
+ VBoxOGL_SDKS.win += $(VBOX_WINDDK_GST_WLH)
 endif
 

trunk/src/VBox/Frontends/VirtualBox/Makefile.kmk

@@ -76 +76 @@
  VirtualBox_INST.darwin = $(INST_BIN)VirtualBox $(INST_BIN)VirtualBoxVM
 endif
-VirtualBox_SDKS.win = WINPSDK DXSDK
+VirtualBox_SDKS.win = ReorderCompilerIncs $(VBOX_WINPSDK) DXSDK
 if1of ($(KBUILD_TARGET), freebsd linux netbsd openbsd os2) # X11 + os2 ## @todo solaris
  VirtualBox_SDKS += LIBSDL
@@ -217 +217 @@
 
 VirtualBox_LIBS.win       = \
-        $(PATH_SDK_WINPSDK_LIB)/Htmlhelp.Lib \
+        $(PATH_SDK_$(VBOX_WINPSDK)_LIB)/Htmlhelp.Lib \
         $(PATH_SDK_DXSDK_LIB)/ddraw.lib \
         $(PATH_SDK_DXSDK_LIB)/dxguid.lib
@@ -225 +225 @@
 
 if defined(VBOX_WITH_VIDEOHWACCEL) || defined(VBOX_GUI_USE_QGL)
- VirtualBox_LIBS.win       += $(PATH_SDK_WINPSDK_LIB)/Opengl32.lib
+ VirtualBox_LIBS.win       += $(PATH_SDK_$(VBOX_WINPSDK)_LIB)/Opengl32.lib
  VirtualBox_LIBS.solaris   += GL
  VirtualBox_LIBS.linux     += GL

trunk/src/VBox/HostServices/SharedOpenGL/Makefile.kmk

@@ -296 +296 @@
   VBoxTestOGL_SOURCES = OpenGLTest/OpenGLTestApp.cpp
   VBoxTestOGL_LIBS = \
-    $(if $(VBOX_WITH_CROGL), \
-      $(PATH_STAGE_LIB)/VBoxOGLhostspuload$(VBOX_SUFF_LIB) \
-      $(VBOX_LIB_OGL_HOSTCRUTIL),) \
-    $(if $(VBOX_WITH_VIDEOHWACCEL), $(PATH_STAGE_LIB)/VBoxOGL2D$(VBOX_SUFF_LIB),) \
-    $(LIB_RUNTIME)
+        $(if $(VBOX_WITH_CROGL), \
+            $(PATH_STAGE_LIB)/VBoxOGLhostspuload$(VBOX_SUFF_LIB) \
+            $(VBOX_LIB_OGL_HOSTCRUTIL),) \
+        $(if $(VBOX_WITH_VIDEOHWACCEL), $(PATH_STAGE_LIB)/VBoxOGL2D$(VBOX_SUFF_LIB),) \
+        $(LIB_RUNTIME)
   VBoxTestOGL_DEFS += \
+    VBOX_BUILD_TARGET=\"$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH)\" \
     $(if $(VBOX_WITH_CROGL), VBOX_WITH_CROGL,) \
     $(if $(VBOX_WITH_VIDEOHWACCEL), VBOX_WITH_VIDEOHWACCEL,) \
-    VBOX_BUILD_TARGET=\"$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH)\" \
     $(if $(VBOX_BLEEDING_EDGE),VBOX_BLEEDING_EDGE=\"$(VBOX_BLEEDING_EDGE)\",)
   ifdef VBOX_WITH_VIDEOHWACCEL
-   VBoxTestOGL_QT_MODULES += Core Gui OpenGL
+   VBoxTestOGL_QT_MODULES     += Core Gui OpenGL
    VBoxTestOGL_LDFLAGS.darwin += -framework OpenGL
-   VBoxTestOGL_LIBS.win += $(PATH_SDK_WINPSDK_LIB)/Opengl32.lib
+   VBoxTestOGL_LIBS.win       += $(PATH_SDK_$(VBOX_WINPSDK)_LIB)/Opengl32.lib
    if1of ($(KBUILD_TARGET), solaris linux freebsd)
     # must come after VBoxOGL2D, therefore don't set the arch-specific LIBS variable here!