Changeset 98416 in vbox for trunk/src/VBox/Additions/WINNT
- Timestamp:
- Feb 1, 2023 4:25:17 PM (2 years ago)
- svn:sync-xref-src-repo-rev:
- 155660
- Location:
- trunk/src/VBox/Additions/WINNT
- Files:
-
- 13 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/VBox/Additions/WINNT/Graphics/Video/Makefile.kmk
r98103 r98416 57 57 $(PATH_TARGET)/VBoxVideoCat.dir/VBoxDisp.dll 58 58 59 $(PATH_TARGET)/VBoxVideoCat.dir/VBoxVideo.sys: $$(VBoxVideo_1_TARGET) | $$(dir $$@)59 $(PATH_TARGET)/VBoxVideoCat.dir/VBoxVideo.sys: $$(VBoxVideo_1_TARGET) | $$(dir $$@) 60 60 $(INSTALL) -m 644 $< $(@D) 61 61 62 $(PATH_TARGET)/VBoxVideoCat.dir/VBoxDisp.dll: $$(VBoxDisp_1_TARGET) | $$(dir $$@)62 $(PATH_TARGET)/VBoxVideoCat.dir/VBoxDisp.dll: $$(VBoxDisp_1_TARGET) | $$(dir $$@) 63 63 $(INSTALL) -m 644 $< $(@D) 64 64 … … 93 93 94 94 $(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 $$@) 96 96 $(call MSG_GENERATE,VBoxWddm-inf,$@,$<) 97 97 $(call VBOX_EDIT_INF_FN,$<,$@ $(VBOXWDDM_EDIT_INF_DISPD3D_FN_ARG) $(VBOXWDDM_EDIT_INF_DISPDX_FN_ARG) $(VBOXWDDM_EDIT_INF_MESA3D_FN_ARG)) … … 112 112 ifdef VBOX_WITH_WDDM_DX 113 113 VBoxWddm-inf_SOURCES += \ 114 114 $(PATH_TARGET)/VBoxWddmCat.dir/VBoxDX.dll 115 115 VBoxWddm-inf_SOURCES.amd64 += \ 116 116 $(PATH_TARGET)/VBoxWddmCat.dir/VBoxDX-x86.dll 117 117 endif 118 118 … … 174 174 175 175 $(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 184 185 186 187 188 189 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, ), ) 190 190 $(call MSG_TOOL,Inf2Cat,VBoxWddm-inf,$@,$<) 191 191 $(call VBOX_MAKE_CAT_FN, $(@D),$@) -
trunk/src/VBox/Additions/WINNT/Graphics/Video/disp/Makefile.kmk
r98141 r98416 110 110 111 111 ifdef 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 # 174 204 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 238 238 endif # VBOX_WITH_VMSVGA3D_DX 239 239 240 include $(PATH_SUB_CURRENT)/wddm/shared/Makefile.kmk240 include $(PATH_SUB_CURRENT)/wddm/shared/Makefile.kmk 241 241 242 242 endif #ifdef VBOX_WITH_WDDM … … 244 244 245 245 ifdef VBOX_WITH_VBOXVIDEOWINDBG 246 #247 # A windbg extension and a few test programs.248 #249 250 DLLS += vbvdbg251 vbvdbg_TEMPLATE = VBoxR3StaticDll252 vbvdbg_SDKS= ReorderCompilerIncs $(VBOX_WINDDK_GST_WLH)253 vbvdbg_DEFS= UNICODE _UNICODE254 vbvdbg_SOURCES= \255 wddm/dbg/VBoxVideoWinDbg.cpp \256 wddm/dbg/VBoxVideoWinDbg.def257 258 PROGRAMS += tstMvWnd259 tstMvWnd_TEMPLATE = VBoxR3Static260 tstMvWnd_DEFS= UNICODE _UNICODE261 tstMvWnd_SOURCES= wddm/dbg/tstMvWnd.cpp262 #tstMvWnd_LIBS = $(VBOX_LIB_IPRT_GUEST_R3) - Use guest template if this is wanted! duh!263 #tstMvWnd_LDFLAGS = /SUBSYSTEM:windows264 265 PROGRAMS += DumpD3DCaps9266 DumpD3DCaps9_TEMPLATE = VBoxR3Exe267 DumpD3DCaps9_SDKS= ReorderCompilerIncs $(VBOX_WINDDK_GST_WLH)268 DumpD3DCaps9_DEFS= UNICODE _UNICODE269 DumpD3DCaps9_SOURCES= wddm/dbg/DumpD3DCaps9.cpp270 DumpD3DCaps9_LIBS= d3d9.lib271 272 PROGRAMS += D3DFeatureLevel273 D3DFeatureLevel_TEMPLATE = VBoxR3Static274 D3DFeatureLevel_SDKS= ReorderCompilerIncs $(VBOX_WINDDK_GST_WLH)275 D3DFeatureLevel_SOURCES= wddm/dbg/D3DFeatureLevel.cpp276 D3DFeatureLevel_LIBS= d3d11.lib277 #D3DFeatureLevel_LIBS = $(VBOX_LIB_IPRT_GUEST_R3) d3d11.lib - Use guest template if this is wanted! duh!278 #D3DFeatureLevel_LDFLAGS.win = /SUBSYSTEM:CONSOLE246 # 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 279 279 280 280 endif # VBOX_WITH_VBOXVIDEOWINDBG -
trunk/src/VBox/Additions/WINNT/Graphics/Video/mp/Makefile.kmk
r98126 r98416 44 44 endif 45 45 VBoxVideo_INCS = \ 46 47 48 49 46 ../../../include \ 47 .. \ 48 . \ 49 $(VBOX_GRAPHICS_INCS) 50 50 VBoxVideo_LDFLAGS.x86 = /Entry:DriverEntry@8 51 51 VBoxVideo_LDFLAGS.amd64 = /Entry:DriverEntry … … 76 76 VBoxVideo_LIBS += \ 77 77 $(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. 79 79 endif 80 80 VBoxVideo_USES.win = vboximportchecker … … 117 117 wddm/VBoxMPWddm.cpp \ 118 118 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 \ 122 122 wddm/VBoxMPCm.cpp \ 123 123 wddm/VBoxMPSa.cpp \ … … 137 137 ifdef VBOXWDDM_WITH_VBVA 138 138 VBoxWddm_SOURCES += \ 139 139 wddm/VBoxMPVbva.cpp 140 140 endif 141 141 ifdef VBOX_WITH_VIDEOHWACCEL 142 142 VBoxWddm_SOURCES += \ 143 143 wddm/VBoxMPVhwa.cpp 144 144 endif 145 145 … … 161 161 VBoxWddm_DEFS += WIN9X_COMPAT_SPINLOCK # to avoid multiple KeInitializeSpinLock on amd64 162 162 VBoxWddm_INCS += \ 163 $(PATH_ROOT)/src/VBox/Additions/3D/win/include \164 $(PATH_ROOT)/src/VBox/Devices/Graphics/vmsvga_include163 $(PATH_ROOT)/src/VBox/Additions/3D/win/include \ 164 $(PATH_ROOT)/src/VBox/Devices/Graphics/vmsvga_include 165 165 VBoxWddm_SOURCES += \ 166 166 wddm/gallium/Svga.cpp \ -
trunk/src/VBox/Additions/WINNT/Installer/InstallHelper/Makefile.kmk
r98103 r98416 40 40 DLLS.x86 += VBoxGuestInstallHelper 41 41 VBoxGuestInstallHelper_TEMPLATE := VBoxGuestR3Dll 42 VBoxGuestInstallHelper_INST 42 VBoxGuestInstallHelper_INST := repackadd/resources/VBoxGuestInstallHelper/ 43 43 ifdef VBOX_SIGN_ADDITIONS # (See the parent makefile.) 44 44 VBoxGuestInstallHelper_INSTTYPE := stage 45 45 VBoxGuestInstallHelper_DEBUG_INSTTYPE := both 46 46 endif 47 VBoxGuestInstallHelper_DEFS 47 VBoxGuestInstallHelper_DEFS := _WIN32_WINNT=0x0400 WIN32_LEAN_AND_MEAN=1 UNICODE _UNICODE 48 48 VBoxGuestInstallHelper_BLD_TRG_ARCH := x86 49 49 VBoxGuestInstallHelper_SOURCES := \ -
trunk/src/VBox/Additions/WINNT/Installer/InstallHelper/testcase/Makefile.kmk
r98103 r98416 30 30 31 31 ifdef VBOX_WITH_TESTCASES 32 #33 # As the testcases use the DLL directly and plugins for NSIS *always* are 32-bit,34 # we also have to use a 32-bit testcase here.35 #36 PROGRAMS.x86 += tstWinAdditionsInstallHelper37 tstWinAdditionsInstallHelper_TEMPLATE = VBoxGuestR3Exe38 tstWinAdditionsInstallHelper_SOURCES= tstWinAdditionsInstallHelper.cpp39 tstWinAdditionsInstallHelper_DEFS= _WIN32_WINNT=0x0400 WIN32_LEAN_AND_MEAN=1 UNICODE _UNICODE32 # 33 # As the testcases use the DLL directly and plugins for NSIS *always* are 32-bit, 34 # we also have to use a 32-bit testcase here. 35 # 36 PROGRAMS.x86 += tstWinAdditionsInstallHelper 37 tstWinAdditionsInstallHelper_TEMPLATE = VBoxGuestR3Exe 38 tstWinAdditionsInstallHelper_SOURCES = tstWinAdditionsInstallHelper.cpp 39 tstWinAdditionsInstallHelper_DEFS = _WIN32_WINNT=0x0400 WIN32_LEAN_AND_MEAN=1 UNICODE _UNICODE 40 40 41 41 endif # VBOX_WITH_TESTCASES -
trunk/src/VBox/Additions/WINNT/Installer/Loader/Makefile.kmk
r98128 r98416 31 31 # This has to be 32-bit. 32 32 PROGRAMS += VBoxWindowsAdditions 33 VBoxWindowsAdditions_TEMPLATE = VBoxGuestR3Exe33 VBoxWindowsAdditions_TEMPLATE = VBoxGuestR3Exe 34 34 VBoxWindowsAdditions_BLD_TRG_ARCH = x86 35 35 VBoxWindowsAdditions_DEFS = _WIN32_WINNT=0x0400 … … 39 39 VBoxWindowsAdditions.rc 40 40 ifdef VBOX_WITH_NOCRT_STATIC 41 VBoxWindowsAdditions_LDFLAGS= /SubSystem:Windows41 VBoxWindowsAdditions_LDFLAGS = /SubSystem:Windows 42 42 else 43 VBoxWindowsAdditions_LDFLAGS= \44 /DISALLOWLIB:msvcrt.lib \45 /DISALLOWLIB:msvcprt.lib \46 /DISALLOWLIB:libcmt.lib47 VBoxWindowsAdditions_LIBS= \48 $(PATH_TOOL_$(TEMPLATE_VBoxR3Exe_TOOL.win.$(KBUILD_TARGET_ARCH))_LIB)/oldnames.lib \49 $(PATH_TOOL_$(TEMPLATE_VBoxR3Exe_TOOL.win.$(KBUILD_TARGET_ARCH))_LIB)/libcmt.lib \50 $(PATH_TOOL_$(TEMPLATE_VBoxR3Exe_TOOL.win.$(KBUILD_TARGET_ARCH))_LIB)/libcpmt.lib43 VBoxWindowsAdditions_LDFLAGS = \ 44 /DISALLOWLIB:msvcrt.lib \ 45 /DISALLOWLIB:msvcprt.lib \ 46 /DISALLOWLIB:libcmt.lib 47 VBoxWindowsAdditions_LIBS = \ 48 $(PATH_TOOL_$(TEMPLATE_VBoxR3Exe_TOOL.win.$(KBUILD_TARGET_ARCH))_LIB)/oldnames.lib \ 49 $(PATH_TOOL_$(TEMPLATE_VBoxR3Exe_TOOL.win.$(KBUILD_TARGET_ARCH))_LIB)/libcmt.lib \ 50 $(PATH_TOOL_$(TEMPLATE_VBoxR3Exe_TOOL.win.$(KBUILD_TARGET_ARCH))_LIB)/libcpmt.lib 51 51 endif 52 52 VBoxWindowsAdditions_VBOX_IMPORT_CHECKER.win.x86 := nt4 -
trunk/src/VBox/Additions/WINNT/Installer/Makefile.kmk
r98257 r98416 56 56 # 57 57 PROGRAMS += VBoxDrvInst 58 VBoxDrvInst_TEMPLATE = VBoxGuestR3Exe58 VBoxDrvInst_TEMPLATE = VBoxGuestR3Exe 59 59 VBoxDrvInst_DEFS = _WIN32_WINNT=0x0400 _UNICODE UNICODE 60 60 VBoxDrvInst_DEFS += VBOX_SVN_REV=$(VBOX_SVN_REV) … … 161 161 $(PATH_STAGE_BIN)/additions/VBoxTray.exe \ 162 162 $(PATH_STAGE_BIN)/additions/VBoxControl.exe \ 163 163 \ 164 164 $(PATH_STAGE_BIN)/additions/VBoxMouse.inf \ 165 165 $(PATH_STAGE_BIN)/additions/VBoxMouse.sys \ 166 166 \ 167 167 $(PATH_STAGE_BIN)/additions/VBoxVideo.inf \ 168 168 $(PATH_STAGE_BIN)/additions/VBoxVideo.sys \ 169 169 $(PATH_STAGE_BIN)/additions/VBoxDisp.dll \ 170 170 \ 171 171 $(PATH_STAGE_BIN)/additions/VBoxSF.sys \ 172 172 $(PATH_STAGE_BIN)/additions/VBoxMRXNP.dll 173 173 174 174 ifeq ($(KBUILD_TARGET_ARCH),amd64) # 32-bit network provider DLLs for 32-bit apps running on a 64-bit system 175 VBOX_WINDOWS_ADDITIONS_ATTESTATION_SIGNED_FILES += \176 $(PATH_STAGE_BIN)/additions/VBoxMRXNP-x86.dll175 VBOX_WINDOWS_ADDITIONS_ATTESTATION_SIGNED_FILES += \ 176 $(PATH_STAGE_BIN)/additions/VBoxMRXNP-x86.dll 177 177 endif 178 178 179 179 if defined(VBOX_SIGNING_MODE) && defined(VBOX_SIGN_ADDITIONS) 180 VBOX_WINDOWS_ADDITIONS_OTHER_FILES += \181 $(PATH_STAGE_BIN)/additions/VBoxVideo.cat \182 $(PATH_STAGE_BIN)/additions/VBoxVideo-PreW10.cat \183 $(PATH_STAGE_BIN)/additions/VBoxGuest.cat \184 $(PATH_STAGE_BIN)/additions/VBoxGuest-PreW10.cat \185 $(PATH_STAGE_BIN)/additions/VBoxMouse.cat \186 $(PATH_STAGE_BIN)/additions/VBoxMouse-PreW10.cat180 VBOX_WINDOWS_ADDITIONS_OTHER_FILES += \ 181 $(PATH_STAGE_BIN)/additions/VBoxVideo.cat \ 182 $(PATH_STAGE_BIN)/additions/VBoxVideo-PreW10.cat \ 183 $(PATH_STAGE_BIN)/additions/VBoxGuest.cat \ 184 $(PATH_STAGE_BIN)/additions/VBoxGuest-PreW10.cat \ 185 $(PATH_STAGE_BIN)/additions/VBoxMouse.cat \ 186 $(PATH_STAGE_BIN)/additions/VBoxMouse-PreW10.cat 187 187 endif 188 188 … … 193 193 194 194 ifeq ($(KBUILD_TARGET_ARCH),x86) 195 VBOX_WINDOWS_ADDITIONS_OTHER_FILES += \196 $(PATH_STAGE_BIN)/additions/VBoxMouseNT.sys \197 $(PATH_STAGE_BIN)/additions/VBoxSFW2K.sys195 VBOX_WINDOWS_ADDITIONS_OTHER_FILES += \ 196 $(PATH_STAGE_BIN)/additions/VBoxMouseNT.sys \ 197 $(PATH_STAGE_BIN)/additions/VBoxSFW2K.sys 198 198 endif 199 199 200 200 ifdef VBOX_WITH_WDDM 201 VBOX_WINDOWS_ADDITIONS_ATTESTATION_SIGNED_FILES += \202 $(PATH_STAGE_BIN)/additions/VBoxWddm.inf \203 $(PATH_STAGE_BIN)/additions/VBoxWddm.sys \204 $(PATH_STAGE_BIN)/additions/VBoxDispD3D.dll201 VBOX_WINDOWS_ADDITIONS_ATTESTATION_SIGNED_FILES += \ 202 $(PATH_STAGE_BIN)/additions/VBoxWddm.inf \ 203 $(PATH_STAGE_BIN)/additions/VBoxWddm.sys \ 204 $(PATH_STAGE_BIN)/additions/VBoxDispD3D.dll 205 205 ifeq ($(KBUILD_TARGET_ARCH),amd64) 206 VBOX_WINDOWS_ADDITIONS_ATTESTATION_SIGNED_FILES += \207 $(PATH_STAGE_BIN)/additions/VBoxDispD3D-x86.dll206 VBOX_WINDOWS_ADDITIONS_ATTESTATION_SIGNED_FILES += \ 207 $(PATH_STAGE_BIN)/additions/VBoxDispD3D-x86.dll 208 208 endif 209 209 210 210 ifdef VBOX_WITH_WDDM_DX 211 VBOX_WINDOWS_ADDITIONS_ATTESTATION_SIGNED_FILES += \212 $(PATH_STAGE_BIN)/additions/VBoxDX.dll211 VBOX_WINDOWS_ADDITIONS_ATTESTATION_SIGNED_FILES += \ 212 $(PATH_STAGE_BIN)/additions/VBoxDX.dll 213 213 ifeq ($(KBUILD_TARGET_ARCH),amd64) 214 VBOX_WINDOWS_ADDITIONS_ATTESTATION_SIGNED_FILES += \215 $(PATH_STAGE_BIN)/additions/VBoxDX-x86.dll214 VBOX_WINDOWS_ADDITIONS_ATTESTATION_SIGNED_FILES += \ 215 $(PATH_STAGE_BIN)/additions/VBoxDX-x86.dll 216 216 endif 217 217 endif 218 218 219 219 ifdef VBOX_WITH_MESA3D 220 VBOX_WINDOWS_ADDITIONS_ATTESTATION_SIGNED_FILES += \221 $(PATH_STAGE_BIN)/additions/VBoxNine.dll \222 $(PATH_STAGE_BIN)/additions/VBoxSVGA.dll \223 $(PATH_STAGE_BIN)/additions/VBoxGL.dll220 VBOX_WINDOWS_ADDITIONS_ATTESTATION_SIGNED_FILES += \ 221 $(PATH_STAGE_BIN)/additions/VBoxNine.dll \ 222 $(PATH_STAGE_BIN)/additions/VBoxSVGA.dll \ 223 $(PATH_STAGE_BIN)/additions/VBoxGL.dll 224 224 ifeq ($(KBUILD_TARGET_ARCH),amd64) 225 VBOX_WINDOWS_ADDITIONS_ATTESTATION_SIGNED_FILES += \226 $(PATH_STAGE_BIN)/additions/VBoxNine-x86.dll \227 $(PATH_STAGE_BIN)/additions/VBoxSVGA-x86.dll \228 $(PATH_STAGE_BIN)/additions/VBoxGL-x86.dll225 VBOX_WINDOWS_ADDITIONS_ATTESTATION_SIGNED_FILES += \ 226 $(PATH_STAGE_BIN)/additions/VBoxNine-x86.dll \ 227 $(PATH_STAGE_BIN)/additions/VBoxSVGA-x86.dll \ 228 $(PATH_STAGE_BIN)/additions/VBoxGL-x86.dll 229 229 endif 230 230 endif 231 231 232 232 if defined(VBOX_SIGNING_MODE) && defined(VBOX_SIGN_ADDITIONS) 233 VBOX_WINDOWS_ADDITIONS_OTHER_FILES += \234 $(PATH_STAGE_BIN)/additions/VBoxWddm.cat \235 $(PATH_STAGE_BIN)/additions/VBoxWddm-PreW10.cat233 VBOX_WINDOWS_ADDITIONS_OTHER_FILES += \ 234 $(PATH_STAGE_BIN)/additions/VBoxWddm.cat \ 235 $(PATH_STAGE_BIN)/additions/VBoxWddm-PreW10.cat 236 236 endif 237 237 endif # VBOX_WITH_WDDM 238 238 239 239 ifdef env.VBOX_WITH_ADDITIONS_SHIPPING_AUDIO_TEST 240 VBOX_WINDOWS_ADDITIONS_OTHER_FILES += \241 $(PATH_STAGE_BIN)/additions/VBoxAudioTest.exe240 VBOX_WINDOWS_ADDITIONS_OTHER_FILES += \ 241 $(PATH_STAGE_BIN)/additions/VBoxAudioTest.exe 242 242 endif 243 243 … … 280 280 -E 'KBUILD_TYPE=$(KBUILD_TYPE)' \ 281 281 -E 'KBUILD_TARGET_ARCH=$(KBUILD_TARGET_ARCH)' \ 282 283 282 $(foreach base, VBOX_GA_CERT_ROOT_SHA1 VBOX_GA_CERT_ROOT_SHA2 VBOX_GA_CERT_ROOT_SHA2_R3 \ 283 ,-E '$(base)=$(firstword $($(base)) none)' -E '$(base)_TS=$(firstword $($(base)_TS) none)') 284 284 285 285 $(PATH_STAGE_BIN)/additions/VBoxWindowsAdditions-$(KBUILD_TARGET_ARCH).exe: \ … … 328 328 329 329 ifdef VBOX_SIGNING_MODE 330 #331 # This is a hack to sign the uninstaller.332 # See http://nsis.sourceforge.net/Signing_an_Uninstaller for more details.333 #334 OTHER_CLEAN += \335 $(PATH_TARGET)/VBoxWindowsAdditions-$(KBUILD_TARGET_ARCH)-uninst.exe \336 $(PATH_TARGET)/uninst.exe337 $(PATH_TARGET)/VBoxWindowsAdditions-$(KBUILD_TARGET_ARCH)-uninst.exe: \338 $(PATH_SUB_CURRENT)/VBoxGuestAdditions.nsi \339 $(PATH_SUB_CURRENT)/VBoxGuestAdditionsCommon.nsh \340 $(PATH_SUB_CURRENT)/VBoxGuestAdditionsExternal.nsh \341 $(PATH_SUB_CURRENT)/VBoxGuestAdditionsLog.nsh \342 $(PATH_SUB_CURRENT)/VBoxGuestAdditionsUninstall.nsh \343 $(PATH_SUB_CURRENT)/VBoxGuestAdditionsNT4.nsh \344 $(PATH_SUB_CURRENT)/VBoxGuestAdditionsW2KXP.nsh \345 $(PATH_SUB_CURRENT)/VBoxGuestAdditionsVista.nsh \346 $(PATH_SUB_CURRENT)/dumplog.nsh \347 $(PATH_SUB_CURRENT)/ReplaceDLL.nsh \348 $(PATH_SUB_CURRENT)/servicepack.nsh \349 $(PATH_SUB_CURRENT)/strstr.nsh \350 $(PATH_SUB_CURRENT)/winver.nsh \351 $(PATH_SUB_CURRENT)/Languages/English.nsh \352 $(PATH_SUB_CURRENT)/Languages/German.nsh \353 $(PATH_SUB_CURRENT)/Languages/French.nsh \354 $(VBOX_WINDOWS_ADDITIONS_ATTESTATION_SIGNED_FILES) \355 $(VBOX_WINDOWS_ADDITIONS_OTHER_FILES) \356 $(VBOX_WINDOWS_ADDITIONS_ICON_FILE) \357 $(VBOX_NSIS_ICON_FILE) \358 $(VBOX_VERSION_STAMP) \359 360 | $$(dir $$@)330 # 331 # This is a hack to sign the uninstaller. 332 # See http://nsis.sourceforge.net/Signing_an_Uninstaller for more details. 333 # 334 OTHER_CLEAN += \ 335 $(PATH_TARGET)/VBoxWindowsAdditions-$(KBUILD_TARGET_ARCH)-uninst.exe \ 336 $(PATH_TARGET)/uninst.exe 337 $(PATH_TARGET)/VBoxWindowsAdditions-$(KBUILD_TARGET_ARCH)-uninst.exe: \ 338 $(PATH_SUB_CURRENT)/VBoxGuestAdditions.nsi \ 339 $(PATH_SUB_CURRENT)/VBoxGuestAdditionsCommon.nsh \ 340 $(PATH_SUB_CURRENT)/VBoxGuestAdditionsExternal.nsh \ 341 $(PATH_SUB_CURRENT)/VBoxGuestAdditionsLog.nsh \ 342 $(PATH_SUB_CURRENT)/VBoxGuestAdditionsUninstall.nsh \ 343 $(PATH_SUB_CURRENT)/VBoxGuestAdditionsNT4.nsh \ 344 $(PATH_SUB_CURRENT)/VBoxGuestAdditionsW2KXP.nsh \ 345 $(PATH_SUB_CURRENT)/VBoxGuestAdditionsVista.nsh \ 346 $(PATH_SUB_CURRENT)/dumplog.nsh \ 347 $(PATH_SUB_CURRENT)/ReplaceDLL.nsh \ 348 $(PATH_SUB_CURRENT)/servicepack.nsh \ 349 $(PATH_SUB_CURRENT)/strstr.nsh \ 350 $(PATH_SUB_CURRENT)/winver.nsh \ 351 $(PATH_SUB_CURRENT)/Languages/English.nsh \ 352 $(PATH_SUB_CURRENT)/Languages/German.nsh \ 353 $(PATH_SUB_CURRENT)/Languages/French.nsh \ 354 $(VBOX_WINDOWS_ADDITIONS_ATTESTATION_SIGNED_FILES) \ 355 $(VBOX_WINDOWS_ADDITIONS_OTHER_FILES) \ 356 $(VBOX_WINDOWS_ADDITIONS_ICON_FILE) \ 357 $(VBOX_NSIS_ICON_FILE) \ 358 $(VBOX_VERSION_STAMP) \ 359 $$(VBoxDrvInst_1_STAGE_TARGET) \ 360 | $$(dir $$@) 361 361 $(call MSG_L1,Creating $@, from $<) 362 362 $(QUIET)$(REDIRECT) -C $(VBOX_PATH_WIN_ADD_INS_SRC) \ … … 370 370 '$(subst /,\,$<)' 371 371 372 $(PATH_TARGET)/uninst.exe: $(PATH_TARGET)/VBoxWindowsAdditions-$(KBUILD_TARGET_ARCH)-uninst.exe | $$(dir $$@)372 $(PATH_TARGET)/uninst.exe: $(PATH_TARGET)/VBoxWindowsAdditions-$(KBUILD_TARGET_ARCH)-uninst.exe | $$(dir $$@) 373 373 $(call MSG_L1,Creating $@, from $<) 374 374 $(QUIET)$(RM) -f $@ … … 381 381 382 382 if defined(VBOX_GA_ATTESTATION_SIGNING) && defined(VBOX_SIGNING_MODE) && defined(VBOX_SIGN_ADDITIONS) 383 #384 # This automagically attestation signs the GA drivers.385 #386 $(PATH_OUT)/repackadd/$(VBOX_SIGNED_DRIVERS_ZIP_NAME): \387 $(PATH_OUT)/repackadd/sign-attestation.sh \388 $(PATH_OUT)/repackadd/$(VBOX_DRIVERS_PACK_NAME)383 # 384 # This automagically attestation signs the GA drivers. 385 # 386 $(PATH_OUT)/repackadd/$(VBOX_SIGNED_DRIVERS_ZIP_NAME): \ 387 $(PATH_OUT)/repackadd/sign-attestation.sh \ 388 $(PATH_OUT)/repackadd/$(VBOX_DRIVERS_PACK_NAME) 389 389 $(RM_EXT) -f $(PATH_OUT)/repackadd/*.zip 390 390 cd $(PATH_OUT)/repackadd && $(SHELL) $(PATH_OUT)/repackadd/sign-attestation.sh $(PATH_OUT)/repackadd/$(VBOX_DRIVERS_PACK_NAME) 391 391 $(MV_EXT) $(PATH_OUT)/repackadd/$(VBOX_DRIVERS_PACK_NAME).*.zip $(PATH_OUT)/repackadd/$(VBOX_SIGNED_DRIVERS_ZIP_NAME) 392 392 393 #394 # This creates a .CAB file of the driver files that should be attestation signed.395 #396 $(PATH_OUT)/repackadd/$(VBOX_DRIVERS_PACK_NAME): \397 $(PATH_OUT)/repackadd/PackDriversForSubmission.cmd \398 #$(VBOX_WINDOWS_ADDITIONS_ATTESTATION_SIGNED_FILES) - is is unsafe, because of the 'ing ugly hack replacing most of them above during packing.393 # 394 # This creates a .CAB file of the driver files that should be attestation signed. 395 # 396 $(PATH_OUT)/repackadd/$(VBOX_DRIVERS_PACK_NAME): \ 397 $(PATH_OUT)/repackadd/PackDriversForSubmission.cmd \ 398 # $(VBOX_WINDOWS_ADDITIONS_ATTESTATION_SIGNED_FILES) - is is unsafe, because of the 'ing ugly hack replacing most of them above during packing. 399 399 $(RM_EXT) -f $(PATH_OUT)/repackadd/*.cab 400 400 $(RM_EXT) -f $(PATH_OUT)/repackadd/*.ddf … … 424 424 425 425 ifndef VBOX_OSE 426 RePackScriptsAdd_SOURCES += \427 $(RePackScriptsAdd_0_OUTDIR)/Combined-0-Additions.cmd \428 $(RePackScriptsAdd_0_OUTDIR)/Combined-2-SignAdditions.cmd \429 ../../../Installer/win/Scripts/sign-attestation.sh426 RePackScriptsAdd_SOURCES += \ 427 $(RePackScriptsAdd_0_OUTDIR)/Combined-0-Additions.cmd \ 428 $(RePackScriptsAdd_0_OUTDIR)/Combined-2-SignAdditions.cmd \ 429 ../../../Installer/win/Scripts/sign-attestation.sh 430 430 endif 431 431 … … 433 433 $(call VBOX_EDIT_VERSION_AND_BUILD_RULE_FN,RePackScriptsAdd,../../../Installer/win/Scripts/Combined-1-Prepare.cmd,Combined-1-Prepare.cmd) 434 434 ifndef VBOX_OSE 435 $(call VBOX_EDIT_VERSION_AND_BUILD_RULE_FN,RePackScriptsAdd,../../../Installer/win/Scripts/Combined-0-Additions.cmd,Combined-0-Additions.cmd)436 $(call VBOX_EDIT_VERSION_AND_BUILD_RULE_FN,RePackScriptsAdd,../../../Installer/win/Scripts/Combined-2-SignAdditions.cmd,Combined-2-SignAdditions.cmd)435 $(call VBOX_EDIT_VERSION_AND_BUILD_RULE_FN,RePackScriptsAdd,../../../Installer/win/Scripts/Combined-0-Additions.cmd,Combined-0-Additions.cmd) 436 $(call VBOX_EDIT_VERSION_AND_BUILD_RULE_FN,RePackScriptsAdd,../../../Installer/win/Scripts/Combined-2-SignAdditions.cmd,Combined-2-SignAdditions.cmd) 437 437 endif 438 438 $(call VBOX_EDIT_VERSION_AND_BUILD_RULE_FN,RePackScriptsAdd,../../../Installer/win/Scripts/Combined-3-RepackAdditions.cmd,Combined-3-RepackAdditions.cmd) … … 470 470 VBoxGuestAdditionsCommon.nsh \ 471 471 VBoxGuestAdditionsExternal.nsh \ 472 VBoxGuestAdditionsLog.nsh \472 VBoxGuestAdditionsLog.nsh \ 473 473 VBoxGuestAdditionsNT4.nsh \ 474 474 VBoxGuestAdditionsUninstall.nsh \ 475 475 VBoxGuestAdditionsUninstallOld.nsh \ 476 VBoxGuestAdditionsVista.nsh \477 VBoxGuestAdditionsW2KXP.nsh \476 VBoxGuestAdditionsVista.nsh \ 477 VBoxGuestAdditionsW2KXP.nsh \ 478 478 winver.nsh \ 479 479 ISO/AUTORUN.INF \ 480 480 ISO/NT3xReadme.txt \ 481 481 \ 482 482 Languages/English.nsh=>Languages/English.nsh \ 483 483 Languages/French.nsh=>Languages/French.nsh \ … … 494 494 PROGRAMS.win.x86 += VBoxAddInstallNt3x 495 495 ifdef VBOX_WITH_NOCRT_STATIC 496 ## @todo noCRT: the result is much too big. Got rid of log.cpp, but still pretty big. Work on reducing it.497 VBoxAddInstallNt3x_TEMPLATE := VBoxGuestR3Exe496 ## @todo noCRT: the result is much too big. Got rid of log.cpp, but still pretty big. Work on reducing it. 497 VBoxAddInstallNt3x_TEMPLATE := VBoxGuestR3Exe 498 498 else 499 VBoxAddInstallNt3x_TEMPLATE := VBoxGuestR3NoCrtExe499 VBoxAddInstallNt3x_TEMPLATE := VBoxGuestR3NoCrtExe 500 500 endif 501 501 VBoxAddInstallNt3x_SOURCES := VBoxAddInstallNt3x.cpp -
trunk/src/VBox/Additions/WINNT/Mouse/NT4/Makefile.kmk
r98126 r98416 39 39 VBoxPS2NT.cpp \ 40 40 VBoxPS2NT.rc \ 41 42 43 44 41 ../../../../Runtime/r0drv/nt/nt3fakes-r0drv-nt.cpp \ 42 ../../../../Runtime/r0drv/nt/nt3fakesA-r0drv-nt.asm \ 43 ../../../../Runtime/common/string/strcmp.asm \ 44 ../../../../Runtime/common/string/strchr.asm 45 45 VBoxMouseNT_LIBS = \ 46 46 $(VBOX_LIB_IPRT_GUEST_R0_NT4) \ … … 52 52 ifneq ($(VBOX_VCC_CC_GUARD_CF),) 53 53 VBoxMouseNT_LIBS.x86 += \ 54 54 $(PATH_SDK_$(VBOX_WINDDK_GST)_LIB)/BufferOverflowK.lib 55 55 endif 56 56 VBoxMouseNT_CLEAN = \ -
trunk/src/VBox/Additions/WINNT/Mouse/NT5/Makefile.kmk
r98126 r98416 84 84 if defined(VBOX_SIGNING_MODE) && defined(VBOX_SIGN_ADDITIONS) 85 85 VBoxMouse-inf_SOURCES += \ 86 87 88 86 $(PATH_TARGET)/VBoxMouseCat.dir/VBoxMouse.sys \ 87 $(PATH_TARGET)/VBoxMouseCat.dir/VBoxMouse.cat \ 88 $(PATH_TARGET)/VBoxMouseCat.dir/VBoxMouse.cat=>VBoxMouse-PreW10.cat 89 89 90 90 $(PATH_TARGET)/VBoxMouseCat.dir/VBoxMouse.sys: $$(VBoxMouse_1_TARGET) | $$(dir $$@) -
trunk/src/VBox/Additions/WINNT/SharedFolders/driver/Makefile.kmk
r98126 r98416 51 51 path.cpp \ 52 52 vbsfhlp.cpp \ 53 53 VBoxSF.rc 54 54 VBoxSF_SOURCES.x86 = \ 55 55 Win2kWorkarounds.c \ … … 64 64 ifneq ($(VBOX_VCC_CC_GUARD_CF),) 65 65 VBoxSF_LIBS += \ 66 $(PATH_SDK_$(VBOX_WINDDK_GST)_LIB.$(KBUILD_TARGET_ARCH))/ntoskrnl.lib \66 $(PATH_SDK_$(VBOX_WINDDK_GST)_LIB.$(KBUILD_TARGET_ARCH))/ntoskrnl.lib \ 67 67 $(PATH_SDK_$(VBOX_WINDDK_GST)_LIB.$(KBUILD_TARGET_ARCH))/BufferOverflowK.lib 68 68 else 69 69 VBoxSF_LIBS += \ 70 $(PATH_SDK_$(VBOX_WINDDK_GST_WLH)_LIB.$(KBUILD_TARGET_ARCH))/ntoskrnl.lib \70 $(PATH_SDK_$(VBOX_WINDDK_GST_WLH)_LIB.$(KBUILD_TARGET_ARCH))/ntoskrnl.lib \ 71 71 $(PATH_SDK_$(VBOX_WINDDK_GST_WLH)_LIB.$(KBUILD_TARGET_ARCH))/BufferOverflowK.lib 72 72 endif … … 97 97 $(PATH_SDK_$(VBOX_WINDDK_GST_W2K3)_LIB.x86)/hal.lib \ 98 98 $(PATH_SDK_$(VBOX_WINDDK_GST_W2K3)_LIB.x86)/ksecdd.lib \ 99 \100 $(VBOX_LIB_VBGL_R0) \101 $(VBOX_LIB_IPRT_GUEST_R0) \99 \ 100 $(VBOX_LIB_VBGL_R0) \ 101 $(VBOX_LIB_IPRT_GUEST_R0) \ 102 102 $(PATH_SDK_$(VBOX_WINDDK_GST_W2K3)_LIB)/int64.lib 103 103 ifneq ($(VBOX_VCC_CC_GUARD_CF),) 104 104 VBoxSFW2K_LIBS += \ 105 $(PATH_SDK_$(VBOX_WINDDK_GST)_LIB.x86)/ntoskrnl.lib \105 $(PATH_SDK_$(VBOX_WINDDK_GST)_LIB.x86)/ntoskrnl.lib \ 106 106 $(PATH_SDK_$(VBOX_WINDDK_GST)_LIB.x86)/BufferOverflowK.lib 107 107 else 108 108 VBoxSFW2K_LIBS += \ 109 $(PATH_SDK_$(VBOX_WINDDK_GST_W2K3)_LIB.x86)/ntoskrnl.lib \109 $(PATH_SDK_$(VBOX_WINDDK_GST_W2K3)_LIB.x86)/ntoskrnl.lib \ 110 110 $(PATH_SDK_$(VBOX_WINDDK_GST_W2K3)_LIB.x86)/BufferOverflowK.lib 111 111 endif … … 121 121 122 122 ifeq ($(KBUILD_TARGET_ARCH),x86) 123 $(VBoxSF_0_OUTDIR)/rdbsslib.lib: $$(PATH_SDK_$(VBOX_WINDDK_GST_WLH)_LIB.$(KBUILD_TARGET_ARCH))/rdbsslib.lib | $$(dir $$@) $(VBOX_EDIT_COFF_LIB)123 $(VBoxSF_0_OUTDIR)/rdbsslib.lib: $$(PATH_SDK_$(VBOX_WINDDK_GST_WLH)_LIB.$(KBUILD_TARGET_ARCH))/rdbsslib.lib | $$(dir $$@) $(VBOX_EDIT_COFF_LIB) 124 124 $(call KB_FN_AUTO_CMD_DEPS_COMMANDS) 125 125 $(VBOX_EDIT_COFF_LIB) --input "$(PATH_SDK_$(VBOX_WINDDK_GST_WLH)_LIB.$(KBUILD_TARGET_ARCH))/rdbsslib.lib" --output "$@" \ … … 130 130 --redefine-sym "__imp__CcFlushCache@16=_g_pfnRdFlushCache" 131 131 132 $(call KB_FN_AUTO_CMD_DEPS,$(VBoxSFW2K_0_OUTDIR)/rdbsslib.lib)133 $(VBoxSFW2K_0_OUTDIR)/rdbsslib.lib: $$(PATH_SDK_$(VBOX_WINDDK_GST_W2K3)_LIB.$(KBUILD_TARGET_ARCH))/rdbsslib.lib | $$(dir $$@) $(VBOX_EDIT_COFF_LIB)132 $(call KB_FN_AUTO_CMD_DEPS,$(VBoxSFW2K_0_OUTDIR)/rdbsslib.lib) 133 $(VBoxSFW2K_0_OUTDIR)/rdbsslib.lib: $$(PATH_SDK_$(VBOX_WINDDK_GST_W2K3)_LIB.$(KBUILD_TARGET_ARCH))/rdbsslib.lib | $$(dir $$@) $(VBOX_EDIT_COFF_LIB) 134 134 $(call KB_FN_AUTO_CMD_DEPS_COMMANDS) 135 135 $(VBOX_EDIT_COFF_LIB) --input "$(PATH_SDK_$(VBOX_WINDDK_GST_W2K3)_LIB.$(KBUILD_TARGET_ARCH))/rdbsslib.lib" --output "$@" \ … … 140 140 --redefine-sym "__imp__CcFlushCache@16=_g_pfnRdFlushCache" 141 141 else 142 $(VBoxSF_0_OUTDIR)/rdbsslib.lib: $$(PATH_SDK_$(VBOX_WINDDK_GST_WLH)_LIB.$(KBUILD_TARGET_ARCH))/rdbsslib.lib | $$(dir $$@) $(VBOX_EDIT_COFF_LIB)142 $(VBoxSF_0_OUTDIR)/rdbsslib.lib: $$(PATH_SDK_$(VBOX_WINDDK_GST_WLH)_LIB.$(KBUILD_TARGET_ARCH))/rdbsslib.lib | $$(dir $$@) $(VBOX_EDIT_COFF_LIB) 143 143 $(call KB_FN_AUTO_CMD_DEPS_COMMANDS) 144 144 $(VBOX_EDIT_COFF_LIB) --input "$(PATH_SDK_$(VBOX_WINDDK_GST_WLH)_LIB.$(KBUILD_TARGET_ARCH))/rdbsslib.lib" --output "$@" \ -
trunk/src/VBox/Additions/WINNT/VBoxGINA/Makefile.kmk
r98103 r98416 34 34 VBoxGINA_SOURCES = \ 35 35 VBoxGINA.cpp \ 36 Helper.cpp 36 Helper.cpp \ 37 37 Dialog.cpp \ 38 38 VBoxGINA.def \ -
trunk/src/VBox/Additions/WINNT/VBoxHook/testcase/Makefile.kmk
r98103 r98416 31 31 ifdef VBOX_WITH_TESTCASES 32 32 33 #34 # Structure size testcase.35 #36 PROGRAMS += tstHook33 # 34 # Structure size testcase. 35 # 36 PROGRAMS += tstHook 37 37 38 tstHook_TEMPLATE = VBoxGuestR3Exe39 tstHook_DEFS= VBOX_WITH_HGCM40 tstHook_SOURCES= tstHook.cpp41 tstHook_INCS= ../../include42 tstHook_LIBS= $(PATH_STAGE_LIB)/VBoxHook.lib43 tstHook_VBOX_IMPORT_CHECKER.win.x86= $(NO_SUCH_VARIABLE)44 tstHook_VBOX_IMPORT_CHECKER.win.amd64 = $(NO_SUCH_VARIABLE)38 tstHook_TEMPLATE = VBoxGuestR3Exe 39 tstHook_DEFS = VBOX_WITH_HGCM 40 tstHook_SOURCES = tstHook.cpp 41 tstHook_INCS = ../../include 42 tstHook_LIBS = $(PATH_STAGE_LIB)/VBoxHook.lib 43 tstHook_VBOX_IMPORT_CHECKER.win.x86 = $(NO_SUCH_VARIABLE) 44 tstHook_VBOX_IMPORT_CHECKER.win.amd64 = $(NO_SUCH_VARIABLE) 45 45 46 46 endif # VBOX_WITH_TESTCASES -
trunk/src/VBox/Additions/WINNT/VBoxTray/Makefile.kmk
r98103 r98416 64 64 ifdef VBOX_WITH_SHARED_CLIPBOARD 65 65 VBoxTray_DEFS += \ 66 $(if $(VBOX_WITH_SHARED_CLIPBOARD),VBOX_WITH_SHARED_CLIPBOARD,) \67 $(if $(VBOX_WITH_SHARED_CLIPBOARD_TRANSFERS),VBOX_WITH_SHARED_CLIPBOARD_TRANSFERS,)66 $(if $(VBOX_WITH_SHARED_CLIPBOARD),VBOX_WITH_SHARED_CLIPBOARD,) \ 67 $(if $(VBOX_WITH_SHARED_CLIPBOARD_TRANSFERS),VBOX_WITH_SHARED_CLIPBOARD_TRANSFERS,) 68 68 VBoxTray_SOURCES += \ 69 VBoxClipboard.cpp \70 $(PATH_ROOT)/src/VBox/GuestHost/SharedClipboard/clipboard-win.cpp \71 $(PATH_ROOT)/src/VBox/GuestHost/SharedClipboard/clipboard-common.cpp69 VBoxClipboard.cpp \ 70 $(PATH_ROOT)/src/VBox/GuestHost/SharedClipboard/clipboard-win.cpp \ 71 $(PATH_ROOT)/src/VBox/GuestHost/SharedClipboard/clipboard-common.cpp 72 72 ifdef VBOX_WITH_SHARED_CLIPBOARD_TRANSFERS 73 73 VBoxTray_DEFS += VBOX_WITH_SHARED_CLIPBOARD_GUEST 74 74 VBoxTray_SOURCES += \ 75 $(PATH_ROOT)/src/VBox/GuestHost/SharedClipboard/ClipboardDataObjectImpl-win.cpp \76 $(PATH_ROOT)/src/VBox/GuestHost/SharedClipboard/ClipboardEnumFormatEtcImpl-win.cpp \77 $(PATH_ROOT)/src/VBox/GuestHost/SharedClipboard/ClipboardPath.cpp \78 $(PATH_ROOT)/src/VBox/GuestHost/SharedClipboard/ClipboardStreamImpl-win.cpp \79 $(PATH_ROOT)/src/VBox/GuestHost/SharedClipboard/clipboard-transfers.cpp75 $(PATH_ROOT)/src/VBox/GuestHost/SharedClipboard/ClipboardDataObjectImpl-win.cpp \ 76 $(PATH_ROOT)/src/VBox/GuestHost/SharedClipboard/ClipboardEnumFormatEtcImpl-win.cpp \ 77 $(PATH_ROOT)/src/VBox/GuestHost/SharedClipboard/ClipboardPath.cpp \ 78 $(PATH_ROOT)/src/VBox/GuestHost/SharedClipboard/ClipboardStreamImpl-win.cpp \ 79 $(PATH_ROOT)/src/VBox/GuestHost/SharedClipboard/clipboard-transfers.cpp 80 80 endif 81 81 endif 82 82 ifdef VBOX_WITH_DRAG_AND_DROP 83 83 VBoxTray_DEFS += \ 84 VBOX_WITH_DRAG_AND_DROP \85 $(if $(VBOX_WITH_DRAG_AND_DROP_GH),VBOX_WITH_DRAG_AND_DROP_GH,)84 VBOX_WITH_DRAG_AND_DROP \ 85 $(if $(VBOX_WITH_DRAG_AND_DROP_GH),VBOX_WITH_DRAG_AND_DROP_GH,) 86 86 VBoxTray_SOURCES += \ 87 VBoxDnD.cpp \88 VBoxDnDDataObject.cpp \89 VBoxDnDEnumFormat.cpp \90 VBoxDnDDropSource.cpp \91 VBoxDnDDropTarget.cpp87 VBoxDnD.cpp \ 88 VBoxDnDDataObject.cpp \ 89 VBoxDnDEnumFormat.cpp \ 90 VBoxDnDDropSource.cpp \ 91 VBoxDnDDropTarget.cpp 92 92 VBoxTray_LIBS += \ 93 $(PATH_STAGE_LIB)/additions/VBoxDnDGuestR3Lib$(VBOX_SUFF_LIB)93 $(PATH_STAGE_LIB)/additions/VBoxDnDGuestR3Lib$(VBOX_SUFF_LIB) 94 94 endif 95 95 ifdef VBOX_WITH_GUEST_PROPS 96 96 VBoxTray_DEFS += _WIN32_IE=0x500 VBOX_WITH_GUEST_PROPS 97 97 VBoxTray_SOURCES += \ 98 VBoxHostVersion.cpp \99 VBoxLA.cpp98 VBoxHostVersion.cpp \ 99 VBoxLA.cpp 100 100 endif 101 101 ifdef VBOX_WITH_WDDM
Note:
See TracChangeset
for help on using the changeset viewer.