Changeset 5427 in vbox for trunk

Timestamp:

Oct 21, 2007 9:23:00 PM (17 years ago)

Author:

vboxsync

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

25541

Message:

Merged r3/win32 and r3/win64

Location:

trunk/src/VBox/Runtime

Files:

• Makefile.kmk (modified) (2 diffs)
• r3/win (moved) (moved from trunk/src/VBox/Runtime/r3/win32 )
• r3/win/VBoxRT-win64.def (copied) (copied from trunk/src/VBox/Runtime/r3/win64/VBoxRT-win64.def )
• r3/win64 (deleted)

trunk/src/VBox/Runtime/Makefile.kmk

@@ -243 +243 @@
         nt/RTErrConvertFromNtStatus.cpp \
         r3/posix/env-posix.cpp \
-        r3/win32/alloc-win32.cpp \
-        r3/win32/dir-win32.cpp \
-        r3/win32/fileio-win32.cpp \
-        r3/win32/fs-win32.cpp \
-        r3/win32/ldrNative-win32.cpp \
-        r3/win32/path-win32.cpp \
-        r3/win32/process-win32.cpp \
-        r3/win32/RTLogWriteDebugger-win32.cpp \
-        r3/win32/sched-win32.cpp \
-        r3/win32/sems-win32.cpp \
-        r3/win32/system-win32.cpp \
-        r3/win32/thread-win32.cpp \
-        r3/win32/time-win32.cpp \
-        r3/win32/timer-win32.cpp \
-        r3/win32/utf16locale-win32.cpp \
-        r3/win32/utf8-win32.cpp \
-        r3/win32/uuid-win32.cpp \
+        r3/win/alloc-win32.cpp \
+        r3/win/dir-win32.cpp \
+        r3/win/fileio-win32.cpp \
+        r3/win/fs-win32.cpp \
+        r3/win/ldrNative-win32.cpp \
+        r3/win/path-win32.cpp \
+        r3/win/process-win32.cpp \
+        r3/win/RTLogWriteDebugger-win32.cpp \
+        r3/win/sched-win32.cpp \
+        r3/win/sems-win32.cpp \
+        r3/win/system-win32.cpp \
+        r3/win/thread-win32.cpp \
+        r3/win/time-win32.cpp \
+        r3/win/timer-win32.cpp \
+        r3/win/utf16locale-win32.cpp \
+        r3/win/utf8-win32.cpp \
+        r3/win/uuid-win32.cpp \
         win/errmsgwin.cpp \
         win/RTErrConvertFromWin32.cpp
@@ -533 +533 @@
 VBoxRT_SOURCES.$(BUILD_TARGET) = $(RuntimeR3_SOURCES.$(BUILD_TARGET))
 VBoxRT_SOURCES.$(BUILD_TARGET).$(BUILD_TARGET_ARCH) = $(RuntimeR3_SOURCES.$(BUILD_TARGET).$(BUILD_TARGET_ARCH))
-VBoxRT_SOURCES.win            += r3/win32/dllmain-win32.cpp
-VBoxRT_SOURCES.win.amd64      += r3/win64/VBoxRT-win64.def
+VBoxRT_SOURCES.win            += r3/win/dllmain-win32.cpp
+VBoxRT_SOURCES.win.amd64      += r3/win/VBoxRT-win64.def
 VBoxRT_INCS                    = $(RuntimeR3_INCS)
 VBoxRT_INCS.$(BUILD_TARGET)    = $(RuntimeR3_INCS.$(BUILD_TARGET))