Merge pull request #3123 from Sonicadvance1/spdx_fex_linux

FEX: Moves Linux utils and adds spdx

Source/CMakeLists.txt

@@ -1,6 +1,2 @@
 add_subdirectory(Common/)
 add_subdirectory(Tools/)
-
-if (NOT MINGW_BUILD)
-  add_subdirectory(Linux/)
-endif()

Source/Linux/CMakeLists.txt

@@ -1,10 +0,0 @@
-set (SRCS
-  Utils/ELFContainer.cpp
-  Utils/ELFSymbolDatabase.cpp
-  )
-
-add_library(FEX_Utils OBJECT ${SRCS})
-target_link_libraries(FEX_Utils FEXCore)
-
-target_include_directories(FEX_Utils PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/Source/)
-target_include_directories(FEX_Utils PRIVATE ${CMAKE_BINARY_DIR}/generated)

Source/Tools/CommonTools/CMakeLists.txt

@@ -1,6 +1,14 @@
 set(NAME CommonTools)
 set(SRCS
-  DummyHandlers.cpp)
+  DummyHandlers.cpp
+  )
+
+if (NOT MINGW_BUILD)
+  list(APPEND SRCS
+  Linux/Utils/ELFContainer.cpp
+  Linux/Utils/ELFSymbolDatabase.cpp
+  )
+endif()
 
 add_library(${NAME} STATIC ${SRCS})
 target_link_libraries(${NAME} FEXCore_Base FEXHeaderUtils)

Source/Tools/CommonTools/Linux/Utils/ELFContainer.cpp

@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: MIT
 /*
 $info$
 tags: glue|elf-parsing

Source/Tools/CommonTools/Linux/Utils/ELFContainer.h

@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: MIT
 #pragma once
 
 #include <FEXCore/fextl/map.h>

Source/Tools/CommonTools/Linux/Utils/ELFParser.h

@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: MIT
 #pragma once
 #include <FEXCore/Utils/LogManager.h>
 #include <FEXCore/fextl/string.h>

Source/Tools/CommonTools/Linux/Utils/ELFSymbolDatabase.cpp

@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: MIT
 /*
 $info$
 tags: glue|elf-parsing

Source/Tools/CommonTools/Linux/Utils/ELFSymbolDatabase.h

@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: MIT
 #pragma once
 
 #include <FEXCore/fextl/map.h>

Source/Tools/FEXLoader/CMakeLists.txt

@@ -26,6 +26,7 @@ if (NOT MINGW_BUILD)
       PRIVATE
         ${LIBS}
         LinuxEmulation
+        CommonTools
         ${PTHREAD_LIB}
         fmt::fmt
     )

Source/Tools/FEXLoader/LinuxSyscalls/CMakeLists.txt

@@ -87,7 +87,7 @@ target_link_libraries(LinuxEmulation
 PRIVATE
   Common
   FEXCore
-  FEX_Utils
+  CommonTools
 )
 
 set(HEADERS_TO_VERIFY