[WOW64] Moved things around for the future (#2712)

11 files changed, 10 insertions, 10 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2bfc2a59..b41929ed 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1341,9 +1341,9 @@ if(WOW64 AND ARM_DYNAREC)
     include(ExternalProject)
     ExternalProject_Add(
         wowbox64
-        SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/wow64"
+        SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/wine/wow64"
         CMAKE_ARGS 
-            -DCMAKE_TOOLCHAIN_FILE=${CMAKE_CURRENT_SOURCE_DIR}/wow64/toolchain_mingw.cmake
+            -DCMAKE_TOOLCHAIN_FILE=${CMAKE_CURRENT_SOURCE_DIR}/wine/toolchain_mingw.cmake
             -DDYNAREC_PASS_STR=${DYNAREC_PASS_STR}
             -DDYNAREC_ASM_STR=${DYNAREC_ASM_STR}
             -DINTERPRETER_STR=${INTERPRETER_STR}
diff --git a/wow64/crt.c b/wine/common/crt.c
index a9b691d2..a9b691d2 100644
--- a/wow64/crt.c
+++ b/wine/common/crt.c
diff --git a/wow64/include/wine/compiler.h b/wine/include/wine/compiler.h
index f206c40d..f206c40d 100644
--- a/wow64/include/wine/compiler.h
+++ b/wine/include/wine/compiler.h
diff --git a/wow64/include/wine/debug.h b/wine/include/wine/debug.h
index e903d604..e903d604 100644
--- a/wow64/include/wine/debug.h
+++ b/wine/include/wine/debug.h
diff --git a/wow64/ntdll.def b/wine/ntdll.def
index ef76c99a..ef76c99a 100644
--- a/wow64/ntdll.def
+++ b/wine/ntdll.def
diff --git a/wow64/override_wine_builtin.py b/wine/override_wine_builtin.py
index ee95e958..ee95e958 100755
--- a/wow64/override_wine_builtin.py
+++ b/wine/override_wine_builtin.py
diff --git a/wow64/toolchain_mingw.cmake b/wine/toolchain_mingw.cmake
index 0df2c964..0df2c964 100644
--- a/wow64/toolchain_mingw.cmake
+++ b/wine/toolchain_mingw.cmake
diff --git a/wow64/wow64.def b/wine/wow64.def
index 31088e79..31088e79 100644
--- a/wow64/wow64.def
+++ b/wine/wow64.def
diff --git a/wow64/CMakeLists.txt b/wine/wow64/CMakeLists.txt
index 73fdc4f0..86da91c5 100644
--- a/wow64/CMakeLists.txt
+++ b/wine/wow64/CMakeLists.txt
@@ -17,15 +17,15 @@ else()
     set(PYTHON_EXECUTABLE ${Python3_EXECUTABLE} CACHE INTERNAL "The Python3 executable" FORCE)
 endif()
 
-set(BOX64_ROOT "${CMAKE_SOURCE_DIR}/..")
+set(BOX64_ROOT "${CMAKE_SOURCE_DIR}/../..")
 
 string(REPLACE "," ";" DYNAREC_ASM "${DYNAREC_ASM_STR}")
 string(REPLACE "," ";" DYNAREC_PASS "${DYNAREC_PASS_STR}")
 string(REPLACE "," ";" INTERPRETER "${INTERPRETER_STR}")
 
 set(WOW64_MAIN_SRC
-    "${BOX64_ROOT}/wow64/crt.c"
-    "${BOX64_ROOT}/wow64/wowbox64.c"
+    "${BOX64_ROOT}/wine/common/crt.c"
+    "${BOX64_ROOT}/wine/wow64/wowbox64.c"
 )
 
 set(MUSL_SRC
@@ -101,12 +101,12 @@ add_library(wowbox64 SHARED ${WOW64_MAIN_SRC} ${MUSL_SRC} ${WOW64_BOX64CPU_SRC}
     $<TARGET_OBJECTS:wow64_dynarec_pass2>
     $<TARGET_OBJECTS:wow64_dynarec_pass3>
     $<TARGET_OBJECTS:wow64_test_interpreter>
-    "${BOX64_ROOT}/wow64/wowbox64.def")
+    "${BOX64_ROOT}/wine/wow64/wowbox64.def")
 
 include_directories(
     "${BOX64_ROOT}/src/include"
     "${BOX64_ROOT}/src"
-    "${BOX64_ROOT}/wow64/include"
+    "${BOX64_ROOT}/wine/include"
     "${BOX64_ROOT}/external/musl"
     "${BOX64_ROOT}/external/musl/internal"
 )
@@ -118,10 +118,10 @@ function(import_dll name)
         OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${name}.a
         COMMAND ${DLLTOOL} 
             -D ${name}.dll
-            -d ${BOX64_ROOT}/wow64/${name}.def
+            -d ${BOX64_ROOT}/wine/${name}.def
             -l ${CMAKE_CURRENT_BINARY_DIR}/${name}.a
             -k
-        DEPENDS ${BOX64_ROOT}/wow64/${name}.def
+        DEPENDS ${BOX64_ROOT}/wine/${name}.def
         COMMENT "Generating import library ${name}.a from ${name}.def"
     )
     add_custom_target(generate_${name}_import_lib DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/${name}.a)
@@ -145,7 +145,7 @@ set_target_properties(wowbox64 PROPERTIES
 
 add_custom_command(
     TARGET wowbox64 POST_BUILD
-    COMMAND "${PYTHON_EXECUTABLE}" ${CMAKE_SOURCE_DIR}/override_wine_builtin.py $<TARGET_FILE:wowbox64>
+    COMMAND "${PYTHON_EXECUTABLE}" ${CMAKE_SOURCE_DIR}/../override_wine_builtin.py $<TARGET_FILE:wowbox64>
 )
 
 set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
diff --git a/wow64/wowbox64.c b/wine/wow64/wowbox64.c
index 141b534f..141b534f 100644
--- a/wow64/wowbox64.c
+++ b/wine/wow64/wowbox64.c
diff --git a/wow64/wowbox64.def b/wine/wow64/wowbox64.def
index dd1d0dc2..dd1d0dc2 100644
--- a/wow64/wowbox64.def
+++ b/wine/wow64/wowbox64.def