Changeset 92910 in vbox for trunk/src/VBox/Frontends

Timestamp:

Dec 14, 2021 10:18:50 PM (3 years ago)

Author:

vboxsync

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

148866

Message:

/Config.kmk,*.kmk: Preparing to switch to Windows 10 SDK. bugref:10116

File:

• trunk/src/VBox/Frontends/VirtualBox/Makefile.kmk (modified) (2 diffs)

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

@@ -457 +457 @@
 # Various Windows hosts libraries:
 VirtualBox_LIBS.win = \
-        $(PATH_SDK_$(VBOX_WINPSDK)_LIB)/Htmlhelp.Lib \
-        $(PATH_SDK_$(VBOX_WINDDK)_LIB)/ddraw.lib \
-        $(PATH_SDK_$(VBOX_WINDDK)_LIB)/dxguid.lib
+        $(PATH_SDK_$(VBOX_WINPSDK)_LIB)/Htmlhelp.Lib
+ifdef VBOX_WITH_NEW_WINDOWS_SDK
+ VirtualBox_LIBS.win += \
+        $(PATH_SDK_$(VBOX_WINPSDK)_LIB)/ddraw.lib \
+        $(PATH_SDK_$(VBOX_WINPSDK)_LIB)/dxguid.lib
+else
+ VirtualBox_LIBS.win += \
+        $(PATH_SDK_$(VBOX_WINDDK)_LIB)/ddraw.lib \
+        $(PATH_SDK_$(VBOX_WINDDK)_LIB)/dxguid.lib
+endif
 
 # VBox keyboard shared library for X11 hosts:
@@ -510 +517 @@
 # Various Windows hosts libraries:
 VirtualBoxVM_LIBS.win = \
-        $(PATH_SDK_$(VBOX_WINPSDK)_LIB)/Htmlhelp.Lib \
-        $(PATH_SDK_$(VBOX_WINDDK)_LIB)/ddraw.lib \
-        $(PATH_SDK_$(VBOX_WINDDK)_LIB)/dxguid.lib
+        $(PATH_SDK_$(VBOX_WINPSDK)_LIB)/Htmlhelp.Lib
+ifdef VBOX_WITH_NEW_WINDOWS_SDK
+ VirtualBoxVM_LIBS.win += \
+        $(PATH_SDK_$(VBOX_WINPSDK)_LIB)/ddraw.lib \
+        $(PATH_SDK_$(VBOX_WINPSDK)_LIB)/dxguid.lib
+else
+ VirtualBoxVM_LIBS.win += \
+        $(PATH_SDK_$(VBOX_WINDDK)_LIB)/ddraw.lib \
+        $(PATH_SDK_$(VBOX_WINDDK)_LIB)/dxguid.lib
+endif
 
 # VBox keyboard shared library for X11 hosts: