VirtualBox

Ignore:
Timestamp:
Jul 20, 2012 3:26:51 PM (13 years ago)
Author:
vboxsync
Message:

Enabled the W8 display miniport driver. Cleaned up some mess.

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

Legend:

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

    r42218 r42280  
    3434        $(PATH_TARGET)/VBoxVideoCat.dir/VBoxVideo.inf
    3535ifdef VBOX_SIGN_ADDITIONS
    36 VBoxVideo-inf_SOURCES += \
    37         $(PATH_TARGET)/VBoxVideoCat.dir/VBoxVideo.sys \
    38         $(PATH_TARGET)/VBoxVideoCat.dir/VBoxDisp.dll \
    39         $(PATH_TARGET)/VBoxVideoCat.dir/VBoxVideo.cat
    40 endif # signing
     36 VBoxVideo-inf_SOURCES += \
     37        $(PATH_TARGET)/VBoxVideoCat.dir/VBoxVideo.sys \
     38        $(PATH_TARGET)/VBoxVideoCat.dir/VBoxDisp.dll \
     39        $(PATH_TARGET)/VBoxVideoCat.dir/VBoxVideo.cat
     40endif
    4141VBoxVideo-inf_CLEAN = $(VBoxVideo-inf_SOURCES)
    4242VBoxVideo-inf_BLDDIRS = \
     
    6161
    6262ifdef VBOX_WITH_WDDM
    63 VBOXWDDM_WITH_DISPD3D = 1
     63 VBOXWDDM_WITH_DISPD3D = 1
    6464 ifdef VBOX_WITH_CROGL
    6565  VBOXWDDM_WITH_GL = 1
    6666 endif
    6767
    68 #
    69 # Install the inf & cat.
    70 # This has to be done here since it depends on both the
    71 # miniport driver and the display dll.
    72 #
    73 INSTALLS += VBoxVideoWddm-inf
    74 VBoxVideoWddm-inf_INST = $(INST_ADDITIONS)
    75 VBoxVideoWddm-inf_MODE = a+r,u+w
    76 VBoxVideoWddm-inf_SOURCES = \
    77     $(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxVideoWddm.inf
    78 ifdef VBOX_SIGN_ADDITIONS
    79 VBoxVideoWddm-inf_SOURCES += \
    80     $(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxVideoWddm.sys \
    81     $(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxVideoWddm.cat
    82 
    83 ifdef VBOXWDDM_WITH_DISPD3D
    84 VBoxVideoWddm-inf_SOURCES += \
    85  $(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxDispD3D.dll
    86 VBoxVideoWddm-inf_SOURCES.amd64 += \
    87  $(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxDispD3D-x86.dll
    88 endif # VBOXWDDM_WITH_DISPD3D
    89 
    90 ifdef VBOXWDDM_WITH_GL
    91  VBoxVideoWddm-inf_SOURCES += \
    92         $(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxOGL.dll \
    93         $(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxD3D9wddm.dll \
    94         $(PATH_TARGET)/VBoxVideoWddmCat.dir/wined3dwddm.dll \
    95         $(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxOGLarrayspu.dll \
    96         $(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxOGLcrutil.dll \
    97         $(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxOGLerrorspu.dll \
    98         $(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxOGLfeedbackspu.dll \
    99         $(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxOGLpackspu.dll \
    100         $(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxOGLpassthroughspu.dll
    101  VBoxVideoWddm-inf_SOURCES.amd64 += \
    102         $(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxOGL-x86.dll \
    103         $(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxD3D9wddm-x86.dll \
    104         $(PATH_TARGET)/VBoxVideoWddmCat.dir/wined3dwddm-x86.dll \
    105         $(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxOGLarrayspu-x86.dll \
    106         $(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxOGLcrutil-x86.dll \
    107         $(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxOGLerrorspu-x86.dll \
    108         $(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxOGLfeedbackspu-x86.dll \
    109         $(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxOGLpackspu-x86.dll \
    110         $(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxOGLpassthroughspu-x86.dll
    111 endif # VBOXWDDM_WITH_GL
    112 
    113 endif # signing
    114 VBoxVideoWddm-inf_CLEAN = $(VBoxVideoWddm-inf_SOURCES)
    115 VBoxVideoWddm-inf_BLDDIRS = \
    116     $(PATH_TARGET)/VBoxVideoWddmCat.dir
    117 
    118 VBOXWDDM_EDIT_INF_DISPD3D_FN_ARG = $(if $(VBOXWDDM_WITH_DISPD3D),-e 's/^;dispd3d  *//', -e '/^;dispd3d /d')
    119 VBOXWDDM_EDIT_INF_GL_FN_ARG      = $(if $(VBOXWDDM_WITH_GL),-e 's/^;gl  *//', -e '/^;gl /d')
    120 
    121 $(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxVideoWddm.inf: $(PATH_SUB_CURRENT)/mp/wddm/VBoxVideoWddm.inf $(MAKEFILE_CURRENT) | $$(dir $$@)
     68 #
     69 # Install the inf & cat.
     70 # This has to be done here since it depends on both the
     71 # miniport driver and the display dll.
     72 #
     73 INSTALLS += VBoxVideoWddm-inf
     74 VBoxVideoWddm-inf_INST = $(INST_ADDITIONS)
     75 VBoxVideoWddm-inf_MODE = a+r,u+w
     76 VBoxVideoWddm-inf_SOURCES = \
     77        $(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxVideoWddm.inf
     78 ifdef VBOX_SIGN_ADDITIONS
     79  VBoxVideoWddm-inf_SOURCES += \
     80        $(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxVideoWddm.sys \
     81        $(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxVideoWddm.cat
     82
     83  ifdef VBOXWDDM_WITH_DISPD3D
     84   VBoxVideoWddm-inf_SOURCES += \
     85        $(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxDispD3D.dll
     86   VBoxVideoWddm-inf_SOURCES.amd64 += \
     87        $(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxDispD3D-x86.dll
     88  endif # VBOXWDDM_WITH_DISPD3D
     89
     90  ifdef VBOXWDDM_WITH_GL
     91   VBoxVideoWddm-inf_SOURCES += \
     92        $(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxOGL.dll \
     93        $(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxD3D9wddm.dll \
     94        $(PATH_TARGET)/VBoxVideoWddmCat.dir/wined3dwddm.dll \
     95        $(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxOGLarrayspu.dll \
     96        $(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxOGLcrutil.dll \
     97        $(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxOGLerrorspu.dll \
     98        $(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxOGLfeedbackspu.dll \
     99        $(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxOGLpackspu.dll \
     100        $(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxOGLpassthroughspu.dll
     101   VBoxVideoWddm-inf_SOURCES.amd64 += \
     102        $(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxOGL-x86.dll \
     103        $(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxD3D9wddm-x86.dll \
     104        $(PATH_TARGET)/VBoxVideoWddmCat.dir/wined3dwddm-x86.dll \
     105        $(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxOGLarrayspu-x86.dll \
     106        $(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxOGLcrutil-x86.dll \
     107        $(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxOGLerrorspu-x86.dll \
     108        $(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxOGLfeedbackspu-x86.dll \
     109        $(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxOGLpackspu-x86.dll \
     110        $(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxOGLpassthroughspu-x86.dll
     111  endif # VBOXWDDM_WITH_GL
     112
     113 endif # signing
     114 VBoxVideoWddm-inf_CLEAN = $(VBoxVideoWddm-inf_SOURCES)
     115 VBoxVideoWddm-inf_BLDDIRS = \
     116        $(PATH_TARGET)/VBoxVideoWddmCat.dir
     117
     118 VBOXWDDM_EDIT_INF_DISPD3D_FN_ARG = $(if $(VBOXWDDM_WITH_DISPD3D),-e 's/^;dispd3d  *//', -e '/^;dispd3d /d')
     119 VBOXWDDM_EDIT_INF_GL_FN_ARG      = $(if $(VBOXWDDM_WITH_GL),-e 's/^;gl  *//', -e '/^;gl /d')
     120
     121 $(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxVideoWddm.inf: \
     122                $(PATH_SUB_CURRENT)/mp/wddm/VBoxVideoWddm.inf $(MAKEFILE_CURRENT) | $$(dir $$@)
    122123        $(call MSG_GENERATE,VBoxVideoWddm-inf,$@,$<)
    123124        $(call VBOX_EDIT_INF_FN,$<,$@ $(VBOXWDDM_EDIT_INF_DISPD3D_FN_ARG) $(VBOXWDDM_EDIT_INF_GL_FN_ARG))
    124125
    125 $(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxVideoWddm.sys: $$(VBoxVideoWddm_1_TARGET) | $$(dir $$@)
    126         $(INSTALL) -m 644 $< $(@D)
    127 
    128 ifdef VBOXWDDM_WITH_DISPD3D
    129 $(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxDispD3D.dll: $$(VBoxDispD3D_1_TARGET) | $$(dir $$@)
    130         $(INSTALL) -m 644 $< $(@D)
    131 
    132  ifeq ($(KBUILD_TARGET_ARCH),amd64)
    133 $(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxDispD3D-x86.dll: $$(VBoxDispD3D-x86_1_TARGET) | $$(dir $$@)
    134         $(INSTALL) -m 644 $< $(@D)
    135  endif # ($(KBUILD_TARGET_ARCH), amd64)
    136 endif # VBOXWDDM_WITH_DISPD3D
    137 
    138 ifdef VBOXWDDM_WITH_GL
    139 $(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxOGL.dll: $$(VBoxOGL_1_TARGET) | $$(dir $$@)
    140         $(INSTALL) -m 644 $< $(@D)
    141 
    142 $(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxD3D9wddm.dll: $$(VBoxD3D9wddm_1_TARGET) | $$(dir $$@)
    143         $(INSTALL) -m 644 $< $(@D)
    144 
    145 $(PATH_TARGET)/VBoxVideoWddmCat.dir/wined3dwddm.dll: $$(wined3dwddm_1_TARGET) | $$(dir $$@)
    146         $(INSTALL) -m 644 $< $(@D)
    147 
    148 $(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxOGLarrayspu.dll: $$(VBoxOGLarrayspu_1_TARGET) | $$(dir $$@)
    149         $(INSTALL) -m 644 $< $(@D)
    150 
    151 $(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxOGLcrutil.dll: $$(VBoxOGLcrutil_1_TARGET) | $$(dir $$@)
    152         $(INSTALL) -m 644 $< $(@D)
    153 
    154 $(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxOGLerrorspu.dll: $$(VBoxOGLerrorspu_1_TARGET) | $$(dir $$@)
    155         $(INSTALL) -m 644 $< $(@D)
    156 
    157 $(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxOGLfeedbackspu.dll: $$(VBoxOGLfeedbackspu_1_TARGET) | $$(dir $$@)
    158         $(INSTALL) -m 644 $< $(@D)
    159 
    160 $(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxOGLpackspu.dll: $$(VBoxOGLpackspu_1_TARGET) | $$(dir $$@)
    161         $(INSTALL) -m 644 $< $(@D)
    162 
    163 $(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxOGLpassthroughspu.dll: $$(VBoxOGLpassthroughspu_1_TARGET) | $$(dir $$@)
    164         $(INSTALL) -m 644 $< $(@D)
    165 
    166  ifeq ($(KBUILD_TARGET_ARCH), amd64)
    167 $(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxOGL-x86.dll: $$(VBoxOGL-x86_1_TARGET) | $$(dir $$@)
    168         $(INSTALL) -m 644 $< $(@D)
    169 
    170 $(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxD3D9wddm-x86.dll: $$(VBoxD3D9wddm-x86_1_TARGET) | $$(dir $$@)
    171         $(INSTALL) -m 644 $< $(@D)
    172 
    173 $(PATH_TARGET)/VBoxVideoWddmCat.dir/wined3dwddm-x86.dll: $$(wined3dwddm-x86_1_TARGET) | $$(dir $$@)
    174         $(INSTALL) -m 644 $< $(@D)
    175 
    176 $(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxOGLarrayspu-x86.dll: $$(VBoxOGLarrayspu-x86_1_TARGET) | $$(dir $$@)
    177         $(INSTALL) -m 644 $< $(@D)
    178 
    179 $(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxOGLcrutil-x86.dll: $$(VBoxOGLcrutil-x86_1_TARGET) | $$(dir $$@)
    180         $(INSTALL) -m 644 $< $(@D)
    181 
    182 $(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxOGLerrorspu-x86.dll: $$(VBoxOGLerrorspu-x86_1_TARGET) | $$(dir $$@)
    183         $(INSTALL) -m 644 $< $(@D)
    184 
    185 $(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxOGLfeedbackspu-x86.dll: $$(VBoxOGLfeedbackspu-x86_1_TARGET) | $$(dir $$@)
    186         $(INSTALL) -m 644 $< $(@D)
    187 
    188 $(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxOGLpackspu-x86.dll: $$(VBoxOGLpackspu-x86_1_TARGET) | $$(dir $$@)
    189         $(INSTALL) -m 644 $< $(@D)
    190 
    191 $(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxOGLpassthroughspu-x86.dll: $$(VBoxOGLpassthroughspu-x86_1_TARGET) | $$(dir $$@)
    192         $(INSTALL) -m 644 $< $(@D)
    193  endif # ($(KBUILD_TARGET_ARCH), amd64)
    194 endif # VBOXWDDM_WITH_GL
    195 
    196 $(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxVideoWddm.cat: \
     126 $(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxVideoWddm.sys: $$(VBoxVideoWddm_1_TARGET) | $$(dir $$@)
     127        $(INSTALL) -m 644 $< $(@D)
     128
     129 ifdef VBOXWDDM_WITH_DISPD3D
     130  $(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxDispD3D.dll: $$(VBoxDispD3D_1_TARGET) | $$(dir $$@)
     131        $(INSTALL) -m 644 $< $(@D)
     132
     133  ifeq ($(KBUILD_TARGET_ARCH),amd64)
     134   $(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxDispD3D-x86.dll: $$(VBoxDispD3D-x86_1_TARGET) | $$(dir $$@)
     135        $(INSTALL) -m 644 $< $(@D)
     136  endif
     137 endif # VBOXWDDM_WITH_DISPD3D
     138
     139 ifdef VBOXWDDM_WITH_GL
     140  $(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxOGL.dll: $$(VBoxOGL_1_TARGET) | $$(dir $$@)
     141        $(INSTALL) -m 644 $< $(@D)
     142
     143  $(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxD3D9wddm.dll: $$(VBoxD3D9wddm_1_TARGET) | $$(dir $$@)
     144        $(INSTALL) -m 644 $< $(@D)
     145
     146  $(PATH_TARGET)/VBoxVideoWddmCat.dir/wined3dwddm.dll: $$(wined3dwddm_1_TARGET) | $$(dir $$@)
     147        $(INSTALL) -m 644 $< $(@D)
     148
     149  $(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxOGLarrayspu.dll: $$(VBoxOGLarrayspu_1_TARGET) | $$(dir $$@)
     150        $(INSTALL) -m 644 $< $(@D)
     151
     152  $(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxOGLcrutil.dll: $$(VBoxOGLcrutil_1_TARGET) | $$(dir $$@)
     153        $(INSTALL) -m 644 $< $(@D)
     154
     155  $(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxOGLerrorspu.dll: $$(VBoxOGLerrorspu_1_TARGET) | $$(dir $$@)
     156        $(INSTALL) -m 644 $< $(@D)
     157
     158  $(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxOGLfeedbackspu.dll: $$(VBoxOGLfeedbackspu_1_TARGET) | $$(dir $$@)
     159        $(INSTALL) -m 644 $< $(@D)
     160
     161  $(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxOGLpackspu.dll: $$(VBoxOGLpackspu_1_TARGET) | $$(dir $$@)
     162        $(INSTALL) -m 644 $< $(@D)
     163
     164  $(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxOGLpassthroughspu.dll: $$(VBoxOGLpassthroughspu_1_TARGET) | $$(dir $$@)
     165        $(INSTALL) -m 644 $< $(@D)
     166
     167  ifeq ($(KBUILD_TARGET_ARCH),amd64)
     168   $(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxOGL-x86.dll: $$(VBoxOGL-x86_1_TARGET) | $$(dir $$@)
     169        $(INSTALL) -m 644 $< $(@D)
     170
     171   $(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxD3D9wddm-x86.dll: $$(VBoxD3D9wddm-x86_1_TARGET) | $$(dir $$@)
     172        $(INSTALL) -m 644 $< $(@D)
     173
     174   $(PATH_TARGET)/VBoxVideoWddmCat.dir/wined3dwddm-x86.dll: $$(wined3dwddm-x86_1_TARGET) | $$(dir $$@)
     175        $(INSTALL) -m 644 $< $(@D)
     176
     177   $(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxOGLarrayspu-x86.dll: $$(VBoxOGLarrayspu-x86_1_TARGET) | $$(dir $$@)
     178        $(INSTALL) -m 644 $< $(@D)
     179
     180   $(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxOGLcrutil-x86.dll: $$(VBoxOGLcrutil-x86_1_TARGET) | $$(dir $$@)
     181        $(INSTALL) -m 644 $< $(@D)
     182
     183   $(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxOGLerrorspu-x86.dll: $$(VBoxOGLerrorspu-x86_1_TARGET) | $$(dir $$@)
     184        $(INSTALL) -m 644 $< $(@D)
     185
     186   $(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxOGLfeedbackspu-x86.dll: $$(VBoxOGLfeedbackspu-x86_1_TARGET) | $$(dir $$@)
     187        $(INSTALL) -m 644 $< $(@D)
     188
     189   $(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxOGLpackspu-x86.dll: $$(VBoxOGLpackspu-x86_1_TARGET) | $$(dir $$@)
     190        $(INSTALL) -m 644 $< $(@D)
     191
     192   $(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxOGLpassthroughspu-x86.dll: $$(VBoxOGLpassthroughspu-x86_1_TARGET) | $$(dir $$@)
     193        $(INSTALL) -m 644 $< $(@D)
     194  endif # ($(KBUILD_TARGET_ARCH), amd64)
     195 endif # VBOXWDDM_WITH_GL
     196
     197 $(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxVideoWddm.cat: \
    197198                $(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxVideoWddm.inf \
    198199                $(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxVideoWddm.sys \
     
    221222        $(call VBOX_MAKE_CAT_FN, $(@D),$@)
    222223       
    223  ifdef VBOX_WDDM_WIN8
     224 ifdef VBOX_WITH_WDDM_W8
    224225  VBOXWDDMW8_WITH_DISPD3D = 1
    225  ifdef VBOX_WITH_CROGL
    226   VBOXWDDMW8_WITH_GL = 1
    227  endif
     226  ifdef VBOX_WITH_CROGL
     227   VBOXWDDMW8_WITH_GL = 1
     228  endif
    228229 
    229  
    230 INSTALLS += VBoxVideoW8-inf
    231 VBoxVideoW8-inf_INST = $(INST_ADDITIONS)
    232 VBoxVideoW8-inf_MODE = a+r,u+w
    233 VBoxVideoW8-inf_SOURCES = \
    234     $(PATH_TARGET)/VBoxVideoW8Cat.dir/VBoxVideoW8.inf
    235 ifdef VBOX_SIGN_ADDITIONS
    236 VBoxVideoW8-inf_SOURCES += \
    237     $(PATH_TARGET)/VBoxVideoW8Cat.dir/VBoxVideoW8.sys \
    238     $(PATH_TARGET)/VBoxVideoW8Cat.dir/VBoxVideoW8.cat
    239 
    240 if defined(VBOXWDDMW8_WITH_DISPD3D) && !defined(VBOXWDDM_WITH_DISPD3D)
    241 VBoxVideoW8-inf_SOURCES += \
    242  $(PATH_TARGET)/VBoxVideoW8Cat.dir/VBoxDispD3D.dll
    243 VBoxVideoW8-inf_SOURCES.amd64 += \
    244  $(PATH_TARGET)/VBoxVideoW8Cat.dir/VBoxDispD3D-x86.dll
    245 endif # VBOXWDDMW8_WITH_DISPD3D
    246 
    247 if defined(VBOXWDDMW8_WITH_GL) && !defined(VBOXWDDM_WITH_GL)
    248  VBoxVideoW8-inf_SOURCES += \
    249         $(PATH_TARGET)/VBoxVideoW8Cat.dir/VBoxOGL.dll \
    250         $(PATH_TARGET)/VBoxVideoW8Cat.dir/VBoxD3D9wddm.dll \
    251         $(PATH_TARGET)/VBoxVideoW8Cat.dir/wined3dwddm.dll \
    252         $(PATH_TARGET)/VBoxVideoW8Cat.dir/VBoxOGLarrayspu.dll \
    253         $(PATH_TARGET)/VBoxVideoW8Cat.dir/VBoxOGLcrutil.dll \
    254         $(PATH_TARGET)/VBoxVideoW8Cat.dir/VBoxOGLerrorspu.dll \
    255         $(PATH_TARGET)/VBoxVideoW8Cat.dir/VBoxOGLfeedbackspu.dll \
    256         $(PATH_TARGET)/VBoxVideoW8Cat.dir/VBoxOGLpackspu.dll \
    257         $(PATH_TARGET)/VBoxVideoW8Cat.dir/VBoxOGLpassthroughspu.dll
    258  VBoxVideoW8-inf_SOURCES.amd64 += \
    259         $(PATH_TARGET)/VBoxVideoW8Cat.dir/VBoxOGL-x86.dll \
    260         $(PATH_TARGET)/VBoxVideoW8Cat.dir/VBoxD3D9wddm-x86.dll \
    261         $(PATH_TARGET)/VBoxVideoW8Cat.dir/wined3dwddm-x86.dll \
    262         $(PATH_TARGET)/VBoxVideoW8Cat.dir/VBoxOGLarrayspu-x86.dll \
    263         $(PATH_TARGET)/VBoxVideoW8Cat.dir/VBoxOGLcrutil-x86.dll \
    264         $(PATH_TARGET)/VBoxVideoW8Cat.dir/VBoxOGLerrorspu-x86.dll \
    265         $(PATH_TARGET)/VBoxVideoW8Cat.dir/VBoxOGLfeedbackspu-x86.dll \
    266         $(PATH_TARGET)/VBoxVideoW8Cat.dir/VBoxOGLpackspu-x86.dll \
    267         $(PATH_TARGET)/VBoxVideoW8Cat.dir/VBoxOGLpassthroughspu-x86.dll
    268 endif # VBOXWDDMW8_WITH_GL
    269 
    270 endif # signing
    271 VBoxVideoW8-inf_CLEAN = $(VBoxVideoW8-inf_SOURCES)
    272 if defined(VBOXWDDMW8_WITH_DISPD3D) && defined(VBOXWDDM_WITH_DISPD3D)
    273  VBoxVideoW8-inf_CLEAN += \
    274         $(PATH_TARGET)/VBoxVideoW8Cat.dir/VBoxOGL.dll \
    275         $(PATH_TARGET)/VBoxVideoW8Cat.dir/VBoxD3D9wddm.dll \
    276         $(PATH_TARGET)/VBoxVideoW8Cat.dir/wined3dwddm.dll \
    277         $(PATH_TARGET)/VBoxVideoW8Cat.dir/VBoxOGLarrayspu.dll \
    278         $(PATH_TARGET)/VBoxVideoW8Cat.dir/VBoxOGLcrutil.dll \
    279         $(PATH_TARGET)/VBoxVideoW8Cat.dir/VBoxOGLerrorspu.dll \
    280         $(PATH_TARGET)/VBoxVideoW8Cat.dir/VBoxOGLfeedbackspu.dll \
    281         $(PATH_TARGET)/VBoxVideoW8Cat.dir/VBoxOGLpackspu.dll \
    282         $(PATH_TARGET)/VBoxVideoW8Cat.dir/VBoxOGLpassthroughspu.dll
    283 endif
    284 if defined(VBOXWDDMW8_WITH_GL) && !defined(VBOXWDDM_WITH_GL)
    285  VBoxVideoW8-inf_CLEAN += \
    286         $(PATH_TARGET)/VBoxVideoW8Cat.dir/VBoxOGL.dll \
    287         $(PATH_TARGET)/VBoxVideoW8Cat.dir/VBoxD3D9wddm.dll \
    288         $(PATH_TARGET)/VBoxVideoW8Cat.dir/wined3dwddm.dll \
    289         $(PATH_TARGET)/VBoxVideoW8Cat.dir/VBoxOGLarrayspu.dll \
    290         $(PATH_TARGET)/VBoxVideoW8Cat.dir/VBoxOGLcrutil.dll \
    291         $(PATH_TARGET)/VBoxVideoW8Cat.dir/VBoxOGLerrorspu.dll \
    292         $(PATH_TARGET)/VBoxVideoW8Cat.dir/VBoxOGLfeedbackspu.dll \
    293         $(PATH_TARGET)/VBoxVideoW8Cat.dir/VBoxOGLpackspu.dll \
    294         $(PATH_TARGET)/VBoxVideoW8Cat.dir/VBoxOGLpassthroughspu.dll
    295  VBoxVideoW8-inf_CLEAN.amd64 += \
    296         $(PATH_TARGET)/VBoxVideoW8Cat.dir/VBoxOGL-x86.dll \
    297         $(PATH_TARGET)/VBoxVideoW8Cat.dir/VBoxD3D9wddm-x86.dll \
    298         $(PATH_TARGET)/VBoxVideoW8Cat.dir/wined3dwddm-x86.dll \
    299         $(PATH_TARGET)/VBoxVideoW8Cat.dir/VBoxOGLarrayspu-x86.dll \
    300         $(PATH_TARGET)/VBoxVideoW8Cat.dir/VBoxOGLcrutil-x86.dll \
    301         $(PATH_TARGET)/VBoxVideoW8Cat.dir/VBoxOGLerrorspu-x86.dll \
    302         $(PATH_TARGET)/VBoxVideoW8Cat.dir/VBoxOGLfeedbackspu-x86.dll \
    303         $(PATH_TARGET)/VBoxVideoW8Cat.dir/VBoxOGLpackspu-x86.dll \
    304         $(PATH_TARGET)/VBoxVideoW8Cat.dir/VBoxOGLpassthroughspu-x86.dll
    305 endif
    306 VBoxVideoW8-inf_BLDDIRS = \
    307     $(PATH_TARGET)/VBoxVideoW8Cat.dir
    308 
    309 VBOXWDDMW8_EDIT_INF_DISPD3D_FN_ARG = $(if $(VBOXWDDMW8_WITH_DISPD3D),-e 's/^;dispd3d  *//', -e '/^;dispd3d /d')
    310 VBOXWDDMW8_EDIT_INF_GL_FN_ARG      = $(if $(VBOXWDDMW8_WITH_GL),-e 's/^;gl  *//', -e '/^;gl /d')
    311 VBOXWDDMW8_EDIT_INF_ICD_FN_ARG      = $(if $(VBOXWDDMW8_WITH_ICD),-e 's/^;icd  *//', -e '/^;icd /d')
    312 
    313 $(PATH_TARGET)/VBoxVideoW8Cat.dir/VBoxVideoW8.inf: $(PATH_SUB_CURRENT)/mp/wddm/VBoxVideoW8.inf $(MAKEFILE_CURRENT) | $$(dir $$@)
     230  INSTALLS += VBoxVideoW8-inf
     231  VBoxVideoW8-inf_INST = $(INST_ADDITIONS)
     232  VBoxVideoW8-inf_MODE = a+r,u+w
     233
     234  VBoxVideoW8-inf_SOURCES = \
     235        $(PATH_TARGET)/VBoxVideoW8Cat.dir/VBoxVideoW8.inf
     236  ifdef VBOX_SIGN_ADDITIONS
     237   VBoxVideoW8-inf_SOURCES += \
     238        $(PATH_TARGET)/VBoxVideoW8Cat.dir/VBoxVideoW8.sys \
     239        $(PATH_TARGET)/VBoxVideoW8Cat.dir/VBoxVideoW8.cat
     240   if defined(VBOXWDDMW8_WITH_DISPD3D) && !defined(VBOXWDDM_WITH_DISPD3D)
     241    VBoxVideoW8-inf_SOURCES += \
     242        $(PATH_TARGET)/VBoxVideoW8Cat.dir/VBoxDispD3D.dll
     243    VBoxVideoW8-inf_SOURCES.amd64 += \
     244        $(PATH_TARGET)/VBoxVideoW8Cat.dir/VBoxDispD3D-x86.dll
     245   endif
     246   if defined(VBOXWDDMW8_WITH_GL) && !defined(VBOXWDDM_WITH_GL)
     247    VBoxVideoW8-inf_SOURCES += \
     248        $(PATH_TARGET)/VBoxVideoW8Cat.dir/VBoxOGL.dll \
     249        $(PATH_TARGET)/VBoxVideoW8Cat.dir/VBoxD3D9wddm.dll \
     250        $(PATH_TARGET)/VBoxVideoW8Cat.dir/wined3dwddm.dll \
     251        $(PATH_TARGET)/VBoxVideoW8Cat.dir/VBoxOGLarrayspu.dll \
     252        $(PATH_TARGET)/VBoxVideoW8Cat.dir/VBoxOGLcrutil.dll \
     253        $(PATH_TARGET)/VBoxVideoW8Cat.dir/VBoxOGLerrorspu.dll \
     254        $(PATH_TARGET)/VBoxVideoW8Cat.dir/VBoxOGLfeedbackspu.dll \
     255        $(PATH_TARGET)/VBoxVideoW8Cat.dir/VBoxOGLpackspu.dll \
     256        $(PATH_TARGET)/VBoxVideoW8Cat.dir/VBoxOGLpassthroughspu.dll
     257    VBoxVideoW8-inf_SOURCES.amd64 += \
     258        $(PATH_TARGET)/VBoxVideoW8Cat.dir/VBoxOGL-x86.dll \
     259        $(PATH_TARGET)/VBoxVideoW8Cat.dir/VBoxD3D9wddm-x86.dll \
     260        $(PATH_TARGET)/VBoxVideoW8Cat.dir/wined3dwddm-x86.dll \
     261        $(PATH_TARGET)/VBoxVideoW8Cat.dir/VBoxOGLarrayspu-x86.dll \
     262        $(PATH_TARGET)/VBoxVideoW8Cat.dir/VBoxOGLcrutil-x86.dll \
     263        $(PATH_TARGET)/VBoxVideoW8Cat.dir/VBoxOGLerrorspu-x86.dll \
     264        $(PATH_TARGET)/VBoxVideoW8Cat.dir/VBoxOGLfeedbackspu-x86.dll \
     265        $(PATH_TARGET)/VBoxVideoW8Cat.dir/VBoxOGLpackspu-x86.dll \
     266        $(PATH_TARGET)/VBoxVideoW8Cat.dir/VBoxOGLpassthroughspu-x86.dll
     267   endif # VBOXWDDMW8_WITH_GL
     268  endif # VBOX_SIGN_ADDITIONS
     269
     270  VBoxVideoW8-inf_CLEAN = $(VBoxVideoW8-inf_SOURCES)
     271  if defined(VBOXWDDMW8_WITH_DISPD3D) && defined(VBOXWDDM_WITH_DISPD3D)
     272   VBoxVideoW8-inf_CLEAN += \
     273        $(PATH_TARGET)/VBoxVideoW8Cat.dir/VBoxOGL.dll \
     274        $(PATH_TARGET)/VBoxVideoW8Cat.dir/VBoxD3D9wddm.dll \
     275        $(PATH_TARGET)/VBoxVideoW8Cat.dir/wined3dwddm.dll \
     276        $(PATH_TARGET)/VBoxVideoW8Cat.dir/VBoxOGLarrayspu.dll \
     277        $(PATH_TARGET)/VBoxVideoW8Cat.dir/VBoxOGLcrutil.dll \
     278        $(PATH_TARGET)/VBoxVideoW8Cat.dir/VBoxOGLerrorspu.dll \
     279        $(PATH_TARGET)/VBoxVideoW8Cat.dir/VBoxOGLfeedbackspu.dll \
     280        $(PATH_TARGET)/VBoxVideoW8Cat.dir/VBoxOGLpackspu.dll \
     281        $(PATH_TARGET)/VBoxVideoW8Cat.dir/VBoxOGLpassthroughspu.dll
     282  endif
     283  if defined(VBOXWDDMW8_WITH_GL) && !defined(VBOXWDDM_WITH_GL)
     284   VBoxVideoW8-inf_CLEAN += \
     285        $(PATH_TARGET)/VBoxVideoW8Cat.dir/VBoxOGL.dll \
     286        $(PATH_TARGET)/VBoxVideoW8Cat.dir/VBoxD3D9wddm.dll \
     287        $(PATH_TARGET)/VBoxVideoW8Cat.dir/wined3dwddm.dll \
     288        $(PATH_TARGET)/VBoxVideoW8Cat.dir/VBoxOGLarrayspu.dll \
     289        $(PATH_TARGET)/VBoxVideoW8Cat.dir/VBoxOGLcrutil.dll \
     290        $(PATH_TARGET)/VBoxVideoW8Cat.dir/VBoxOGLerrorspu.dll \
     291        $(PATH_TARGET)/VBoxVideoW8Cat.dir/VBoxOGLfeedbackspu.dll \
     292        $(PATH_TARGET)/VBoxVideoW8Cat.dir/VBoxOGLpackspu.dll \
     293        $(PATH_TARGET)/VBoxVideoW8Cat.dir/VBoxOGLpassthroughspu.dll
     294   VBoxVideoW8-inf_CLEAN.amd64 += \
     295        $(PATH_TARGET)/VBoxVideoW8Cat.dir/VBoxOGL-x86.dll \
     296        $(PATH_TARGET)/VBoxVideoW8Cat.dir/VBoxD3D9wddm-x86.dll \
     297        $(PATH_TARGET)/VBoxVideoW8Cat.dir/wined3dwddm-x86.dll \
     298        $(PATH_TARGET)/VBoxVideoW8Cat.dir/VBoxOGLarrayspu-x86.dll \
     299        $(PATH_TARGET)/VBoxVideoW8Cat.dir/VBoxOGLcrutil-x86.dll \
     300        $(PATH_TARGET)/VBoxVideoW8Cat.dir/VBoxOGLerrorspu-x86.dll \
     301        $(PATH_TARGET)/VBoxVideoW8Cat.dir/VBoxOGLfeedbackspu-x86.dll \
     302        $(PATH_TARGET)/VBoxVideoW8Cat.dir/VBoxOGLpackspu-x86.dll \
     303        $(PATH_TARGET)/VBoxVideoW8Cat.dir/VBoxOGLpassthroughspu-x86.dll
     304  endif
     305  VBoxVideoW8-inf_BLDDIRS = \
     306      $(PATH_TARGET)/VBoxVideoW8Cat.dir
     307
     308  VBOXWDDMW8_EDIT_INF_DISPD3D_FN_ARG = $(if $(VBOXWDDMW8_WITH_DISPD3D),-e 's/^;dispd3d  *//', -e '/^;dispd3d /d')
     309  VBOXWDDMW8_EDIT_INF_GL_FN_ARG      = $(if $(VBOXWDDMW8_WITH_GL),-e 's/^;gl  *//', -e '/^;gl /d')
     310  VBOXWDDMW8_EDIT_INF_ICD_FN_ARG     = $(if $(VBOXWDDMW8_WITH_ICD),-e 's/^;icd  *//', -e '/^;icd /d')
     311
     312  $(PATH_TARGET)/VBoxVideoW8Cat.dir/VBoxVideoW8.inf: $(PATH_SUB_CURRENT)/mp/wddm/VBoxVideoW8.inf $(MAKEFILE_CURRENT) | $$(dir $$@)
    314313        $(call MSG_GENERATE,VBoxVideoW8-inf,$@,$<)
    315314        $(call VBOX_EDIT_INF_FN,$<,$@ $(VBOXWDDMW8_EDIT_INF_DISPD3D_FN_ARG) $(VBOXWDDMW8_EDIT_INF_GL_FN_ARG) $(VBOXWDDMW8_EDIT_INF_ICD_FN_ARG))
    316315
    317 $(PATH_TARGET)/VBoxVideoW8Cat.dir/VBoxVideoW8.sys: $$(VBoxVideoW8_1_TARGET) | $$(dir $$@)
    318         $(INSTALL) -m 644 $< $(@D)
    319 
    320 ifdef VBOXWDDMW8_WITH_DISPD3D
    321 $(PATH_TARGET)/VBoxVideoW8Cat.dir/VBoxDispD3D.dll: $$(VBoxDispD3D_1_TARGET) | $$(dir $$@)
    322         $(INSTALL) -m 644 $< $(@D)
    323 
    324  ifeq ($(KBUILD_TARGET_ARCH),amd64)
    325 $(PATH_TARGET)/VBoxVideoW8Cat.dir/VBoxDispD3D-x86.dll: $$(VBoxDispD3D-x86_1_TARGET) | $$(dir $$@)
    326         $(INSTALL) -m 644 $< $(@D)
    327  endif # ($(KBUILD_TARGET_ARCH), amd64)
    328 endif # VBOXWDDMW8_WITH_DISPD3D
    329 
    330 ifdef VBOXWDDMW8_WITH_GL
    331 $(PATH_TARGET)/VBoxVideoW8Cat.dir/VBoxOGL.dll: $$(VBoxOGL_1_TARGET) | $$(dir $$@)
    332         $(INSTALL) -m 644 $< $(@D)
    333 
    334 $(PATH_TARGET)/VBoxVideoW8Cat.dir/VBoxD3D9wddm.dll: $$(VBoxD3D9wddm_1_TARGET) | $$(dir $$@)
    335         $(INSTALL) -m 644 $< $(@D)
    336 
    337 $(PATH_TARGET)/VBoxVideoW8Cat.dir/wined3dwddm.dll: $$(wined3dwddm_1_TARGET) | $$(dir $$@)
    338         $(INSTALL) -m 644 $< $(@D)
    339 
    340 $(PATH_TARGET)/VBoxVideoW8Cat.dir/VBoxOGLarrayspu.dll: $$(VBoxOGLarrayspu_1_TARGET) | $$(dir $$@)
    341         $(INSTALL) -m 644 $< $(@D)
    342 
    343 $(PATH_TARGET)/VBoxVideoW8Cat.dir/VBoxOGLcrutil.dll: $$(VBoxOGLcrutil_1_TARGET) | $$(dir $$@)
    344         $(INSTALL) -m 644 $< $(@D)
    345 
    346 $(PATH_TARGET)/VBoxVideoW8Cat.dir/VBoxOGLerrorspu.dll: $$(VBoxOGLerrorspu_1_TARGET) | $$(dir $$@)
    347         $(INSTALL) -m 644 $< $(@D)
    348 
    349 $(PATH_TARGET)/VBoxVideoW8Cat.dir/VBoxOGLfeedbackspu.dll: $$(VBoxOGLfeedbackspu_1_TARGET) | $$(dir $$@)
    350         $(INSTALL) -m 644 $< $(@D)
    351 
    352 $(PATH_TARGET)/VBoxVideoW8Cat.dir/VBoxOGLpackspu.dll: $$(VBoxOGLpackspu_1_TARGET) | $$(dir $$@)
    353         $(INSTALL) -m 644 $< $(@D)
    354 
    355 $(PATH_TARGET)/VBoxVideoW8Cat.dir/VBoxOGLpassthroughspu.dll: $$(VBoxOGLpassthroughspu_1_TARGET) | $$(dir $$@)
    356         $(INSTALL) -m 644 $< $(@D)
    357 
    358  ifeq ($(KBUILD_TARGET_ARCH), amd64)
    359 $(PATH_TARGET)/VBoxVideoW8Cat.dir/VBoxOGL-x86.dll: $$(VBoxOGL-x86_1_TARGET) | $$(dir $$@)
    360         $(INSTALL) -m 644 $< $(@D)
    361 
    362 $(PATH_TARGET)/VBoxVideoW8Cat.dir/VBoxD3D9wddm-x86.dll: $$(VBoxD3D9wddm-x86_1_TARGET) | $$(dir $$@)
    363         $(INSTALL) -m 644 $< $(@D)
    364 
    365 $(PATH_TARGET)/VBoxVideoW8Cat.dir/wined3dwddm-x86.dll: $$(wined3dwddm-x86_1_TARGET) | $$(dir $$@)
    366         $(INSTALL) -m 644 $< $(@D)
    367 
    368 $(PATH_TARGET)/VBoxVideoW8Cat.dir/VBoxOGLarrayspu-x86.dll: $$(VBoxOGLarrayspu-x86_1_TARGET) | $$(dir $$@)
    369         $(INSTALL) -m 644 $< $(@D)
    370 
    371 $(PATH_TARGET)/VBoxVideoW8Cat.dir/VBoxOGLcrutil-x86.dll: $$(VBoxOGLcrutil-x86_1_TARGET) | $$(dir $$@)
    372         $(INSTALL) -m 644 $< $(@D)
    373 
    374 $(PATH_TARGET)/VBoxVideoW8Cat.dir/VBoxOGLerrorspu-x86.dll: $$(VBoxOGLerrorspu-x86_1_TARGET) | $$(dir $$@)
    375         $(INSTALL) -m 644 $< $(@D)
    376 
    377 $(PATH_TARGET)/VBoxVideoW8Cat.dir/VBoxOGLfeedbackspu-x86.dll: $$(VBoxOGLfeedbackspu-x86_1_TARGET) | $$(dir $$@)
    378         $(INSTALL) -m 644 $< $(@D)
    379 
    380 $(PATH_TARGET)/VBoxVideoW8Cat.dir/VBoxOGLpackspu-x86.dll: $$(VBoxOGLpackspu-x86_1_TARGET) | $$(dir $$@)
    381         $(INSTALL) -m 644 $< $(@D)
    382 
    383 $(PATH_TARGET)/VBoxVideoW8Cat.dir/VBoxOGLpassthroughspu-x86.dll: $$(VBoxOGLpassthroughspu-x86_1_TARGET) | $$(dir $$@)
    384         $(INSTALL) -m 644 $< $(@D)
    385  endif # ($(KBUILD_TARGET_ARCH), amd64)
    386 endif # VBOXWDDMW8_WITH_GL
    387 
    388 $(PATH_TARGET)/VBoxVideoW8Cat.dir/VBoxVideoW8.cat: \
     316  $(PATH_TARGET)/VBoxVideoW8Cat.dir/VBoxVideoW8.sys: $$(VBoxVideoW8_1_TARGET) | $$(dir $$@)
     317        $(INSTALL) -m 644 $< $(@D)
     318
     319  ifdef VBOXWDDMW8_WITH_DISPD3D
     320   $(PATH_TARGET)/VBoxVideoW8Cat.dir/VBoxDispD3D.dll: $$(VBoxDispD3D_1_TARGET) | $$(dir $$@)
     321        $(INSTALL) -m 644 $< $(@D)
     322
     323   ifeq ($(KBUILD_TARGET_ARCH),amd64)
     324    $(PATH_TARGET)/VBoxVideoW8Cat.dir/VBoxDispD3D-x86.dll: $$(VBoxDispD3D-x86_1_TARGET) | $$(dir $$@)
     325        $(INSTALL) -m 644 $< $(@D)
     326   endif # ($(KBUILD_TARGET_ARCH), amd64)
     327  endif # VBOXWDDMW8_WITH_DISPD3D
     328
     329  ifdef VBOXWDDMW8_WITH_GL
     330   $(PATH_TARGET)/VBoxVideoW8Cat.dir/VBoxOGL.dll: $$(VBoxOGL_1_TARGET) | $$(dir $$@)
     331        $(INSTALL) -m 644 $< $(@D)
     332
     333   $(PATH_TARGET)/VBoxVideoW8Cat.dir/VBoxD3D9wddm.dll: $$(VBoxD3D9wddm_1_TARGET) | $$(dir $$@)
     334        $(INSTALL) -m 644 $< $(@D)
     335
     336   $(PATH_TARGET)/VBoxVideoW8Cat.dir/wined3dwddm.dll: $$(wined3dwddm_1_TARGET) | $$(dir $$@)
     337        $(INSTALL) -m 644 $< $(@D)
     338
     339   $(PATH_TARGET)/VBoxVideoW8Cat.dir/VBoxOGLarrayspu.dll: $$(VBoxOGLarrayspu_1_TARGET) | $$(dir $$@)
     340        $(INSTALL) -m 644 $< $(@D)
     341
     342   $(PATH_TARGET)/VBoxVideoW8Cat.dir/VBoxOGLcrutil.dll: $$(VBoxOGLcrutil_1_TARGET) | $$(dir $$@)
     343        $(INSTALL) -m 644 $< $(@D)
     344
     345   $(PATH_TARGET)/VBoxVideoW8Cat.dir/VBoxOGLerrorspu.dll: $$(VBoxOGLerrorspu_1_TARGET) | $$(dir $$@)
     346        $(INSTALL) -m 644 $< $(@D)
     347
     348   $(PATH_TARGET)/VBoxVideoW8Cat.dir/VBoxOGLfeedbackspu.dll: $$(VBoxOGLfeedbackspu_1_TARGET) | $$(dir $$@)
     349        $(INSTALL) -m 644 $< $(@D)
     350
     351   $(PATH_TARGET)/VBoxVideoW8Cat.dir/VBoxOGLpackspu.dll: $$(VBoxOGLpackspu_1_TARGET) | $$(dir $$@)
     352        $(INSTALL) -m 644 $< $(@D)
     353
     354   $(PATH_TARGET)/VBoxVideoW8Cat.dir/VBoxOGLpassthroughspu.dll: $$(VBoxOGLpassthroughspu_1_TARGET) | $$(dir $$@)
     355        $(INSTALL) -m 644 $< $(@D)
     356
     357   ifeq ($(KBUILD_TARGET_ARCH), amd64)
     358    $(PATH_TARGET)/VBoxVideoW8Cat.dir/VBoxOGL-x86.dll: $$(VBoxOGL-x86_1_TARGET) | $$(dir $$@)
     359        $(INSTALL) -m 644 $< $(@D)
     360
     361    $(PATH_TARGET)/VBoxVideoW8Cat.dir/VBoxD3D9wddm-x86.dll: $$(VBoxD3D9wddm-x86_1_TARGET) | $$(dir $$@)
     362        $(INSTALL) -m 644 $< $(@D)
     363
     364    $(PATH_TARGET)/VBoxVideoW8Cat.dir/wined3dwddm-x86.dll: $$(wined3dwddm-x86_1_TARGET) | $$(dir $$@)
     365        $(INSTALL) -m 644 $< $(@D)
     366
     367    $(PATH_TARGET)/VBoxVideoW8Cat.dir/VBoxOGLarrayspu-x86.dll: $$(VBoxOGLarrayspu-x86_1_TARGET) | $$(dir $$@)
     368        $(INSTALL) -m 644 $< $(@D)
     369
     370    $(PATH_TARGET)/VBoxVideoW8Cat.dir/VBoxOGLcrutil-x86.dll: $$(VBoxOGLcrutil-x86_1_TARGET) | $$(dir $$@)
     371        $(INSTALL) -m 644 $< $(@D)
     372
     373    $(PATH_TARGET)/VBoxVideoW8Cat.dir/VBoxOGLerrorspu-x86.dll: $$(VBoxOGLerrorspu-x86_1_TARGET) | $$(dir $$@)
     374        $(INSTALL) -m 644 $< $(@D)
     375
     376    $(PATH_TARGET)/VBoxVideoW8Cat.dir/VBoxOGLfeedbackspu-x86.dll: $$(VBoxOGLfeedbackspu-x86_1_TARGET) | $$(dir $$@)
     377        $(INSTALL) -m 644 $< $(@D)
     378
     379    $(PATH_TARGET)/VBoxVideoW8Cat.dir/VBoxOGLpackspu-x86.dll: $$(VBoxOGLpackspu-x86_1_TARGET) | $$(dir $$@)
     380        $(INSTALL) -m 644 $< $(@D)
     381
     382    $(PATH_TARGET)/VBoxVideoW8Cat.dir/VBoxOGLpassthroughspu-x86.dll: $$(VBoxOGLpassthroughspu-x86_1_TARGET) | $$(dir $$@)
     383        $(INSTALL) -m 644 $< $(@D)
     384   endif # ($(KBUILD_TARGET_ARCH), amd64)
     385  endif # VBOXWDDMW8_WITH_GL
     386
     387  $(PATH_TARGET)/VBoxVideoW8Cat.dir/VBoxVideoW8.cat: \
    389388        $(PATH_TARGET)/VBoxVideoW8Cat.dir/VBoxVideoW8.inf \
    390389        $(PATH_TARGET)/VBoxVideoW8Cat.dir/VBoxVideoW8.sys \
     
    412411        $(call MSG_TOOL,Inf2Cat,VBoxVideoW8-inf,$@,$<)
    413412        $(call VBOX_MAKE_CAT_FN, $(@D),$@)
    414  endif # VBOX_WDDM_WIN8
     413
     414 endif # VBOX_WITH_WDDM_W8
    415415endif # VBOX_WITH_WDDM
    416416
  • trunk/src/VBox/Additions/WINNT/Graphics/Video/mp/Makefile.kmk

    r42257 r42280  
    152152        $(VBOX_PATH_ADDITIONS_LIB)/HGSMIGuestR0Lib$(VBOX_SUFF_LIB)
    153153
    154  ifdef VBOX_WDDM_WIN8
     154 ifdef VBOX_WITH_WDDM_W8
    155155  #
    156156  # VBoxVideoW8 - Windows Guest Additions WDDM 1.2 Miniport Video Driver for Win8
     
    172172        $(PATH_SDK_$(VBOX_WINDDK_GST_W8)_LIB)/displib.lib \
    173173        $(PATH_SDK_$(VBOX_WINDDK_GST_W8)_LIB)/BufferOverflowK.lib
    174  endif # VBOX_WDDM_WIN8
     174 endif # VBOX_WITH_WDDM_W8
    175175 
    176176endif # VBOX_WITH_WDDM
    177177
     178#
    178179# Signing requires both miniport and display drivers
    179180# so it'd be dealt with in the parent makefile.
     181#
    180182ifdef VBOX_SIGN_ADDITIONS
    181183 VBoxVideo_INSTTYPE            = none
     
    184186  VBoxVideoWddm_INSTTYPE       = none
    185187  VBoxVideoWddm_DEBUG_INSTTYPE = both
    186   ifdef VBOX_WDDM_WIN8
    187    VBoxVideoW8_INSTTYPE       = none
    188    VBoxVideoW8_DEBUG_INSTTYPE = both
     188  ifdef VBOX_WITH_WDDM_W8
     189   VBoxVideoW8_INSTTYPE        = none
     190   VBoxVideoW8_DEBUG_INSTTYPE  = both
    189191  endif
    190192 endif
Note: See TracChangeset for help on using the changeset viewer.

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