Changeset 80300 in vbox for trunk/src/VBox/Additions/WINNT/Graphics/Video/Makefile.kmk

Timestamp:

Aug 15, 2019 4:27:25 PM (5 years ago)

Author:

vboxsync

Message:

Additions/WINNT: Disable building and bundling the chromium OpenGL bits, bugref:9529

File:

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

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

@@ -62 +62 @@
 ifdef VBOX_WITH_WDDM
  VBOXWDDM_WITH_DISPD3D = 1
- ifdef VBOX_WITH_CROGL
-  VBOXWDDM_WITH_GL = 1
- endif
 
  #
@@ -101 +98 @@
   endif
 
-  ifdef VBOXWDDM_WITH_GL
-   VBoxWddm-inf_SOURCES += \
-        $(PATH_TARGET)/VBoxWddmCat.dir/VBoxOGL.dll \
-        $(PATH_TARGET)/VBoxWddmCat.dir/VBoxD3D9wddm.dll \
-        $(PATH_TARGET)/VBoxWddmCat.dir/wined3dwddm.dll
-   VBoxWddm-inf_SOURCES.amd64 += \
-        $(PATH_TARGET)/VBoxWddmCat.dir/VBoxOGL-x86.dll \
-        $(PATH_TARGET)/VBoxWddmCat.dir/VBoxD3D9wddm-x86.dll \
-        $(PATH_TARGET)/VBoxWddmCat.dir/wined3dwddm-x86.dll
-  endif # VBOXWDDM_WITH_GL
  endif # VBOX_SIGN_ADDITIONS
 
@@ -119 +106 @@
  VBOXWDDM_EDIT_INF_DISPD3D_FN_ARG = $(if $(VBOXWDDM_WITH_DISPD3D),-e 's/^;dispd3d  *//', -e '/^;dispd3d /d')
  VBOXWDDM_EDIT_INF_MESA3D_FN_ARG = $(if $(VBOX_WITH_MESA3D),-e 's/^;mesa3d  *//', -e '/^;mesa3d /d')
- VBOXWDDM_EDIT_INF_GL_FN_ARG      = $(if $(VBOXWDDM_WITH_GL),-e 's/^;gl  *//', -e '/^;gl /d')
- # Depends on VBOXWDDM_WITH_GL. ";icd" prefix is used for telling which lines are for OpenGL ICD
- VBOXWDDM_EDIT_INF_ICD_FN_ARG     = $(if $(VBOXWDDM_WITH_GL),-e 's/^;icd  *//', -e '/^;icd /d')
 
  $(PATH_TARGET)/VBoxWddmCat.dir/VBoxWddm.inf: \
                 $(PATH_SUB_CURRENT)/mp/wddm/VBoxWddm.inf $(MAKEFILE_CURRENT) | $$(dir $$@)
         $(call MSG_GENERATE,VBoxWddm-inf,$@,$<)
-        $(call VBOX_EDIT_INF_FN,$<,$@ $(VBOXWDDM_EDIT_INF_DISPD3D_FN_ARG) $(VBOXWDDM_EDIT_INF_MESA3D_FN_ARG) $(VBOXWDDM_EDIT_INF_GL_FN_ARG) $(VBOXWDDM_EDIT_INF_ICD_FN_ARG))
+        $(call VBOX_EDIT_INF_FN,$<,$@ $(VBOXWDDM_EDIT_INF_DISPD3D_FN_ARG) $(VBOXWDDM_EDIT_INF_MESA3D_FN_ARG))
 
  $(PATH_TARGET)/VBoxWddmCat.dir/VBoxWddm.sys: $$(VBoxWddm_1_TARGET) | $$(dir $$@)
@@ -163 +147 @@
  endif
 
- ifdef VBOXWDDM_WITH_GL
-  $(PATH_TARGET)/VBoxWddmCat.dir/VBoxOGL.dll: $(PATH_OBJ)/VBoxOGL/VBoxOGL.dll | $$(dir $$@)
-        $(INSTALL) -m 644 $< $(@D)
-
-  $(PATH_TARGET)/VBoxWddmCat.dir/VBoxD3D9wddm.dll: $(PATH_OBJ)/VBoxD3D9wddm/VBoxD3D9wddm.dll | $$(dir $$@)
-        $(INSTALL) -m 644 $< $(@D)
-
-  $(PATH_TARGET)/VBoxWddmCat.dir/wined3dwddm.dll: $(PATH_OBJ)/wined3dwddm/wined3dwddm.dll | $$(dir $$@)
-        $(INSTALL) -m 644 $< $(@D)
-
-  ifeq ($(KBUILD_TARGET_ARCH),amd64)
-   $(PATH_TARGET)/VBoxWddmCat.dir/VBoxOGL-x86.dll: $(PATH_OBJ)/VBoxOGL-x86/VBoxOGL-x86.dll | $$(dir $$@)
-        $(INSTALL) -m 644 $< $(@D)
-
-   $(PATH_TARGET)/VBoxWddmCat.dir/VBoxD3D9wddm-x86.dll: $(PATH_OBJ)/VBoxD3D9wddm-x86/VBoxD3D9wddm-x86.dll | $$(dir $$@)
-        $(INSTALL) -m 644 $< $(@D)
-
-   $(PATH_TARGET)/VBoxWddmCat.dir/wined3dwddm-x86.dll: $(PATH_OBJ)/wined3dwddm-x86/wined3dwddm-x86.dll | $$(dir $$@)
-        $(INSTALL) -m 644 $< $(@D)
-
-  endif # ($(KBUILD_TARGET_ARCH), amd64)
- endif # VBOXWDDM_WITH_GL
-
  $(PATH_TARGET)/VBoxWddmCat.dir/VBoxWddm.cat: \
                 $(PATH_TARGET)/VBoxWddmCat.dir/VBoxWddm.inf \
@@ -200 +161 @@
                                 $(PATH_TARGET)/VBoxWddmCat.dir/VBoxSVGA-x86.dll \
                                 $(PATH_TARGET)/VBoxWddmCat.dir/VBoxICD-x86.dll \
-                                $(PATH_TARGET)/VBoxWddmCat.dir/VBoxGL-x86.dll, ), ) \
-                $(if $(VBOXWDDM_WITH_GL),  $(PATH_TARGET)/VBoxWddmCat.dir/VBoxOGL.dll \
-                                           $(PATH_TARGET)/VBoxWddmCat.dir/VBoxD3D9wddm.dll \
-                                           $(PATH_TARGET)/VBoxWddmCat.dir/wined3dwddm.dll, ) \
-                $(if $(VBOXWDDM_WITH_GL), $(if-expr "$(KBUILD_TARGET_ARCH)" == "amd64", \
-                                           $(PATH_TARGET)/VBoxWddmCat.dir/VBoxOGL-x86.dll \
-                                           $(PATH_TARGET)/VBoxWddmCat.dir/VBoxD3D9wddm-x86.dll \
-                                           $(PATH_TARGET)/VBoxWddmCat.dir/wined3dwddm-x86.dll, ), )
+                                $(PATH_TARGET)/VBoxWddmCat.dir/VBoxGL-x86.dll, ), )
         $(call MSG_TOOL,Inf2Cat,VBoxWddm-inf,$@,$<)
         $(call VBOX_MAKE_CAT_FN, $(@D),$@)