Changeset 38082 in vbox for trunk/src/VBox/Additions/WINNT

Timestamp:

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

Author:

vboxsync

Message:

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

Location:

trunk/src/VBox/Additions/WINNT

Files:

• Graphics/Wine/Makefile.kmk (modified) (7 diffs)
• Installer/Makefile.kmk (modified) (3 diffs)
• SharedFolders/redirector/sys/Makefile.kmk (modified) (1 diff)
• VBoxHook/testcase/Makefile.kmk (modified) (1 diff)

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

@@ -174 +174 @@
 wined3d_SOURCES.amd64 = vbox/libWineStub/debug.c
 wined3d_LIBS.x86      = \
-    $(PATH_LIB)/libWine$(VBOX_SUFF_LIB)
+    $(PATH_STAGE_LIB)/libWine$(VBOX_SUFF_LIB)
 wined3d_SDKS.amd64    = WINDDKWLH
-    
+
 ifdef VBOX_WITH_WDDM
 DLLS += wined3dwddm
@@ -246 +246 @@
     d3d8/d3d8.def
 VBoxD3D8_LIBS.x86 = \
-    $(PATH_LIB)/libWine$(VBOX_SUFF_LIB)
+    $(PATH_STAGE_LIB)/libWine$(VBOX_SUFF_LIB)
 VBoxD3D8_LIBS     = \
-    $(PATH_LIB)/wined3d$(VBOX_SUFF_LIB)
+    $(PATH_STAGE_LIB)/wined3d$(VBOX_SUFF_LIB)
 VBoxD3D8_SOURCES.amd64 = vbox/libWineStub/debug.c
 VBoxD3D8_SDKS.amd64    = WINDDKWLH
@@ -287 +287 @@
     d3d9/volume.c \
     d3d9/volumetexture.c
- 
+
 VBoxD3D9_SOURCES.x86      = \
         d3d9/d3d9.def
@@ -294 +294 @@
         d3d9/d3d9xpdm.def
 VBoxD3D9_LIBS.x86         = \
-    $(PATH_LIB)/libWine$(VBOX_SUFF_LIB)
+    $(PATH_STAGE_LIB)/libWine$(VBOX_SUFF_LIB)
 VBoxD3D9_LIBS             = \
-    $(PATH_LIB)/wined3d$(VBOX_SUFF_LIB)
+    $(PATH_STAGE_LIB)/wined3d$(VBOX_SUFF_LIB)
 VBoxD3D9_SDKS.amd64    = WINDDKWLH
 
@@ -312 +312 @@
 VBoxD3D9wddm_SOURCES.x86    = $(NO_SUCH_VARIABLE)
 VBoxD3D9wddm_SOURCES.amd64  = $(NO_SUCH_VARIABLE)
-VBoxD3D9wddm_LIBS           = $(PATH_LIB)/wined3dwddm$(VBOX_SUFF_LIB)
+VBoxD3D9wddm_LIBS           = $(PATH_STAGE_LIB)/wined3dwddm$(VBOX_SUFF_LIB)
 VBoxD3D9wddm_LIBS.x86       = $(NO_SUCH_VARIABLE)
 VBoxD3D9wddm_SDKS           = WINDDKWLH
@@ -320 +320 @@
 VBoxD3D9wddm-x86_EXTENDS      = VBoxD3D9wddm
 VBoxD3D9wddm-x86_BLD_TRG_ARCH = x86
-VBoxD3D9wddm-x86_LIBS         = $(PATH_LIB)/wined3dwddm-x86$(VBOX_SUFF_LIB)
+VBoxD3D9wddm-x86_LIBS         = $(PATH_STAGE_LIB)/wined3dwddm-x86$(VBOX_SUFF_LIB)
 VBoxD3D9wddm-x86_DEFS         = $(VBoxD3D9wddm_DEFS) VBOX_WDDM_WOW64
 endif
@@ -348 +348 @@
     switcher/sw_d3d9xpdm.def
 d3d9_SDKS.amd64    = WINDDKWLH
-    
+
 
 include $(KBUILD_PATH)/subfooter.kmk

trunk/src/VBox/Additions/WINNT/Installer/Makefile.kmk

@@ -64 +64 @@
 # The installer.
 #
-PACKING     += $(PATH_BIN)/additions/VBoxWindowsAdditions-$(KBUILD_TARGET_ARCH).exe
+PACKING     += $(PATH_STAGE_BIN)/additions/VBoxWindowsAdditions-$(KBUILD_TARGET_ARCH).exe
 OTHER_CLEAN += \
-        $(PATH_BIN)/additions/VBoxWindowsAdditions-$(KBUILD_TARGET_ARCH).exe \
-        $(PATH_BIN)/additions/VBoxWHQLFake.exe
+        $(PATH_STAGE_BIN)/additions/VBoxWindowsAdditions-$(KBUILD_TARGET_ARCH).exe \
+        $(PATH_STAGE_BIN)/additions/VBoxWHQLFake.exe
 
 DRIVER_FILES := \
-        $(PATH_BIN)/additions/VBoxGuestDrvInst.exe \
-        $(PATH_BIN)/additions/RegCleanup.exe \
-        $(PATH_BIN)/additions/VBoxMouse.sys \
-        $(PATH_BIN)/additions/VBoxGuest.sys \
-        $(PATH_BIN)/additions/VBoxVideo.sys \
-        $(PATH_BIN)/additions/VBoxDisp.dll \
-        $(PATH_BIN)/additions/VBoxSF.sys \
-        $(PATH_BIN)/additions/VBoxMRXNP.dll \
-        $(PATH_BIN)/additions/VBoxTray.exe \
-        $(PATH_BIN)/additions/VBoxControl.exe \
-        $(PATH_BIN)/additions/VBoxWHQLFake.exe \
-        $(PATH_BIN)/additions/VBoxService.exe
+        $(PATH_STAGE_BIN)/additions/VBoxGuestDrvInst.exe \
+        $(PATH_STAGE_BIN)/additions/RegCleanup.exe \
+        $(PATH_STAGE_BIN)/additions/VBoxMouse.sys \
+        $(PATH_STAGE_BIN)/additions/VBoxGuest.sys \
+        $(PATH_STAGE_BIN)/additions/VBoxVideo.sys \
+        $(PATH_STAGE_BIN)/additions/VBoxDisp.dll \
+        $(PATH_STAGE_BIN)/additions/VBoxSF.sys \
+        $(PATH_STAGE_BIN)/additions/VBoxMRXNP.dll \
+        $(PATH_STAGE_BIN)/additions/VBoxTray.exe \
+        $(PATH_STAGE_BIN)/additions/VBoxControl.exe \
+        $(PATH_STAGE_BIN)/additions/VBoxWHQLFake.exe \
+        $(PATH_STAGE_BIN)/additions/VBoxService.exe
 ifeq ($(KBUILD_TARGET_ARCH),x86)
 DRIVER_FILES += \
-        $(PATH_BIN)/additions/VBoxMouseNT.sys \
-        $(PATH_BIN)/additions/VBoxGuestNT.sys
-endif
-DRIVER_FILES += \
-        $(PATH_BIN)/additions/VBoxVideo.inf \
-        $(PATH_BIN)/additions/VBoxGuest.inf
+        $(PATH_STAGE_BIN)/additions/VBoxMouseNT.sys \
+        $(PATH_STAGE_BIN)/additions/VBoxGuestNT.sys
+endif
+DRIVER_FILES += \
+        $(PATH_STAGE_BIN)/additions/VBoxVideo.inf \
+        $(PATH_STAGE_BIN)/additions/VBoxGuest.inf
 ifdef VBOX_SIGN_ADDITIONS
 DRIVER_FILES += \
-        $(PATH_BIN)/additions/VBoxVideo.cat \
-        $(PATH_BIN)/additions/VBoxGuest.cat
+        $(PATH_STAGE_BIN)/additions/VBoxVideo.cat \
+        $(PATH_STAGE_BIN)/additions/VBoxGuest.cat
 endif
 ifdef VBOX_WITH_CROGL
 DRIVER_FILES += \
-        $(PATH_BIN)/additions/VBoxOGLarrayspu.dll \
-        $(PATH_BIN)/additions/VBoxOGLcrutil.dll \
-        $(PATH_BIN)/additions/VBoxOGLerrorspu.dll \
-        $(PATH_BIN)/additions/VBoxOGLpackspu.dll \
-        $(PATH_BIN)/additions/VBoxOGLpassthroughspu.dll \
-        $(PATH_BIN)/additions/VBoxOGLfeedbackspu.dll \
-        $(PATH_BIN)/additions/VBoxOGL.dll \
-        $(PATH_BIN)/additions/wined3d.dll \
-        $(PATH_BIN)/additions/VBoxD3D9.dll \
-        $(PATH_BIN)/additions/VBoxD3D8.dll
+        $(PATH_STAGE_BIN)/additions/VBoxOGLarrayspu.dll \
+        $(PATH_STAGE_BIN)/additions/VBoxOGLcrutil.dll \
+        $(PATH_STAGE_BIN)/additions/VBoxOGLerrorspu.dll \
+        $(PATH_STAGE_BIN)/additions/VBoxOGLpackspu.dll \
+        $(PATH_STAGE_BIN)/additions/VBoxOGLpassthroughspu.dll \
+        $(PATH_STAGE_BIN)/additions/VBoxOGLfeedbackspu.dll \
+        $(PATH_STAGE_BIN)/additions/VBoxOGL.dll \
+        $(PATH_STAGE_BIN)/additions/wined3d.dll \
+        $(PATH_STAGE_BIN)/additions/VBoxD3D9.dll \
+        $(PATH_STAGE_BIN)/additions/VBoxD3D8.dll
  ifeq ($(KBUILD_TARGET_ARCH),x86)
 DRIVER_FILES += \
-        $(PATH_BIN)/additions/libWine.dll
+        $(PATH_STAGE_BIN)/additions/libWine.dll
  endif
  ifeq ($(KBUILD_TARGET_ARCH),amd64)
@@ -131 +131 @@
 ifdef VBOX_WITH_WDDM
 DRIVER_FILES += \
-        $(PATH_BIN)/additions/VBoxVideoWddm.sys \
-        $(PATH_BIN)/additions/VBoxVideoWddm.inf \
-        $(PATH_BIN)/additions/VBoxDispD3D.dll
+        $(PATH_STAGE_BIN)/additions/VBoxVideoWddm.sys \
+        $(PATH_STAGE_BIN)/additions/VBoxVideoWddm.inf \
+        $(PATH_STAGE_BIN)/additions/VBoxDispD3D.dll
  ifdef VBOX_WITH_CROGL
 DRIVER_FILES += \
-        $(PATH_BIN)/additions/wined3dwddm.dll \
-        $(PATH_BIN)/additions/VBoxD3D9wddm.dll
+        $(PATH_STAGE_BIN)/additions/wined3dwddm.dll \
+        $(PATH_STAGE_BIN)/additions/VBoxD3D9wddm.dll
  endif
  ifdef VBOX_SIGN_ADDITIONS
 DRIVER_FILES += \
-        $(PATH_BIN)/additions/VBoxVideoWddm.cat
+        $(PATH_STAGE_BIN)/additions/VBoxVideoWddm.cat
  endif
  ifeq ($(KBUILD_TARGET_ARCH),amd64)
 DRIVER_FILES += \
-        $(PATH_BIN)/additions/VBoxDispD3D-x86.dll
+        $(PATH_STAGE_BIN)/additions/VBoxDispD3D-x86.dll
   ifdef VBOX_WITH_CROGL
 DRIVER_FILES += \
-        $(PATH_BIN)/additions/wined3dwddm-x86.dll \
-        $(PATH_BIN)/additions/VBoxD3D9wddm-x86.dll \
-        $(PATH_BIN)/additions/VBoxOGL-x86.dll \
-        $(PATH_BIN)/additions/VBoxOGLarrayspu-x86.dll \
-        $(PATH_BIN)/additions/VBoxOGLcrutil-x86.dll \
-        $(PATH_BIN)/additions/VBoxOGLerrorspu-x86.dll \
-        $(PATH_BIN)/additions/VBoxOGLfeedbackspu-x86.dll \
-        $(PATH_BIN)/additions/VBoxOGLpackspu-x86.dll \
-        $(PATH_BIN)/additions/VBoxOGLpassthroughspu-x86.dll
+        $(PATH_STAGE_BIN)/additions/wined3dwddm-x86.dll \
+        $(PATH_STAGE_BIN)/additions/VBoxD3D9wddm-x86.dll \
+        $(PATH_STAGE_BIN)/additions/VBoxOGL-x86.dll \
+        $(PATH_STAGE_BIN)/additions/VBoxOGLarrayspu-x86.dll \
+        $(PATH_STAGE_BIN)/additions/VBoxOGLcrutil-x86.dll \
+        $(PATH_STAGE_BIN)/additions/VBoxOGLerrorspu-x86.dll \
+        $(PATH_STAGE_BIN)/additions/VBoxOGLfeedbackspu-x86.dll \
+        $(PATH_STAGE_BIN)/additions/VBoxOGLpackspu-x86.dll \
+        $(PATH_STAGE_BIN)/additions/VBoxOGLpassthroughspu-x86.dll
   endif
  endif
@@ -224 +224 @@
 WHQLFAKE := $(PATH_SUB_CURRENT)/VBoxWHQLFake.au3
 
-$(PATH_BIN)/additions/VBoxWHQLFake.exe:
+$(PATH_STAGE_BIN)/additions/VBoxWHQLFake.exe:
         $(call MSG_L1,Creating $@, from $<)
         $(QUIET)$(EXEC_X86_WIN32) $(VBOX_PATH_AUTOIT3)/Aut2Exe/Aut2exe.exe \
                 /in $(WHQLFAKE) \
-                /out $(PATH_BIN)/additions/VBoxWHQLFake.exe \
+                /out $(PATH_STAGE_BIN)/additions/VBoxWHQLFake.exe \
                 /icon $(VBOX_WINDOWS_ADDITIONS_ICON_FILE) \
                 /comp 4 \
                 /unicode
 
-$(PATH_BIN)/additions/VBoxWindowsAdditions-$(KBUILD_TARGET_ARCH).exe: \
+$(PATH_STAGE_BIN)/additions/VBoxWindowsAdditions-$(KBUILD_TARGET_ARCH).exe: \
                 $(PATH_SUB_CURRENT)/VBoxGuestAdditions.nsi \
                 $(DRIVER_FILES) \

trunk/src/VBox/Additions/WINNT/SharedFolders/redirector/sys/Makefile.kmk

@@ -89 +89 @@
 
 ##        rdbss.asm \
-##      $(PATH_LIB)/rdbss$(VBOXW32GUEST_SUFF_LIB)
+##      $(PATH_STAGE_LIB)/rdbss$(VBOXW32GUEST_SUFF_LIB)
 
 

trunk/src/VBox/Additions/WINNT/VBoxHook/testcase/Makefile.kmk

@@ -30 +30 @@
 tstHook_SOURCES  = tstHook.cpp
 tstHook_INCS     = ../../include
-tstHook_LIBS     = $(PATH_LIB)/VBoxHook.lib
+tstHook_LIBS     = $(PATH_STAGE_LIB)/VBoxHook.lib
 
 endif # VBOX_WITH_TESTCASES