Changeset 26063 in vbox for trunk/src/VBox/Additions/WINNT

Timestamp:

Jan 27, 2010 10:45:39 AM (15 years ago)

Author:

vboxsync

Message:

Miniport/Makefile.kmk: cleanup

File:

• trunk/src/VBox/Additions/WINNT/Graphics/Miniport/Makefile.kmk (modified) (3 diffs)

trunk/src/VBox/Additions/WINNT/Graphics/Miniport/Makefile.kmk

@@ -36 +36 @@
 endif
 VBoxVideo_DEFS        = LOG_TO_BACKDOOR VBOX_WITH_8BPP_MODES
+ifdef VBOX_WITH_HGSMI
+ VBoxVideo_DEFS      += VBOX_WITH_HGSMI
+endif
+ifdef VBOX_WITH_VIDEOHWACCEL
+ VBoxVideo_DEFS      += VBOX_WITH_VIDEOHWACCEL
+endif
 #VBoxVideo_DEFS        += LOG_ENABLED
 VBoxVideo_INCS        = ../../include
@@ -45 +51 @@
         VBoxVideo.def \
         VBoxVideo.rc
+ifdef VBOX_WITH_HGSMI
+ VBoxVideo_SOURCES   += \
+        VBoxVideoHGSMI.cpp
+endif
 VBoxVideo_LIBS.x86    = \
         $(PATH_SDK_W2K3DDK_LIB)/exsup.lib
@@ -53 +63 @@
         $(VBOX_LIB_VBGL_R0) \
         $(VBOX_LIB_IPRT_GUEST_R0_NT4)
-
 ifdef VBOX_WITH_HGSMI
-VBoxVideo_SOURCES     += \
-        VBoxVideoHGSMI.cpp
-VBoxVideo_LIBS         += \
+ VBoxVideo_LIBS      += \
         $(VBOX_PATH_ADDITIONS_LIB)/HGSMIGuestR0Lib$(VBOX_SUFF_LIB)
-VBoxVideo_DEFS += VBOX_WITH_HGSMI
 endif
 
-ifdef VBOX_WITH_VIDEOHWACCEL
-VBoxVideo_DEFS += VBOX_WITH_VIDEOHWACCEL
-endif
+
 
 ifdef VBOXWDDM
-SYSMODS += VBoxVideoWddm
-VBoxVideoWddm_TEMPLATE    = VBOXGUESTR0
-ifdef VBOX_SIGN_ADDITIONS # (See the parent makefile.)
- VBoxVideoWddm_NOINST     = true
-endif
-VBoxVideoWddm_SDKS=WINDDKWLH
-VBoxVideoWddm_DEFS          += LOG_TO_BACKDOOR VBOX_WITH_8BPP_MODES
-#VBoxVideoWddm_DEFS         += LOG_ENABLED
-VBoxVideoWddm_INCS          += ../../include
-VBoxVideoWddm_LDFLAGS.x86   += /Entry:DriverEntry@8
-VBoxVideoWddm_LDFLAGS.amd64 += /Entry:DriverEntry
-VBoxVideoWddm_SOURCES     = \
-        VBoxVideoHGSMI.cpp \
-        VBoxVideo.cpp \
-        wddm/VBoxVideoWddm.cpp \
+ #
+ # VBoxVideoWddm
+ #
+ SYSMODS += VBoxVideoWddm
+ VBoxVideoWddm_TEMPLATE    = VBOXGUESTR0
+ ifdef VBOX_SIGN_ADDITIONS # (See the parent makefile.)
+  $(error FIXME)
+  VBoxVideoWddm_NOINST     = true
+ endif
+ VBoxVideoWddm_SDKS=WINDDKWLH
+ VBoxVideoWddm_DEFS       += LOG_TO_BACKDOOR VBOX_WITH_8BPP_MODES
+ VBoxVideoWddm_DEFS       += VBOX_WITH_HGSMI VBOXWDDM
+ ifdef VBOX_WITH_VIDEOHWACCEL
+  VBoxVideoWddm_DEFS      += VBOX_WITH_VIDEOHWACCEL
+ endif
+ #VBoxVideoWddm_DEFS       += LOG_ENABLED
+ VBoxVideoWddm_INCS       += ../../include
+ VBoxVideoWddm_LDFLAGS.x86 += /Entry:DriverEntry@8
+ VBoxVideoWddm_LDFLAGS.amd64 += /Entry:DriverEntry
+ VBoxVideoWddm_SOURCES     = \
+        VBoxVideoHGSMI.cpp \
+        VBoxVideo.cpp \
+        wddm/VBoxVideoWddm.cpp \
         wddm/VBoxVideoVidPn.cpp \
-        wddm/VBoxVideoWddm.def \
-        wddm/VBoxVideoWddm.rc
-#VBoxVideoWddm_LIBS.x86    += \
-#       $(PATH_SDK_WINDDKWLH_LIB)/exsup.lib
-VBoxVideoWddm_LIBS.x86    += \
-        $(PATH_SDK_WINDDKWLH_LIB)/bufferoverflowu.lib
-VBoxVideoWddm_LIBS        = \
-        $(PATH_SDK_WINDDKWLH_LIB)/ntoskrnl.lib \
-        $(PATH_SDK_WINDDKWLH_LIB)/hal.lib \
-        $(PATH_SDK_WINDDKWLH_LIB)/displib.lib \
-        $(VBOX_LIB_VBGL_R0) \
-        $(VBOX_LIB_IPRT_GUEST_R0_NT4) \
-        $(VBOX_PATH_ADDITIONS_LIB)/HGSMIGuestR0Lib$(VBOX_SUFF_LIB)
-        
-VBoxVideoWddm_DEFS += VBOX_WITH_HGSMI VBOXWDDM
-
-ifdef VBOX_WITH_VIDEOHWACCEL
-VBoxVideoWddm_DEFS += VBOX_WITH_VIDEOHWACCEL
-endif
-
-endif
+        wddm/VBoxVideoWddm.def \
+        wddm/VBoxVideoWddm.rc
+ #VBoxVideoWddm_LIBS.x86   += \
+ #      $(PATH_SDK_WINDDKWLH_LIB)/exsup.lib
+ VBoxVideoWddm_LIBS.x86   += \
+        $(PATH_SDK_WINDDKWLH_LIB)/bufferoverflowu.lib
+ VBoxVideoWddm_LIBS        = \
+        $(PATH_SDK_WINDDKWLH_LIB)/ntoskrnl.lib \
+        $(PATH_SDK_WINDDKWLH_LIB)/hal.lib \
+        $(PATH_SDK_WINDDKWLH_LIB)/displib.lib \
+        $(VBOX_LIB_VBGL_R0) \
+        $(VBOX_LIB_IPRT_GUEST_R0_NT4) \
+        $(VBOX_PATH_ADDITIONS_LIB)/HGSMIGuestR0Lib$(VBOX_SUFF_LIB)
+endif # VBOXWDDM
 
 include $(KBUILD_PATH)/subfooter.kmk