Changeset 38082 in vbox for trunk/src/VBox/Additions/common/crOpenGL

Timestamp:

Jul 20, 2011 2:26:24 PM (14 years ago)

Author:

vboxsync

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

73029

Message:

*.kmk: Installation/staging adjustments (kBuild 0.2.0 preps).

File:

• trunk/src/VBox/Additions/common/crOpenGL/Makefile.kmk (modified) (11 diffs)

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

@@ -24 +24 @@
 BLDDIRS += \
         $(VBOX_PATH_CROGL_GENFILES)/
-        
+
 DLLS.win += \
     VBoxOGL \
@@ -199 +199 @@
         $(VBOX_LIB_VBGL_R3_SHARED) \
         $(VBOX_LIB_OGL_CRUTIL) \
-        $(PATH_LIB)/additions/VBoxOGLspuload$(VBOX_SUFF_LIB)
+        $(PATH_STAGE_LIB)/additions/VBoxOGLspuload$(VBOX_SUFF_LIB)
 if1of ($(KBUILD_TARGET), linux solaris freebsd)
  VBoxOGL_LIBS += \
-        $(PATH_LIB)/libXcomposite.so \
-        $(PATH_LIB)/libXdamage.so \
-        $(PATH_LIB)/libXfixes.so \
-        $(PATH_LIB)/libXext.so
+        $(PATH_STAGE_LIB)/libXcomposite.so \
+        $(PATH_STAGE_LIB)/libXdamage.so \
+        $(PATH_STAGE_LIB)/libXfixes.so \
+        $(PATH_STAGE_LIB)/libXext.so
  ifdef VBoxOGL_FAKEDRI
   VBoxOGL_LIBS += \
@@ -214 +214 @@
 ifdef VBOX_WITH_WDDM
 #
-# VBoxOGL-x86 - x86 VBoxOGL version built for amd64 build 
+# VBoxOGL-x86 - x86 VBoxOGL version built for amd64 build
 #
 DLLS.win.amd64 += VBoxOGL-x86
@@ -222 +222 @@
         $(VBOX_LIB_VBGL_R3_SHARED_X86) \
         $(VBOX_LIB_OGL_CRUTIL_X86) \
-        $(PATH_LIB)/additions/VBoxOGLspuload-x86$(VBOX_SUFF_LIB)
+        $(PATH_STAGE_LIB)/additions/VBoxOGLspuload-x86$(VBOX_SUFF_LIB)
 VBoxOGL-x86_SOURCES.win = $(subst cropengl.def,cropengl-x86.def,$(VBoxOGL_SOURCES.win))
 VBoxOGL-x86_CLEAN.win = $(subst cropengl.def,cropengl-x86.def,$(VBoxOGL_CLEAN.win))
@@ -398 +398 @@
 VBoxOGLarrayspu_LIBS          = \
         $(VBOX_LIB_OGL_CRUTIL) \
-        $(PATH_LIB)/additions/VBoxOGLspuload$(VBOX_SUFF_LIB) \
-        $(PATH_LIB)/additions/VBoxOGLcrstate$(VBOX_SUFF_LIB)
+        $(PATH_STAGE_LIB)/additions/VBoxOGLspuload$(VBOX_SUFF_LIB) \
+        $(PATH_STAGE_LIB)/additions/VBoxOGLcrstate$(VBOX_SUFF_LIB)
 
 ifdef VBOX_WITH_WDDM
@@ -409 +409 @@
 VBoxOGLarrayspu-x86_BLD_TRG_ARCH = x86
 VBoxOGLarrayspu-x86_LIBS = $(VBOX_LIB_OGL_CRUTIL_X86) \
-        $(PATH_LIB)/additions/VBoxOGLspuload-x86$(VBOX_SUFF_LIB) \
-        $(PATH_LIB)/additions/VBoxOGLcrstate-x86$(VBOX_SUFF_LIB)
+        $(PATH_STAGE_LIB)/additions/VBoxOGLspuload-x86$(VBOX_SUFF_LIB) \
+        $(PATH_STAGE_LIB)/additions/VBoxOGLcrstate-x86$(VBOX_SUFF_LIB)
 VBoxOGLarrayspu-x86_DEFS = $(VBoxOGLarrayspu_DEFS) VBOX_WDDM_WOW64
 endif
@@ -437 +437 @@
 VBoxOGLpassthroughspu_LIBS        = \
         $(VBOX_LIB_OGL_CRUTIL)
-        
+
 ifdef VBOX_WITH_WDDM
 #
@@ -503 +503 @@
 VBoxOGLpackspu_LIBS        = \
         $(VBOX_LIB_OGL_CRUTIL) \
-        $(PATH_LIB)/additions/VBoxOGLspuload$(VBOX_SUFF_LIB) \
-        $(PATH_LIB)/additions/VBoxOGLcrstate$(VBOX_SUFF_LIB) \
-        $(PATH_LIB)/additions/VBoxOGLcrpacker$(VBOX_SUFF_LIB)
+        $(PATH_STAGE_LIB)/additions/VBoxOGLspuload$(VBOX_SUFF_LIB) \
+        $(PATH_STAGE_LIB)/additions/VBoxOGLcrstate$(VBOX_SUFF_LIB) \
+        $(PATH_STAGE_LIB)/additions/VBoxOGLcrpacker$(VBOX_SUFF_LIB)
 
 ifdef VBOX_WITH_WDDM
@@ -515 +515 @@
 VBoxOGLpackspu-x86_BLD_TRG_ARCH = x86
 VBoxOGLpackspu-x86_LIBS = $(VBOX_LIB_OGL_CRUTIL_X86) \
-        $(PATH_LIB)/additions/VBoxOGLspuload-x86$(VBOX_SUFF_LIB) \
-        $(PATH_LIB)/additions/VBoxOGLcrstate-x86$(VBOX_SUFF_LIB) \
-        $(PATH_LIB)/additions/VBoxOGLcrpacker-x86$(VBOX_SUFF_LIB)
+        $(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)
 VBoxOGLpackspu-x86_DEFS = $(VBoxOGLpackspu_DEFS) VBOX_WDDM_WOW64
 endif
@@ -574 +574 @@
 VBoxOGLfeedbackspu_LIBS        = \
         $(VBOX_LIB_OGL_CRUTIL) \
-        $(PATH_LIB)/additions/VBoxOGLspuload$(VBOX_SUFF_LIB) \
-        $(PATH_LIB)/additions/VBoxOGLcrstate$(VBOX_SUFF_LIB)
-        
+        $(PATH_STAGE_LIB)/additions/VBoxOGLspuload$(VBOX_SUFF_LIB) \
+        $(PATH_STAGE_LIB)/additions/VBoxOGLcrstate$(VBOX_SUFF_LIB)
+
 ifdef VBOX_WITH_WDDM
 #
@@ -585 +585 @@
 VBoxOGLfeedbackspu-x86_BLD_TRG_ARCH = x86
 VBoxOGLfeedbackspu-x86_LIBS = $(VBOX_LIB_OGL_CRUTIL_X86) \
-        $(PATH_LIB)/additions/VBoxOGLspuload-x86$(VBOX_SUFF_LIB) \
-        $(PATH_LIB)/additions/VBoxOGLcrstate-x86$(VBOX_SUFF_LIB)
+        $(PATH_STAGE_LIB)/additions/VBoxOGLspuload-x86$(VBOX_SUFF_LIB) \
+        $(PATH_STAGE_LIB)/additions/VBoxOGLcrstate-x86$(VBOX_SUFF_LIB)
 VBoxOGLfeedbackspu-x86_DEFS = $(VBoxOGLfeedbackspu_DEFS) VBOX_WDDM_WOW64
 endif