Merge pull request #3331 from Sonicadvance1/move_irloader

Tools: Moves IRLoader to independent folder

Source/Tools/CMakeLists.txt

@@ -18,6 +18,11 @@ if (NOT MINGW_BUILD)
   add_subdirectory(FEXServer/)
   add_subdirectory(FEXBash/)
   add_subdirectory(CodeSizeValidation/)
+  add_subdirectory(LinuxEmulation/)
+
+  if (BUILD_TESTS)
+    add_subdirectory(IRLoader/)
+  endif()
 endif()
 
 add_subdirectory(FEXLoader/)

Source/Tools/FEXLoader/CMakeLists.txt

@@ -6,8 +6,6 @@ if (ENABLE_VIXL_SIMULATOR)
 endif()
 
 if (NOT MINGW_BUILD)
-  add_subdirectory(LinuxSyscalls)
-
   if (TERMUX_BUILD)
     # Termux needs android-shmem to get the shm emulation library.
     list(APPEND LIBS android-shmem)
@@ -16,7 +14,6 @@ if (NOT MINGW_BUILD)
   function(GenerateInterpreter NAME AsInterpreter)
     add_executable(${NAME}
       FEXLoader.cpp
-      VDSO_Emulation.cpp
       AOT/AOTGenerator.cpp)
 
     target_compile_definitions(${NAME} PRIVATE ${DEFINES})
@@ -181,24 +178,4 @@ if (BUILD_TESTS)
       ${LIBS}
       ${PTHREAD_LIB}
   )
-
-  if (NOT MINGW_BUILD)
-    add_executable(IRLoader
-      IRLoader.cpp
-    )
-    target_compile_definitions(IRLoader PRIVATE ${DEFINES})
-
-    target_include_directories(IRLoader
-      PRIVATE
-        ${CMAKE_CURRENT_SOURCE_DIR}/Source/
-        ${CMAKE_BINARY_DIR}/generated
-    )
-    target_link_libraries(IRLoader
-      PRIVATE
-        ${LIBS}
-        LinuxEmulation
-        ${PTHREAD_LIB}
-        fmt::fmt
-    )
-  endif()
 endif()

Source/Tools/IRLoader/CMakeLists.txt

@@ -0,0 +1,23 @@
+list(APPEND LIBS FEXCore Common)
+
+add_executable(IRLoader
+  IRLoader.cpp
+)
+
+if (ENABLE_VIXL_SIMULATOR)
+  target_compile_definitions(IRLoader PRIVATE "-DVIXL_SIMULATOR=1")
+endif()
+
+target_include_directories(IRLoader
+  PRIVATE
+    ${CMAKE_CURRENT_SOURCE_DIR}/Source/
+    ${CMAKE_BINARY_DIR}/generated
+)
+target_link_libraries(IRLoader
+  PRIVATE
+    ${LIBS}
+    LinuxEmulation
+    CommonTools
+    ${PTHREAD_LIB}
+    fmt::fmt
+)