cmake: move ps2 cmake toolchain to subdirectory of ps2

.github/workflows/build-cmake-conan.yml

@@ -59,10 +59,10 @@ jobs:
           fi
       - name: "Export Playstation 2 CMake toolchain conan recipe"
         run: |
-          conan export cmake/ps2toolchain ps2dev-cmaketoolchain/master@
+          conan export cmake/ps2/cmaketoolchain ps2dev-cmaketoolchain/master@
       - name: "Download/build dependencies (conan install)"
         run: |
-          conan install ${{ github.workspace }} librw/master@ -if build -o librw:platform=${{ matrix.platform }} -o librw:gl3_gfxlib=${{ matrix.gl3_gfxlib}} --build missing -pr:h ./host_profile -pr:b default
+          conan install ${{ github.workspace }} librw/master@ -if build -o librw:platform=${{ matrix.platform }} -o librw:gl3_gfxlib=${{ matrix.gl3_gfxlib }} --build missing -pr:h ./host_profile -pr:b default
         env:
           CONAN_SYSREQUIRES_MODE: enabled
       - name: "Build librw (conan build)"

CMakeLists.txt

@@ -84,7 +84,7 @@ if(LIBRW_INSTALL)
     endif()
     if(NINTENDO_SWITCH)
         install(
-            FILES "${CMAKE_CURRENT_LIST_DIR}/cmake/nxtoolchain/FindNXGL.cmake"
+            FILES "${CMAKE_CURRENT_LIST_DIR}/cmake/nx/FindNXGL.cmake"
             DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake"
         )
     endif()

cmake/ps2/cmaketoolchain/conanfile.py

@@ -18,4 +18,7 @@ class Ps2devCMakeToolchainConan(ConanFile):
 
     def package_info(self):
         self.user_info.cmake_dir = os.path.join(self.package_folder, "cmake").replace("\\", "/")
-        self.user_info.cmake_toolchain_file = os.path.join(self.package_folder, "cmake", "cmaketoolchain.cmake").replace("\\", "/")
+
+        cmake_toolchain_file = os.path.join(self.package_folder, "cmake", "toolchain_ps2_ee.cmake").replace("\\", "/")
+        self.user_info.cmake_toolchain_file = cmake_toolchain_file
+        self.cpp_info.CONAN_CMAKE_TOOLCHAIN_FILE = cmake_toolchain_file

cmake/ps2/cmaketoolchain/toolchain_ps2_ee.cmake

@@ -45,7 +45,7 @@ set(CMAKE_C_FLAGS_INIT "-G0 -fno-common -I\"${PS2SDK}/ee/include\" -I\"${PS2SDK}
 set(CMAKE_CXX_FLAGS_INIT "-G0 -fno-common -I\"${PS2SDK}/ee/include\" -I\"${PS2SDK}/common/include\"")
 set(CMAKE_EXE_LINKER_FLAGS_INIT "-G0 -L\"${PS2SDK}/ee/lib\" -Wl,-r -Wl,-d")
 
-set(CMAKE_FIND_ROOT_PATH "${PS2DEV}/ee;${PS2SDK}/ee")
+set(CMAKE_FIND_ROOT_PATH "${PS2DEV}/ee" "${PS2SDK}/ee")
 set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
 set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
 set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
@@ -53,9 +53,19 @@ set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
 set(PS2 1)
 set(EE 1)
 
-function(add_erl_executable OUTFILE TARGET)
-    get_property(output_dir TARGET ${TARGET} PROPERTY RUNTIME_OUTPUT_DIRECTORY)
-    set(outfile "${output_dir}/${TARGET}.erl")
+set(CMAKE_EXECUTABLE_SUFFIX ".elf")
+
+function(add_erl_executable TARGET)
+    cmake_parse_arguments("AEE" "" "OUTPUT_VAR" "" ${ARGN})
+
+    get_target_property(output_dir ${TARGET} RUNTIME_OUTPUT_DIRECTORY)
+
+    get_target_property(output_name ${TARGET} OUTPUT_NAME)
+    if(NOT output_name)
+        set(output_name ${TARGET})
+    endif()
+    set(outfile "${output_dir}/${output_name}.erl")
+
     add_custom_command(OUTPUT "${outfile}"
         COMMAND "${CMAKE_COMMAND}" -E copy  "$<TARGET_FILE:${TARGET}>" "${outfile}"
         COMMAND "${CMAKE_STRIP}" --strip-unneeded -R .mdebug.eabi64 -R .reginfo -R .comment "${outfile}"
@@ -64,5 +74,8 @@ function(add_erl_executable OUTFILE TARGET)
     add_custom_target("${TARGET}_erl" ALL
         DEPENDS "${outfile}"
     )
-    set("${OUTFILE}" "${outfile}" PARENT_SCOPE)
+
+    if(AEE_OUTPUT_VAR)
+        set("${AEE_OUTPUT_VAR}" "${outfile}" PARENT_SCOPE)
+    endif()
 endfunction()

cmake/ps2toolchain/toolchain_ps2_ee.cmake

@@ -1,60 +0,0 @@
-cmake_minimum_required(VERSION 3.7)
-
-list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}")
-
-set(CMAKE_SYSTEM_NAME "PlayStation2")
-set(CMAKE_SYSTEM_PROCESSOR "mipsel")
-set(CMAKE_SYSTEM_VERSION 1)
-
-set(CMAKE_POSITION_INDEPENDENT_CODE ON)
-
-set(CMAKE_NO_SYSTEM_FROM_IMPORTED ON)
-
-set(CMAKE_TRY_COMPILE_TARGET_TYPE STATIC_LIBRARY)
-
-if(NOT DEFINED ENV{PS2DEV})
-    message(FATAL_ERROR "Need environment variable PS2DEV set")
-endif()
-if(NOT DEFINED ENV{PS2SDK})
-    message(FATAL_ERROR "Need environment variable PS2SDK set")
-endif()
-set(PS2DEV "$ENV{PS2DEV}")
-set(PS2SDK "$ENV{PS2SDK}")
-
-set(CMAKE_DSM_SOURCE_FILE_EXTENSIONS "dsm")
-
-set(CMAKE_C_COMPILER "${PS2DEV}/ee/bin/ee-gcc")
-set(CMAKE_CXX_COMPILER "${PS2DEV}/ee/bin/ee-g++")
-set(CMAKE_ASM_COMPILER "${PS2DEV}/ee/bin/ee-g++")
-set(CMAKE_DSM_COMPILER "${PS2DEV}/dvp/bin/dvp-as")
-set(CMAKE_AR "${PS2DEV}/ee/bin/ee-ar" CACHE FILEPATH "archiver")
-set(CMAKE_LINKER "${PS2DEV}/ee/bin/ee-ld")
-set(CMAKE_RANLIB "${PS2DEV}/ee/bin/ee-ranlib" CACHE FILEPATH "ranlib")
-set(CMAKE_STRIP "${PS2DEV}/ee/bin/ee-strip" CACHE FILEPATH "strip")
-
-set(CMAKE_ASM_FLAGS_INIT "-G0 -I\"${PS2SDK}/ee/include\" -I\"${PS2SDK}/common/include\"")
-set(CMAKE_C_FLAGS_INIT "-G0 -fno-common -I\"${PS2SDK}/ee/include\" -I\"${PS2SDK}/common/include\"")
-set(CMAKE_CXX_FLAGS_INIT "-G0 -fno-common -I\"${PS2SDK}/ee/include\" -I\"${PS2SDK}/common/include\"")
-set(CMAKE_EXE_LINKER_FLAGS_INIT "-G0 -L\"${PS2SDK}/ee/lib\" -Wl,-r -Wl,-d")
-
-set(CMAKE_FIND_ROOT_PATH "${PS2DEV}/ee;${PS2SDK}/ee")
-set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
-set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
-set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
-
-set(PS2 1)
-set(EE 1)
-
-function(add_erl_executable OUTFILE TARGET)
-    get_property(output_dir TARGET ${TARGET} PROPERTY RUNTIME_OUTPUT_DIRECTORY)
-    set(outfile "${output_dir}/${TARGET}.erl")
-    add_custom_command(OUTPUT "${outfile}"
-        COMMAND "${CMAKE_COMMAND}" -E copy  "$<TARGET_FILE:${TARGET}>" "${outfile}"
-        COMMAND "${CMAKE_STRIP}" --strip-unneeded -R .mdebug.eabi64 -R .reginfo -R .comment "${outfile}"
-        DEPENDS ${TARGET}
-    )
-    add_custom_target("${TARGET}_erl" ALL
-        DEPENDS "${outfile}"
-    )
-    set("${OUTFILE}" "${outfile}" PARENT_SCOPE)
-endfunction()