Changeset 42115 in vbox for trunk

Timestamp:

Jul 11, 2012 5:16:28 PM (13 years ago)

Author:

vboxsync

Message:

wddm/d-o: kmk warning fix

File:

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

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

@@ -238 +238 @@
     $(PATH_TARGET)/VBoxVideoW8Cat.dir/VBoxVideoW8.cat
 
-ifdef VBOXWDDMW8_WITH_DISPD3D
+if defined(VBOXWDDMW8_WITH_DISPD3D) && !defined(VBOXWDDM_WITH_DISPD3D)
 VBoxVideoW8-inf_SOURCES += \
  $(PATH_TARGET)/VBoxVideoW8Cat.dir/VBoxDispD3D.dll
@@ -245 +245 @@
 endif # VBOXWDDMW8_WITH_DISPD3D
 
-ifdef VBOXWDDMW8_WITH_GL
+if defined(VBOXWDDMW8_WITH_GL) && !defined(VBOXWDDM_WITH_GL)
 VBoxVideoW8-inf_SOURCES += \
  $(PATH_TARGET)/VBoxVideoW8Cat.dir/VBoxOGL.dll \
@@ -270 +270 @@
 endif # signing
 VBoxVideoW8-inf_CLEAN = $(VBoxVideoW8-inf_SOURCES)
+if defined(VBOXWDDMW8_WITH_DISPD3D) && defined(VBOXWDDM_WITH_DISPD3D)
+VBoxVideoW8-inf_CLEAN += \
+ $(PATH_TARGET)/VBoxVideoW8Cat.dir/VBoxOGL.dll \
+ $(PATH_TARGET)/VBoxVideoW8Cat.dir/VBoxD3D9wddm.dll \
+ $(PATH_TARGET)/VBoxVideoW8Cat.dir/wined3dwddm.dll \
+ $(PATH_TARGET)/VBoxVideoW8Cat.dir/VBoxOGLarrayspu.dll \
+ $(PATH_TARGET)/VBoxVideoW8Cat.dir/VBoxOGLcrutil.dll \
+ $(PATH_TARGET)/VBoxVideoW8Cat.dir/VBoxOGLerrorspu.dll \
+ $(PATH_TARGET)/VBoxVideoW8Cat.dir/VBoxOGLfeedbackspu.dll \
+ $(PATH_TARGET)/VBoxVideoW8Cat.dir/VBoxOGLpackspu.dll \
+ $(PATH_TARGET)/VBoxVideoW8Cat.dir/VBoxOGLpassthroughspu.dll
+endif
+if defined(VBOXWDDMW8_WITH_GL) && !defined(VBOXWDDM_WITH_GL)
+VBoxVideoW8-inf_CLEAN += \
+ $(PATH_TARGET)/VBoxVideoW8Cat.dir/VBoxOGL.dll \
+ $(PATH_TARGET)/VBoxVideoW8Cat.dir/VBoxD3D9wddm.dll \
+ $(PATH_TARGET)/VBoxVideoW8Cat.dir/wined3dwddm.dll \
+ $(PATH_TARGET)/VBoxVideoW8Cat.dir/VBoxOGLarrayspu.dll \
+ $(PATH_TARGET)/VBoxVideoW8Cat.dir/VBoxOGLcrutil.dll \
+ $(PATH_TARGET)/VBoxVideoW8Cat.dir/VBoxOGLerrorspu.dll \
+ $(PATH_TARGET)/VBoxVideoW8Cat.dir/VBoxOGLfeedbackspu.dll \
+ $(PATH_TARGET)/VBoxVideoW8Cat.dir/VBoxOGLpackspu.dll \
+ $(PATH_TARGET)/VBoxVideoW8Cat.dir/VBoxOGLpassthroughspu.dll
+VBoxVideoW8-inf_CLEAN.amd64 += \
+ $(PATH_TARGET)/VBoxVideoW8Cat.dir/VBoxOGL-x86.dll \
+ $(PATH_TARGET)/VBoxVideoW8Cat.dir/VBoxD3D9wddm-x86.dll \
+ $(PATH_TARGET)/VBoxVideoW8Cat.dir/wined3dwddm-x86.dll \
+ $(PATH_TARGET)/VBoxVideoW8Cat.dir/VBoxOGLarrayspu-x86.dll \
+ $(PATH_TARGET)/VBoxVideoW8Cat.dir/VBoxOGLcrutil-x86.dll \
+ $(PATH_TARGET)/VBoxVideoW8Cat.dir/VBoxOGLerrorspu-x86.dll \
+ $(PATH_TARGET)/VBoxVideoW8Cat.dir/VBoxOGLfeedbackspu-x86.dll \
+ $(PATH_TARGET)/VBoxVideoW8Cat.dir/VBoxOGLpackspu-x86.dll \
+ $(PATH_TARGET)/VBoxVideoW8Cat.dir/VBoxOGLpassthroughspu-x86.dll
+endif
 VBoxVideoW8-inf_BLDDIRS = \
     $(PATH_TARGET)/VBoxVideoW8Cat.dir