Changeset 8765 in vbox for trunk

Timestamp:

May 12, 2008 12:59:03 AM (17 years ago)

Author:

vboxsync

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

30749

Message:

win32 -> win.

Location:

trunk/src/VBox/Main

Files:

• Makefile.kmk (modified) (7 diffs)
• VirtualBoxImpl.cpp (modified) (1 diff)
• include/HostImpl.h (modified) (1 diff)
• include/SessionImpl.h (modified) (1 diff)
• include/VirtualBoxImpl.h (modified) (1 diff)
• win (moved) (moved from trunk/src/VBox/Main/win32 )

trunk/src/VBox/Main/Makefile.kmk

@@ -221 +221 @@
 VBoxSVC_SOURCES.win = \
         HostNetworkInterfaceImpl.cpp \
-        win32/svcmain.cpp \
-        win32/svchlp.cpp \
-        win32/VBoxSVC.rc
+        win/svcmain.cpp \
+        win/svchlp.cpp \
+        win/VBoxSVC.rc
 
 VBoxSVC_SOURCES.linux = \
@@ -245 +245 @@
 VBoxSVC_SOURCES.os2     +=     os2/USBProxyServiceOs2.cpp
 VBoxSVC_SOURCES.solaris += solaris/USBProxyServiceSolaris.cpp
-VBoxSVC_SOURCES.win     +=   win32/USBProxyServiceWin32.cpp
+VBoxSVC_SOURCES.win     +=     win/USBProxyServiceWin32.cpp
 endif
 
@@ -253 +253 @@
 endif
 
-win32/VBoxSVC.rc_INCS   = $(PATH_TARGET)
-win32/VBoxSVC.rc_DEPS   = $(PATH_TARGET)/VBoxSVC.rgs $(PATH_TARGET)/VBoxSVC-icon.rc
-win32/VBoxSVC.rc_CLEAN  = $(PATH_TARGET)/VBoxSVC-icon.rc
+win/VBoxSVC.rc_INCS   = $(PATH_TARGET)
+win/VBoxSVC.rc_DEPS   = $(PATH_TARGET)/VBoxSVC.rgs $(PATH_TARGET)/VBoxSVC-icon.rc
+win/VBoxSVC.rc_CLEAN  = $(PATH_TARGET)/VBoxSVC-icon.rc
 
 $(PATH_TARGET)/VBoxSVC-icon.rc: Makefile.kmk $(VBOX_WINDOWS_ICON_FILE) | $$(call DIRDEP,$$(@D))
@@ -386 +386 @@
         VMMDevInterface.cpp
 VBoxC_SOURCES.win = \
-        win32/dllmain.cpp \
-        win32/VBoxC.def \
-        win32/VBoxC.rc
+        win/dllmain.cpp \
+        win/VBoxC.def \
+        win/VBoxC.rc
 ifdef VBOX_WITH_XPCOM
 VBoxC_SOURCES += \
@@ -421 +421 @@
 ConsoleImpl.cpp_DEFS = VBOX_BUILD_TARGET=\"$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH)\"
 
-win32/VBoxC.rc_DEPS = $(PATH_TARGET)/VBoxC.rgs $(PATH_VBoxCOM)/VirtualBox.tlb
+win/VBoxC.rc_DEPS = $(PATH_TARGET)/VBoxC.rgs $(PATH_VBoxCOM)/VirtualBox.tlb
 
 
@@ -620 +620 @@
         $(QUIET)$(VBOX_XSLTPROC) -o $@ $^
 
-$(PATH_TARGET)/VBoxSVC.rgs: win32/VirtualBox_rgs.xsl $(XIDLFILE)
+$(PATH_TARGET)/VBoxSVC.rgs: win/VirtualBox_rgs.xsl $(XIDLFILE)
         $(VBOX_XSLTPROC) --stringparam Module VBoxSVC -o $@ $^
 
-$(PATH_TARGET)/VBoxC.rgs: win32/VirtualBox_rgs.xsl $(XIDLFILE)
+$(PATH_TARGET)/VBoxC.rgs: win/VirtualBox_rgs.xsl $(XIDLFILE)
         $(VBOX_XSLTPROC) --stringparam Module VBoxC -o $@ $^
 
@@ -691 +691 @@
 testschemadefs: $(VBOX_XML_SCHEMADEFS_H) $(VBOX_XML_SCHEMADEFS_CPP)
 
-$(PATH_BIN)/comregister.cmd: win32/comregister.cmd
+$(PATH_BIN)/comregister.cmd: win/comregister.cmd
         $(CP) $< $@
 

trunk/src/VBox/Main/VirtualBoxImpl.cpp

@@ -37 +37 @@
 
 #ifdef RT_OS_WINDOWS
-#include "win32/svchlp.h"
+# include "win/svchlp.h"
 #endif
 

trunk/src/VBox/Main/include/HostImpl.h

@@ -34 +34 @@
 
 #ifdef RT_OS_WINDOWS
-# include "win32/svchlp.h"
+# include "win/svchlp.h"
 #endif
 

trunk/src/VBox/Main/include/SessionImpl.h

@@ -27 +27 @@
 
 #ifdef RT_OS_WINDOWS
-#include "win32/resource.h"
+# include "win/resource.h"
 #endif
 

trunk/src/VBox/Main/include/VirtualBoxImpl.h

@@ -34 +34 @@
 
 #ifdef RT_OS_WINDOWS
-#include "win32/resource.h"
+# include "win/resource.h"
 #endif