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

Timestamp:

Oct 26, 2024 1:34:41 AM (3 months ago)

Author:

vboxsync

Message:

/Config.kmk,tools,FE/Qt: Eliminated the VBOX_WITH_NEW_WINDOWS_SDK and cleaned up the associated mess. jiraref:VBP-1253

File:

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

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

@@ -499 +499 @@
 VirtualBox_LIBS.win = \
         $(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
+VirtualBox_LIBS.win += \
+        $(PATH_SDK_$(VBOX_WINPSDK)_LIB)/ddraw.lib \
+        $(PATH_SDK_$(VBOX_WINPSDK)_LIB)/dxguid.lib
 
 # VBox keyboard shared library for X11 hosts:
@@ -548 +542 @@
 VirtualBoxVM_LIBS.win = \
         $(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
+VirtualBoxVM_LIBS.win += \
+        $(PATH_SDK_$(VBOX_WINPSDK)_LIB)/ddraw.lib \
+        $(PATH_SDK_$(VBOX_WINPSDK)_LIB)/dxguid.lib
 
 # VBox keyboard shared library for X11 hosts: