VirtualBox

Ignore:
Timestamp:
Feb 1, 2023 4:25:17 PM (2 years ago)
Author:
vboxsync
svn:sync-xref-src-repo-rev:
155660
Message:

Additions/*.kmk: Automatic scm cleanups. bugref:10348

Location:
trunk/src/VBox/Additions/WINNT/Graphics/Video
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/VBox/Additions/WINNT/Graphics/Video/Makefile.kmk

    r98103 r98416  
    5757        $(PATH_TARGET)/VBoxVideoCat.dir/VBoxDisp.dll
    5858
    59 $(PATH_TARGET)/VBoxVideoCat.dir/VBoxVideo.sys: $$(VBoxVideo_1_TARGET) | $$(dir $$@)
     59 $(PATH_TARGET)/VBoxVideoCat.dir/VBoxVideo.sys: $$(VBoxVideo_1_TARGET) | $$(dir $$@)
    6060        $(INSTALL) -m 644 $< $(@D)
    6161
    62 $(PATH_TARGET)/VBoxVideoCat.dir/VBoxDisp.dll: $$(VBoxDisp_1_TARGET) | $$(dir $$@)
     62 $(PATH_TARGET)/VBoxVideoCat.dir/VBoxDisp.dll: $$(VBoxDisp_1_TARGET) | $$(dir $$@)
    6363        $(INSTALL) -m 644 $< $(@D)
    6464
    … …  
    9393
    9494 $(PATH_TARGET)/VBoxWddmCat.dir/VBoxWddm.inf: \
    95                 $(PATH_SUB_CURRENT)/mp/wddm/VBoxWddm.inf $(MAKEFILE_CURRENT) | $$(dir $$@)
     95                $(PATH_SUB_CURRENT)/mp/wddm/VBoxWddm.inf $(MAKEFILE_CURRENT) | $$(dir $$@)
    9696        $(call MSG_GENERATE,VBoxWddm-inf,$@,$<)
    9797        $(call VBOX_EDIT_INF_FN,$<,$@ $(VBOXWDDM_EDIT_INF_DISPD3D_FN_ARG) $(VBOXWDDM_EDIT_INF_DISPDX_FN_ARG) $(VBOXWDDM_EDIT_INF_MESA3D_FN_ARG))
    … …  
    112112  ifdef VBOX_WITH_WDDM_DX
    113113   VBoxWddm-inf_SOURCES += \
    114        $(PATH_TARGET)/VBoxWddmCat.dir/VBoxDX.dll
     114        $(PATH_TARGET)/VBoxWddmCat.dir/VBoxDX.dll
    115115   VBoxWddm-inf_SOURCES.amd64 += \
    116        $(PATH_TARGET)/VBoxWddmCat.dir/VBoxDX-x86.dll
     116        $(PATH_TARGET)/VBoxWddmCat.dir/VBoxDX-x86.dll
    117117  endif
    118118
    … …  
    174174
    175175  $(PATH_TARGET)/VBoxWddmCat.dir/VBoxWddm.cat: \
    176                 $(PATH_TARGET)/VBoxWddmCat.dir/VBoxWddm.inf \
    177                 $(PATH_TARGET)/VBoxWddmCat.dir/VBoxWddm.sys \
    178                 $(if $(VBOXWDDM_WITH_DISPD3D), $(PATH_TARGET)/VBoxWddmCat.dir/VBoxDispD3D.dll, ) \
    179                 $(if $(VBOXWDDM_WITH_DISPD3D), $(if-expr "$(KBUILD_TARGET_ARCH)" == "amd64", $(PATH_TARGET)/VBoxWddmCat.dir/VBoxDispD3D-x86.dll, ), ) \
    180                 $(if $(VBOX_WITH_WDDM_DX), $(PATH_TARGET)/VBoxWddmCat.dir/VBoxDX.dll, ) \
    181                 $(if $(VBOX_WITH_WDDM_DX), $(if-expr "$(KBUILD_TARGET_ARCH)" == "amd64", $(PATH_TARGET)/VBoxWddmCat.dir/VBoxDX-x86.dll, ), ) \
    182                 $(if $(VBOX_WITH_MESA3D), \
    183                         $(PATH_TARGET)/VBoxWddmCat.dir/VBoxNine.dll \
    184                         $(PATH_TARGET)/VBoxWddmCat.dir/VBoxSVGA.dll \
    185                         $(PATH_TARGET)/VBoxWddmCat.dir/VBoxGL.dll \
    186                         $(if-expr "$(KBUILD_TARGET_ARCH)" == "amd64", \
    187                                 $(PATH_TARGET)/VBoxWddmCat.dir/VBoxNine-x86.dll \
    188                                 $(PATH_TARGET)/VBoxWddmCat.dir/VBoxSVGA-x86.dll \
    189                                 $(PATH_TARGET)/VBoxWddmCat.dir/VBoxGL-x86.dll, ), )
     176                $(PATH_TARGET)/VBoxWddmCat.dir/VBoxWddm.inf \
     177                $(PATH_TARGET)/VBoxWddmCat.dir/VBoxWddm.sys \
     178                $(if $(VBOXWDDM_WITH_DISPD3D), $(PATH_TARGET)/VBoxWddmCat.dir/VBoxDispD3D.dll, ) \
     179                $(if $(VBOXWDDM_WITH_DISPD3D), $(if-expr "$(KBUILD_TARGET_ARCH)" == "amd64", $(PATH_TARGET)/VBoxWddmCat.dir/VBoxDispD3D-x86.dll, ), ) \
     180                $(if $(VBOX_WITH_WDDM_DX), $(PATH_TARGET)/VBoxWddmCat.dir/VBoxDX.dll, ) \
     181                $(if $(VBOX_WITH_WDDM_DX), $(if-expr "$(KBUILD_TARGET_ARCH)" == "amd64", $(PATH_TARGET)/VBoxWddmCat.dir/VBoxDX-x86.dll, ), ) \
     182                $(if $(VBOX_WITH_MESA3D), \
     183                $(PATH_TARGET)/VBoxWddmCat.dir/VBoxNine.dll \
     184                $(PATH_TARGET)/VBoxWddmCat.dir/VBoxSVGA.dll \
     185                $(PATH_TARGET)/VBoxWddmCat.dir/VBoxGL.dll \
     186                $(if-expr "$(KBUILD_TARGET_ARCH)" == "amd64", \
     187                $(PATH_TARGET)/VBoxWddmCat.dir/VBoxNine-x86.dll \
     188                $(PATH_TARGET)/VBoxWddmCat.dir/VBoxSVGA-x86.dll \
     189                $(PATH_TARGET)/VBoxWddmCat.dir/VBoxGL-x86.dll, ), )
    190190        $(call MSG_TOOL,Inf2Cat,VBoxWddm-inf,$@,$<)
    191191        $(call VBOX_MAKE_CAT_FN, $(@D),$@)

  • trunk/src/VBox/Additions/WINNT/Graphics/Video/disp/Makefile.kmk

    r98141 r98416  
    110110
    111111ifdef VBOX_WITH_WDDM
    112 #
    113 # VBoxDispD3D - Windows Guest Additions WDDM R3 Display Driver
    114 #
    115 DLLS += VBoxDispD3D
    116 VBoxDispD3D_TEMPLATE = VBoxGuestR3DllMinVista
    117 VBoxDispD3D_SDKS     = ReorderCompilerIncs $(VBOX_WINDDK_GST_WLH)
    118 VBoxDispD3D_DEFS     = UNICODE _UNICODE VBOX_WITH_WDDM VBOXWDDMDISP LOG_TO_BACKDOOR LOG_TO_BACKDOOR_DRV VBOX_WITH_HGCM
    119 ifdef DEBUG_misha
    120 VBoxDispD3D_DEFS    += LOG_ENABLED
    121 endif
    122 ifdef VBOXWDDM_WITH_VBVA
    123 VBoxDispD3D_DEFS    += VBOXWDDM_WITH_VBVA
    124 endif
    125 ifdef VBOX_WITH_VIDEOHWACCEL
    126  VBoxDispD3D_DEFS   += VBOX_WITH_VIDEOHWACCEL
    127 endif
    128 # Avoid "src\VBox\Additions\3D\mesa\mesa-21.3.8\include\c99_compat.h(99): warning C4668: '__STDC_VERSION__'
    129 # is not defined as a preprocessor macro, replacing with '0' for '#if/#elif'"
    130 VBoxDispD3D_DEFS    += __STDC_VERSION__=0
    131 VBoxDispD3D_INCS     = \
    132         ../../../include \
    133         .. \
    134         $(PATH_ROOT)/src/VBox/Additions/WINNT/Graphics/Video/disp/wddm/shared \
    135         $(VBOX_GRAPHICS_INCS)
    136 VBoxDispD3D_SOURCES  = \
    137         wddm/VBoxDispD3D.cpp \
    138         wddm/VBoxDispD3DIf.cpp \
    139         wddm/VBoxDispDbg.cpp \
    140         wddm/VBoxD3DIf.cpp \
    141         wddm/VBoxDispD3D.rc \
    142         wddm/VBoxDispD3D.def
    143 VBoxDispD3D_LIBS     = \
    144         $(VBOX_LIB_IPRT_GUEST_R3) \
    145         $(VBOX_LIB_VBGL_R3) \
    146         Psapi.lib \
    147         $(VBOX_PATH_ADDITIONS_LIB)/VBoxDispMpLogger$(VBOX_SUFF_LIB) \
    148         $(VBOX_PATH_ADDITIONS_LIB)/VBoxWddmUmKmt$(VBOX_SUFF_LIB)
    149 
    150 ifdef VBOX_WITH_VMSVGA
    151 VBoxDispD3D_DEFS     += VBOX_WITH_VMSVGA
    152 VBoxDispD3D_INCS     += \
    153         $(PATH_ROOT)/src/VBox/Additions/3D/win/include \
    154         $(PATH_ROOT)/src/VBox/Devices/Graphics/vmsvga_include
    155 endif
    156 
    157 ifdef VBOX_WITH_MESA3D
    158 VBoxDispD3D_DEFS     += VBOX_WITH_MESA3D
    159 VBoxDispD3D_INCS     += \
    160         $(VBOX_PATH_MESA)/src/gallium/include \
    161         $(VBOX_PATH_MESA)/src \
    162         $(VBOX_PATH_MESA)/include/c99 \
    163         $(VBOX_PATH_MESA)/include
    164 VBoxDispD3D_SOURCES  += \
    165         wddm/gallium/GaDxva.cpp \
    166         wddm/gallium/GaDrvEnvWddm.cpp \
    167         wddm/gallium/GaWddm.cpp \
    168         wddm/gallium/GaDdi.cpp \
    169         wddm/gallium/Present.cpp \
    170         wddm/gallium/VBoxGallium.cpp \
    171         wddm/gallium/VBoxGaD3DDevice9Ex.cpp \
    172         wddm/gallium/VBoxD3DAdapter9.c
    173 
     112 #
     113 # VBoxDispD3D - Windows Guest Additions WDDM R3 Display Driver
     114 #
     115 DLLS += VBoxDispD3D
     116 VBoxDispD3D_TEMPLATE = VBoxGuestR3DllMinVista
     117 VBoxDispD3D_SDKS    = ReorderCompilerIncs $(VBOX_WINDDK_GST_WLH)
     118 VBoxDispD3D_DEFS    = UNICODE _UNICODE VBOX_WITH_WDDM VBOXWDDMDISP LOG_TO_BACKDOOR LOG_TO_BACKDOOR_DRV VBOX_WITH_HGCM
     119 ifdef DEBUG_misha
     120  VBoxDispD3D_DEFS  += LOG_ENABLED
     121 endif
     122 ifdef VBOXWDDM_WITH_VBVA
     123  VBoxDispD3D_DEFS  += VBOXWDDM_WITH_VBVA
     124 endif
     125 ifdef VBOX_WITH_VIDEOHWACCEL
     126  VBoxDispD3D_DEFS  += VBOX_WITH_VIDEOHWACCEL
     127 endif
     128 # Avoid "src\VBox\Additions\3D\mesa\mesa-21.3.8\include\c99_compat.h(99): warning C4668: '__STDC_VERSION__'
     129 # is not defined as a preprocessor macro, replacing with '0' for '#if/#elif'"
     130 VBoxDispD3D_DEFS   += __STDC_VERSION__=0
     131 VBoxDispD3D_INCS    = \
     132        ../../../include \
     133        .. \
     134        $(PATH_ROOT)/src/VBox/Additions/WINNT/Graphics/Video/disp/wddm/shared \
     135        $(VBOX_GRAPHICS_INCS)
     136 VBoxDispD3D_SOURCES = \
     137        wddm/VBoxDispD3D.cpp \
     138        wddm/VBoxDispD3DIf.cpp \
     139        wddm/VBoxDispDbg.cpp \
     140        wddm/VBoxD3DIf.cpp \
     141        wddm/VBoxDispD3D.rc \
     142        wddm/VBoxDispD3D.def
     143 VBoxDispD3D_LIBS    = \
     144        $(VBOX_LIB_IPRT_GUEST_R3) \
     145        $(VBOX_LIB_VBGL_R3) \
     146        Psapi.lib \
     147        $(VBOX_PATH_ADDITIONS_LIB)/VBoxDispMpLogger$(VBOX_SUFF_LIB) \
     148        $(VBOX_PATH_ADDITIONS_LIB)/VBoxWddmUmKmt$(VBOX_SUFF_LIB)
     149
     150 ifdef VBOX_WITH_VMSVGA
     151  VBoxDispD3D_DEFS   += VBOX_WITH_VMSVGA
     152  VBoxDispD3D_INCS   += \
     153        $(PATH_ROOT)/src/VBox/Additions/3D/win/include \
     154        $(PATH_ROOT)/src/VBox/Devices/Graphics/vmsvga_include
     155 endif
     156
     157 ifdef VBOX_WITH_MESA3D
     158  VBoxDispD3D_DEFS   += VBOX_WITH_MESA3D
     159  VBoxDispD3D_INCS   += \
     160        $(VBOX_PATH_MESA)/src/gallium/include \
     161        $(VBOX_PATH_MESA)/src \
     162        $(VBOX_PATH_MESA)/include/c99 \
     163        $(VBOX_PATH_MESA)/include
     164  VBoxDispD3D_SOURCES += \
     165        wddm/gallium/GaDxva.cpp \
     166        wddm/gallium/GaDrvEnvWddm.cpp \
     167        wddm/gallium/GaWddm.cpp \
     168        wddm/gallium/GaDdi.cpp \
     169        wddm/gallium/Present.cpp \
     170        wddm/gallium/VBoxGallium.cpp \
     171        wddm/gallium/VBoxGaD3DDevice9Ex.cpp \
     172        wddm/gallium/VBoxD3DAdapter9.c
     173
     174  ifdef VBOX_WITH_VMSVGA3D_DX
     175   VBoxDispD3D_DEFS  += VBOX_WITH_VMSVGA3D_DX9
     176  endif
     177
     178  ifdef VBOX_WITH_MESA3D_D3DTEST
     179   VBoxDispD3D_DEFS  += VBOX_WITH_MESA3D_D3DTEST
     180   VBoxDispD3D_SOURCES += \
     181        wddm/gallium/test/d3dhlp.cpp \
     182        wddm/gallium/test/d3d9render.cpp \
     183        wddm/gallium/GaDrvTest.cpp
     184  endif
     185 endif
     186
     187 #
     188 # 64-bit systems needs a 32-bit version of VBoxDispD3D.
     189 #
     190 DLLS.amd64 += VBoxDispD3D-x86
     191 VBoxDispD3D-x86_EXTENDS = VBoxDispD3D
     192 VBoxDispD3D-x86_BLD_TRG_ARCH = x86
     193 VBoxDispD3D-x86_LIBS = \
     194        $(VBOX_LIB_IPRT_GUEST_R3_X86) \
     195        $(VBOX_LIB_VBGL_R3_X86) \
     196        Psapi.lib \
     197        $(VBOX_PATH_ADDITIONS_LIB)/VBoxDispMpLogger-x86$(VBOX_SUFF_LIB) \
     198        $(VBOX_PATH_ADDITIONS_LIB)/VBoxWddmUmKmt-x86$(VBOX_SUFF_LIB)
     199 VBoxDispD3D-x86_DEFS = $(VBoxDispD3D_DEFS) VBOX_WDDM_WOW64
     200
     201 #
     202 # VGPU10 driver VBoxDX
     203 #
    174204 ifdef VBOX_WITH_VMSVGA3D_DX
    175 VBoxDispD3D_DEFS     += VBOX_WITH_VMSVGA3D_DX9
    176  endif
    177 
    178  ifdef VBOX_WITH_MESA3D_D3DTEST
    179 VBoxDispD3D_DEFS     += VBOX_WITH_MESA3D_D3DTEST
    180 VBoxDispD3D_SOURCES  += \
    181         wddm/gallium/test/d3dhlp.cpp \
    182         wddm/gallium/test/d3d9render.cpp \
    183         wddm/gallium/GaDrvTest.cpp
    184  endif
    185 endif
    186 
    187 #
    188 # 64-bit systems needs a 32-bit version of VBoxDispD3D.
    189 #
    190 DLLS.amd64 += VBoxDispD3D-x86
    191 VBoxDispD3D-x86_EXTENDS = VBoxDispD3D
    192 VBoxDispD3D-x86_BLD_TRG_ARCH = x86
    193 VBoxDispD3D-x86_LIBS = \
    194         $(VBOX_LIB_IPRT_GUEST_R3_X86) \
    195         $(VBOX_LIB_VBGL_R3_X86) \
    196         Psapi.lib \
    197         $(VBOX_PATH_ADDITIONS_LIB)/VBoxDispMpLogger-x86$(VBOX_SUFF_LIB) \
    198         $(VBOX_PATH_ADDITIONS_LIB)/VBoxWddmUmKmt-x86$(VBOX_SUFF_LIB)
    199 VBoxDispD3D-x86_DEFS = $(VBoxDispD3D_DEFS) VBOX_WDDM_WOW64
    200 
    201 #
    202 # VGPU10 driver VBoxDX
    203 #
    204  ifdef VBOX_WITH_VMSVGA3D_DX
    205 DLLS += VBoxDX
    206 VBoxDX_TEMPLATE = VBoxGuestR3DllMinVista
    207 VBoxDX_DEFS     = UNICODE _UNICODE VBOX_WITH_VMSVGA VBOX_WITH_VMSVGA3D_DX
    208 VBoxDX_DEFS    += D3D_UMD_INTERFACE_VERSION=D3D_UMD_INTERFACE_VERSION_WIN8
    209 VBoxDX_DEFS    += DXGKDDI_INTERFACE_VERSION=DXGKDDI_INTERFACE_VERSION_WIN8
    210 VBoxDX_INCS     = \
    211         $(PATH_ROOT)/src/VBox/Additions/WINNT/Graphics/Video/disp/wddm/shared \
    212         $(PATH_ROOT)/src/VBox/Additions/WINNT/Graphics/Video/common/wddm \
    213         $(PATH_ROOT)/src/VBox/Additions/3D/win/include \
    214         $(PATH_ROOT)/src/VBox/Additions/3D/win/VBoxWddmUmHlp \
    215         $(PATH_ROOT)/src/VBox/Devices/Graphics/vmsvga_include \
    216         $(VBOX_GRAPHICS_INCS)
    217 VBoxDX_SOURCES  = \
    218         wddm/dx/VBoxDXDDI.cpp \
    219         wddm/dx/VBoxDX.cpp \
    220         wddm/dx/VBoxDXCmd.cpp \
    221         wddm/dx/VBoxDX.rc \
    222         wddm/dx/VBoxDX.def
    223 VBoxDX_LIBS     = \
    224         $(VBOX_LIB_IPRT_GUEST_R3) \
    225         Psapi.lib \
    226         $(VBOX_PATH_ADDITIONS_LIB)/VBoxWddmUmHlp$(VBOX_SUFF_LIB)
    227 
    228 # 64-bit systems need a 32-bit version of VBoxDX
    229 DLLS.amd64 += VBoxDX-x86
    230 VBoxDX-x86_EXTENDS = VBoxDX
    231 VBoxDX-x86_BLD_TRG_ARCH = x86
    232 VBoxDX-x86_LIBS = \
    233         $(VBOX_LIB_IPRT_GUEST_R3_X86) \
    234         $(VBOX_LIB_VBGL_R3_X86) \
    235         Psapi.lib \
    236         $(VBOX_PATH_ADDITIONS_LIB)/VBoxWddmUmHlp-x86$(VBOX_SUFF_LIB)
    237 VBoxDX-x86_DEFS = $(VBoxDX_DEFS) VBOX_WDDM_WOW64
     205  DLLS += VBoxDX
     206  VBoxDX_TEMPLATE = VBoxGuestR3DllMinVista
     207  VBoxDX_DEFS   = UNICODE _UNICODE VBOX_WITH_VMSVGA VBOX_WITH_VMSVGA3D_DX
     208  VBoxDX_DEFS  += D3D_UMD_INTERFACE_VERSION=D3D_UMD_INTERFACE_VERSION_WIN8
     209  VBoxDX_DEFS  += DXGKDDI_INTERFACE_VERSION=DXGKDDI_INTERFACE_VERSION_WIN8
     210  VBoxDX_INCS   = \
     211        $(PATH_ROOT)/src/VBox/Additions/WINNT/Graphics/Video/disp/wddm/shared \
     212        $(PATH_ROOT)/src/VBox/Additions/WINNT/Graphics/Video/common/wddm \
     213        $(PATH_ROOT)/src/VBox/Additions/3D/win/include \
     214        $(PATH_ROOT)/src/VBox/Additions/3D/win/VBoxWddmUmHlp \
     215        $(PATH_ROOT)/src/VBox/Devices/Graphics/vmsvga_include \
     216        $(VBOX_GRAPHICS_INCS)
     217  VBoxDX_SOURCES = \
     218        wddm/dx/VBoxDXDDI.cpp \
     219        wddm/dx/VBoxDX.cpp \
     220        wddm/dx/VBoxDXCmd.cpp \
     221        wddm/dx/VBoxDX.rc \
     222        wddm/dx/VBoxDX.def
     223  VBoxDX_LIBS   = \
     224        $(VBOX_LIB_IPRT_GUEST_R3) \
     225        Psapi.lib \
     226        $(VBOX_PATH_ADDITIONS_LIB)/VBoxWddmUmHlp$(VBOX_SUFF_LIB)
     227
     228  # 64-bit systems need a 32-bit version of VBoxDX
     229  DLLS.amd64 += VBoxDX-x86
     230  VBoxDX-x86_EXTENDS = VBoxDX
     231  VBoxDX-x86_BLD_TRG_ARCH = x86
     232  VBoxDX-x86_LIBS = \
     233        $(VBOX_LIB_IPRT_GUEST_R3_X86) \
     234        $(VBOX_LIB_VBGL_R3_X86) \
     235        Psapi.lib \
     236        $(VBOX_PATH_ADDITIONS_LIB)/VBoxWddmUmHlp-x86$(VBOX_SUFF_LIB)
     237  VBoxDX-x86_DEFS = $(VBoxDX_DEFS) VBOX_WDDM_WOW64
    238238 endif # VBOX_WITH_VMSVGA3D_DX
    239239
    240 include $(PATH_SUB_CURRENT)/wddm/shared/Makefile.kmk
     240 include $(PATH_SUB_CURRENT)/wddm/shared/Makefile.kmk
    241241
    242242endif #ifdef VBOX_WITH_WDDM
    … …  
    244244
    245245ifdef VBOX_WITH_VBOXVIDEOWINDBG
    246 #
    247 # A windbg extension and a few test programs.
    248 #
    249 
    250 DLLS += vbvdbg
    251 vbvdbg_TEMPLATE = VBoxR3StaticDll
    252 vbvdbg_SDKS     = ReorderCompilerIncs $(VBOX_WINDDK_GST_WLH)
    253 vbvdbg_DEFS     = UNICODE _UNICODE
    254 vbvdbg_SOURCES = \
    255         wddm/dbg/VBoxVideoWinDbg.cpp \
    256         wddm/dbg/VBoxVideoWinDbg.def
    257 
    258 PROGRAMS += tstMvWnd
    259 tstMvWnd_TEMPLATE = VBoxR3Static
    260 tstMvWnd_DEFS     = UNICODE _UNICODE
    261 tstMvWnd_SOURCES = wddm/dbg/tstMvWnd.cpp
    262 #tstMvWnd_LIBS     = $(VBOX_LIB_IPRT_GUEST_R3) - Use guest template if this is wanted! duh!
    263 #tstMvWnd_LDFLAGS  = /SUBSYSTEM:windows
    264 
    265 PROGRAMS += DumpD3DCaps9
    266 DumpD3DCaps9_TEMPLATE = VBoxR3Exe
    267 DumpD3DCaps9_SDKS     = ReorderCompilerIncs $(VBOX_WINDDK_GST_WLH)
    268 DumpD3DCaps9_DEFS     = UNICODE _UNICODE
    269 DumpD3DCaps9_SOURCES = wddm/dbg/DumpD3DCaps9.cpp
    270 DumpD3DCaps9_LIBS     = d3d9.lib
    271 
    272 PROGRAMS += D3DFeatureLevel
    273 D3DFeatureLevel_TEMPLATE = VBoxR3Static
    274 D3DFeatureLevel_SDKS     = ReorderCompilerIncs $(VBOX_WINDDK_GST_WLH)
    275 D3DFeatureLevel_SOURCES = wddm/dbg/D3DFeatureLevel.cpp
    276 D3DFeatureLevel_LIBS     = d3d11.lib
    277 #D3DFeatureLevel_LIBS     = $(VBOX_LIB_IPRT_GUEST_R3) d3d11.lib - Use guest template if this is wanted! duh!
    278 #D3DFeatureLevel_LDFLAGS.win = /SUBSYSTEM:CONSOLE
     246 #
     247 # A windbg extension and a few test programs.
     248 #
     249
     250 DLLS += vbvdbg
     251 vbvdbg_TEMPLATE = VBoxR3StaticDll
     252 vbvdbg_SDKS    = ReorderCompilerIncs $(VBOX_WINDDK_GST_WLH)
     253 vbvdbg_DEFS    = UNICODE _UNICODE
     254 vbvdbg_SOURCES = \
     255        wddm/dbg/VBoxVideoWinDbg.cpp \
     256        wddm/dbg/VBoxVideoWinDbg.def
     257
     258 PROGRAMS += tstMvWnd
     259 tstMvWnd_TEMPLATE = VBoxR3Static
     260 tstMvWnd_DEFS    = UNICODE _UNICODE
     261 tstMvWnd_SOURCES = wddm/dbg/tstMvWnd.cpp
     262 #tstMvWnd_LIBS     = $(VBOX_LIB_IPRT_GUEST_R3) - Use guest template if this is wanted! duh!
     263 #tstMvWnd_LDFLAGS  = /SUBSYSTEM:windows
     264
     265 PROGRAMS += DumpD3DCaps9
     266 DumpD3DCaps9_TEMPLATE = VBoxR3Exe
     267 DumpD3DCaps9_SDKS    = ReorderCompilerIncs $(VBOX_WINDDK_GST_WLH)
     268 DumpD3DCaps9_DEFS    = UNICODE _UNICODE
     269 DumpD3DCaps9_SOURCES = wddm/dbg/DumpD3DCaps9.cpp
     270 DumpD3DCaps9_LIBS    = d3d9.lib
     271
     272 PROGRAMS += D3DFeatureLevel
     273 D3DFeatureLevel_TEMPLATE = VBoxR3Static
     274 D3DFeatureLevel_SDKS    = ReorderCompilerIncs $(VBOX_WINDDK_GST_WLH)
     275 D3DFeatureLevel_SOURCES = wddm/dbg/D3DFeatureLevel.cpp
     276 D3DFeatureLevel_LIBS    = d3d11.lib
     277 #D3DFeatureLevel_LIBS     = $(VBOX_LIB_IPRT_GUEST_R3) d3d11.lib - Use guest template if this is wanted! duh!
     278 #D3DFeatureLevel_LDFLAGS.win = /SUBSYSTEM:CONSOLE
    279279
    280280endif # VBOX_WITH_VBOXVIDEOWINDBG

  • trunk/src/VBox/Additions/WINNT/Graphics/Video/mp/Makefile.kmk

    r98126 r98416  
    4444endif
    4545VBoxVideo_INCS          = \
    46         ../../../include \
    47         .. \
    48         . \
    49         $(VBOX_GRAPHICS_INCS)
     46        ../../../include \
     47        .. \
     48        . \
     49        $(VBOX_GRAPHICS_INCS)
    5050VBoxVideo_LDFLAGS.x86   = /Entry:DriverEntry@8
    5151VBoxVideo_LDFLAGS.amd64 = /Entry:DriverEntry
    … …  
    7676 VBoxVideo_LIBS         += \
    7777        $(PATH_SDK_$(VBOX_WINDDK_GST_NT4)_LIB)/exsup.lib \
    78         $(PATH_SDK_$(VBOX_WINDDK_GST)_LIB)/BufferOverflowK.lib # Needed for ___security_cookie.
     78        $(PATH_SDK_$(VBOX_WINDDK_GST)_LIB)/BufferOverflowK.lib # Needed for ___security_cookie.
    7979endif
    8080VBoxVideo_USES.win = vboximportchecker
    … …  
    117117        wddm/VBoxMPWddm.cpp \
    118118        wddm/VBoxMPLegacy.cpp \
    119         wddm/VBoxMPVidPn.cpp \
    120         wddm/VBoxMPVdma.cpp \
    121         wddm/VBoxMPShgsmi.cpp \
     119        wddm/VBoxMPVidPn.cpp \
     120        wddm/VBoxMPVdma.cpp \
     121        wddm/VBoxMPShgsmi.cpp \
    122122        wddm/VBoxMPCm.cpp \
    123123        wddm/VBoxMPSa.cpp \
    … …  
    137137 ifdef VBOXWDDM_WITH_VBVA
    138138  VBoxWddm_SOURCES        += \
    139     wddm/VBoxMPVbva.cpp
     139        wddm/VBoxMPVbva.cpp
    140140 endif
    141141 ifdef VBOX_WITH_VIDEOHWACCEL
    142142  VBoxWddm_SOURCES        += \
    143     wddm/VBoxMPVhwa.cpp
     143        wddm/VBoxMPVhwa.cpp
    144144 endif
    145145
    … …  
    161161  VBoxWddm_DEFS           += WIN9X_COMPAT_SPINLOCK # to avoid multiple KeInitializeSpinLock on amd64
    162162  VBoxWddm_INCS           += \
    163         $(PATH_ROOT)/src/VBox/Additions/3D/win/include \
    164         $(PATH_ROOT)/src/VBox/Devices/Graphics/vmsvga_include
     163        $(PATH_ROOT)/src/VBox/Additions/3D/win/include \
     164        $(PATH_ROOT)/src/VBox/Devices/Graphics/vmsvga_include
    165165  VBoxWddm_SOURCES        += \
    166166        wddm/gallium/Svga.cpp \
Note: See TracChangeset for help on using the changeset viewer.

© 2025 Oracle Support Privacy / Do Not Sell My Info Terms of Use Trademark Policy Automated Access Etiquette