Changeset 78424 in vbox for trunk/src

Timestamp:

May 7, 2019 10:04:23 AM (6 years ago)

Author:

vboxsync

Message:

Config.kmk,GuestHost/OpenGL,Additions/common/crOpenGL: Makefile cleanup, fix linux builds

Location:

trunk/src/VBox

Files:

• Additions/common/crOpenGL/Makefile.kmk (modified) (3 diffs)
• GuestHost/OpenGL/Makefile.kmk (modified) (1 diff)

trunk/src/VBox/Additions/common/crOpenGL/Makefile.kmk

@@ -208 +208 @@
 endif
 VBoxOGL_LIBS = \
-        $(VBOX_LIB_IPRT_GUEST_R3_SHARED) \
-        $(VBOX_LIB_VBGL_R3_SHARED) \
-        $(VBOX_LIB_OGL_CRUTIL) \
-        $(PATH_STAGE_LIB)/additions/VBoxOGLspuload$(VBOX_SUFF_LIB) \
-        $(PATH_STAGE_LIB)/additions/VBoxOGLcrstate$(VBOX_SUFF_LIB) \
-        $(PATH_STAGE_LIB)/additions/VBoxOGLcrpacker$(VBOX_SUFF_LIB) \
         $(PATH_STAGE_LIB)/additions/VBoxOGLfeedbackspu$(VBOX_SUFF_LIB) \
         $(PATH_STAGE_LIB)/additions/VBoxOGLpassthroughspu$(VBOX_SUFF_LIB) \
         $(PATH_STAGE_LIB)/additions/VBoxOGLpackspu$(VBOX_SUFF_LIB) \
-        $(PATH_STAGE_LIB)/additions/VBoxOGLerrorspu$(VBOX_SUFF_LIB)
+        $(PATH_STAGE_LIB)/additions/VBoxOGLerrorspu$(VBOX_SUFF_LIB) \
+        $(PATH_STAGE_LIB)/additions/VBoxOGLcrpacker$(VBOX_SUFF_LIB) \
+        $(PATH_STAGE_LIB)/additions/VBoxOGLcrstate$(VBOX_SUFF_LIB) \
+        $(PATH_STAGE_LIB)/additions/VBoxOGLspuload$(VBOX_SUFF_LIB) \
+        $(PATH_STAGE_LIB)/additions/VBoxOGLcrutil$(VBOX_SUFF_LIB) \
+        $(VBOX_LIB_IPRT_GUEST_R3_SHARED) \
+        $(VBOX_LIB_VBGL_R3_SHARED)
 
 VBoxOGL_LIBS.win += \
@@ -262 +262 @@
 VBoxOGL-x86_EXTENDS = VBoxOGL
 VBoxOGL-x86_BLD_TRG_ARCH = x86
-VBoxOGL-x86_LIBS = $(VBOX_LIB_IPRT_GUEST_R3_SHARED_X86) \
-        $(VBOX_LIB_VBGL_R3_SHARED_X86) \
-        $(VBOX_LIB_OGL_CRUTIL_X86) \
-        $(PATH_STAGE_LIB)/additions/VBoxOGLspuload-x86$(VBOX_SUFF_LIB) \
-        $(PATH_STAGE_LIB)/additions/VBoxOGLcrstate-x86$(VBOX_SUFF_LIB) \
-        $(PATH_STAGE_LIB)/additions/VBoxOGLcrpacker-x86$(VBOX_SUFF_LIB) \
+VBoxOGL-x86_LIBS = \
         $(PATH_STAGE_LIB)/additions/VBoxOGLfeedbackspu-x86$(VBOX_SUFF_LIB) \
         $(PATH_STAGE_LIB)/additions/VBoxOGLpassthroughspu-x86$(VBOX_SUFF_LIB) \
         $(PATH_STAGE_LIB)/additions/VBoxOGLpackspu-x86$(VBOX_SUFF_LIB) \
-        $(PATH_STAGE_LIB)/additions/VBoxOGLerrorspu-x86$(VBOX_SUFF_LIB)
+        $(PATH_STAGE_LIB)/additions/VBoxOGLerrorspu-x86$(VBOX_SUFF_LIB) \
+        $(PATH_STAGE_LIB)/additions/VBoxOGLcrpacker-x86$(VBOX_SUFF_LIB) \
+        $(PATH_STAGE_LIB)/additions/VBoxOGLcrstate-x86$(VBOX_SUFF_LIB) \
+        $(PATH_STAGE_LIB)/additions/VBoxOGLspuload-x86$(VBOX_SUFF_LIB) \
+        $(PATH_STAGE_LIB)/additions/VBoxOGLcrutil-x86$(VBOX_SUFF_LIB) \
+        $(VBOX_LIB_IPRT_GUEST_R3_SHARED_X86) \
+        $(VBOX_LIB_VBGL_R3_SHARED_X86)
 
 VBoxOGL-x86_LIBS.win += \
@@ -489 +490 @@
 VBoxOGLpassthroughspu-x86_EXTENDS = VBoxOGLpassthroughspu
 VBoxOGLpassthroughspu-x86_BLD_TRG_ARCH = x86
-VBoxOGLpassthroughspu-x86_LIBS = $(VBOX_LIB_OGL_CRUTIL_X86)
 VBoxOGLpassthroughspu-x86_DEFS = $(VBoxOGLpassthroughspu_DEFS) VBOX_WDDM_WOW64
 endif

trunk/src/VBox/GuestHost/OpenGL/Makefile.kmk

@@ -45 +45 @@
 #
 VBoxOGLcrutil_TEMPLATE      = VBOXCROGLR3GUESTLIB
-if defined(VBOX_SIGNING_MODE) && defined(VBOX_WITH_WDDM)
- VBoxOGLcrutil_INSTTYPE.win = none
- VBoxOGLcrutil_DEBUG_INSTTYPE.win = both
-endif
 VBoxOGLcrutil_SDKS.win      = ReorderCompilerIncs $(VBOX_WINPSDK) $(VBOX_WINDDK)
 VBoxOGLcrutil_INTERMEDIATES = $(VBOX_PATH_CROGL_GENFILES)/cr_opcodes.h