Changeset 5423 in vbox for trunk/src

Timestamp:

Oct 21, 2007 9:08:50 PM (17 years ago)

Author:

vboxsync

Message:

Merged the win32 and win64 directories.

Location:

trunk/src/VBox/Runtime

Files:

• Makefile.kmk (modified) (4 diffs)
• win (moved) (moved from trunk/src/VBox/Runtime/win32 )
• win/amd64 (moved) (moved from trunk/src/VBox/Runtime/win64 )

trunk/src/VBox/Runtime/Makefile.kmk

@@ -77 +77 @@
 #
 RuntimeWin64ASM_SOURCES = \
-        win64/ASMAtomicBitClear.asm \
-        win64/ASMAtomicBitTestAndToggle.asm \
-        win64/ASMAtomicBitToggle.asm \
-        win64/ASMAtomicReadU64.asm \
-        win64/ASMAtomicXchgU16.asm \
-        win64/ASMAtomicXchgU8.asm \
-        win64/ASMBitFirstClear.asm \
-        win64/ASMBitFirstSet.asm \
-        win64/ASMGetCS.asm \
-        win64/ASMGetDS.asm \
-        win64/ASMGetES.asm \
-        win64/ASMGetFlags.asm \
-        win64/ASMGetFS.asm \
-        win64/ASMGetGS.asm \
-        win64/ASMGetIDTR.asm \
-        win64/ASMGetGDTR.asm \
-        win64/ASMGetTR.asm \
-        win64/ASMGetSS.asm \
-        win64/ASMProbeReadByte.asm \
-        win64/ASMSetFlags.asm \
-        win64/ASMGetDR0.asm \
-        win64/ASMGetDR1.asm \
-        win64/ASMGetDR2.asm \
-        win64/ASMGetDR3.asm \
-        win64/ASMGetDR6.asm \
-        win64/ASMGetDR7.asm \
-        win64/ASMMultU64ByU32DivByU32.asm \
+        win/amd64/ASMAtomicBitClear.asm \
+        win/amd64/ASMAtomicBitTestAndToggle.asm \
+        win/amd64/ASMAtomicBitToggle.asm \
+        win/amd64/ASMAtomicReadU64.asm \
+        win/amd64/ASMAtomicXchgU16.asm \
+        win/amd64/ASMAtomicXchgU8.asm \
+        win/amd64/ASMBitFirstClear.asm \
+        win/amd64/ASMBitFirstSet.asm \
+        win/amd64/ASMGetCS.asm \
+        win/amd64/ASMGetDS.asm \
+        win/amd64/ASMGetES.asm \
+        win/amd64/ASMGetFlags.asm \
+        win/amd64/ASMGetFS.asm \
+        win/amd64/ASMGetGS.asm \
+        win/amd64/ASMGetIDTR.asm \
+        win/amd64/ASMGetGDTR.asm \
+        win/amd64/ASMGetTR.asm \
+        win/amd64/ASMGetSS.asm \
+        win/amd64/ASMProbeReadByte.asm \
+        win/amd64/ASMSetFlags.asm \
+        win/amd64/ASMGetDR0.asm \
+        win/amd64/ASMGetDR1.asm \
+        win/amd64/ASMGetDR2.asm \
+        win/amd64/ASMGetDR3.asm \
+        win/amd64/ASMGetDR6.asm \
+        win/amd64/ASMGetDR7.asm \
+        win/amd64/ASMMultU64ByU32DivByU32.asm \
 
 #
@@ -241 +241 @@
         generic/rand-stubs-generic.cpp \
         nt/RTErrConvertFromNtStatus.cpp \
-        win32/errmsgwin.cpp \
+        win/errmsgwin.cpp \
         r3/posix/env-posix.cpp \
         r3/win32/alloc-win32.cpp \
@@ -261 +261 @@
         r3/win32/uuid-win32.cpp \
         common/time/timesup.cpp \
-        win32/RTErrConvertFromWin32.cpp
+        win/RTErrConvertFromWin32.cpp
 
 RuntimeR3_SOURCES.win.amd64 = \
@@ -1052 +1052 @@
 common/err/errmsg.cpp_INCS = $(PATH_TARGET)
 
-win32/errmsgwin.cpp_DEPS = $(PATH_TARGET)/errmsgcomdata.h
-win32/errmsgwin.cpp_INCS = $(PATH_TARGET)
+win/errmsgwin.cpp_DEPS = $(PATH_TARGET)/errmsgcomdata.h
+win/errmsgwin.cpp_INCS = $(PATH_TARGET)