Changeset 28543 in vbox for trunk/src/VBox/Main

Timestamp:

Apr 21, 2010 7:07:03 AM (15 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

60352

Message:

Main/TestVBoxOGL: fixed order of libGL.so dependency

File:

• trunk/src/VBox/Main/Makefile.kmk (modified) (2 diffs)

trunk/src/VBox/Main/Makefile.kmk

@@ -480 +480 @@
   VBoxTestOGL_SOURCES = generic/OpenGLTestApp.cpp
   VBoxTestOGL_LIBS = \
-    $(if $(VBOX_WITH_CROGL), \
+        $(if $(VBOX_WITH_CROGL), \
           $(PATH_LIB)/VBoxOGLhostspuload$(VBOX_SUFF_LIB) \
           $(VBOX_LIB_OGL_HOSTCRUTIL),) \
-        $(if $(VBOX_WITH_VIDEOHWACCEL), $(PATH_LIB)/VBoxOGL2D$(VBOX_SUFF_LIB),) \
-        $(LIB_RUNTIME)
+        $(if $(VBOX_WITH_VIDEOHWACCEL), $(PATH_LIB)/VBoxOGL2D$(VBOX_SUFF_LIB),) \
+        $(LIB_RUNTIME)
   VBoxTestOGL_DEFS += \
-    $(if $(VBOX_WITH_CROGL), VBOX_WITH_CROGL,) \
-    $(if $(VBOX_WITH_VIDEOHWACCEL), VBOX_WITH_VIDEOHWACCEL,) \
+        $(if $(VBOX_WITH_CROGL), VBOX_WITH_CROGL,) \
+        $(if $(VBOX_WITH_VIDEOHWACCEL), VBOX_WITH_VIDEOHWACCEL,) \
         VBOX_BUILD_TARGET=\"$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH)\" \
         $(if $(VBOX_BLEEDING_EDGE),VBOX_BLEEDING_EDGE=\"$(VBOX_BLEEDING_EDGE)\",)
@@ -494 +494 @@
    VBoxTestOGL_LDFLAGS.darwin += -framework OpenGL
    VBoxTestOGL_LIBS.win     += $(PATH_SDK_WINPSDK_LIB)/Opengl32.lib
-   VBoxTestOGL_LIBS.solaris += GL
-   VBoxTestOGL_LIBS.linux   += GL
-   VBoxTestOGL_LIBS.freebsd += GL
+   if1of ($(KBUILD_TARGET), solaris linux freebsd)
+    # must come after VBoxOGL2D, therefore don't set the arch-specific LIBS variable here!
+    VBoxTestOGL_LIBS += GL
+   endif
   endif
   VBoxTestOGL_LDFLAGS.win = /SUBSYSTEM:windows