Changeset 78416 in vbox for trunk

Timestamp:

May 6, 2019 10:26:02 PM (6 years ago)

Author:

vboxsync

Message:

HostServices/SharedOpenGL: Another linux build fix for r130405

File:

• trunk/src/VBox/HostServices/SharedOpenGL/Makefile.kmk (modified) (4 diffs)

trunk/src/VBox/HostServices/SharedOpenGL/Makefile.kmk

@@ -84 +84 @@
  VBoxSharedCrOpenGL_LIBS += \
         $(LIB_XPCOM)
+endif
+if1of ($(KBUILD_TARGET), freebsd linux netbsd openbsd solaris) # the X11 gang
+ VBoxSharedCrOpenGL_LIBS += \
+        Xmu \
+        X11 \
+        Xext
+ VBoxSharedCrOpenGL_LIBPATH = \
+        $(VBOX_LIBPATH_X11)
 endif
 ifdef VBOX_WITH_CRHGSMI
@@ -281 +289 @@
 VBoxOGLrenderspu_DEFS += VBOX_WITH_VDMA
 endif
-if1of ($(KBUILD_TARGET), freebsd linux netbsd openbsd solaris) # the X11 gang
- VBoxOGLrenderspu_LIBS += \
-        Xmu \
-        X11 \
-        Xext
- VBoxOGLrenderspu_LIBPATH = \
-        $(VBOX_LIBPATH_X11)
-endif
 
 LIBRARIES += VBoxOGLTest
@@ -320 +320 @@
   VBoxTestOGL_LIBS = \
         $(if $(VBOX_WITH_CROGL), \
-            $(PATH_STAGE_LIB)/VBoxOGLhostspuload$(VBOX_SUFF_LIB) \
             $(PATH_STAGE_LIB)/VBoxOGLhosterrorspu$(VBOX_SUFF_LIB) \
             $(PATH_STAGE_LIB)/VBoxOGLrenderspu$(VBOX_SUFF_LIB) \
+            $(PATH_STAGE_LIB)/VBoxOGLhostspuload$(VBOX_SUFF_LIB) \
             $(PATH_STAGE_LIB)/VBoxOGLhostcrutil$(VBOX_SUFF_LIB),) \
         $(if $(VBOX_WITH_VIDEOHWACCEL), $(PATH_STAGE_LIB)/VBoxOGL2D$(VBOX_SUFF_LIB),) \
@@ -342 +342 @@
    endif
   endif
+  if1of ($(KBUILD_TARGET), freebsd linux netbsd openbsd solaris) # the X11 gang
+   VBoxTestOGL_LIBS += \
+        Xmu \
+        X11 \
+        Xext
+   VBoxTestOGL_LIBPATH = \
+        $(VBOX_LIBPATH_X11)
+endif
   # Don't let ld strip out explicitly linked libraries even when they are not needed.
   # This was causing some dynamic library loading problems in case of indirect dependencies