From d76c40e9816abd917e60c93521b0e2fb6ddf9538 Mon Sep 17 00:00:00 2001 From: mat <26722564+matcool@users.noreply.github.com> Date: Mon, 25 Dec 2023 10:45:53 -0300 Subject: [PATCH] set mod suffix properly based on platform --- cmake/GeodeFile.cmake | 4 +++- cmake/Platform.cmake | 7 +++++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/cmake/GeodeFile.cmake b/cmake/GeodeFile.cmake index 0aa77ec2..dd9230a3 100644 --- a/cmake/GeodeFile.cmake +++ b/cmake/GeodeFile.cmake @@ -216,8 +216,10 @@ function(setup_geode_mod proname) # Add package target + make output name the mod id set_target_properties(${proname} PROPERTIES PREFIX "") + if (DEFINED GEODE_MOD_BINARY_SUFFIX) + set_target_properties(${proname} PROPERTIES SUFFIX ${GEODE_MOD_BINARY_SUFFIX}) + endif() set_target_properties(${proname} PROPERTIES OUTPUT_NAME ${MOD_ID}) - endfunction() function(create_geode_file proname) diff --git a/cmake/Platform.cmake b/cmake/Platform.cmake index 48407115..6b58e50c 100644 --- a/cmake/Platform.cmake +++ b/cmake/Platform.cmake @@ -31,6 +31,7 @@ if (GEODE_TARGET_PLATFORM STREQUAL "iOS") set(GEODE_OUTPUT_NAME "GeodeIOS") set(GEODE_PLATFORM_BINARY "GeodeIOS.dylib") + set(GEODE_MOD_BINARY_SUFFIX ".dylib" CACHE STRING "" FORCE) elseif (GEODE_TARGET_PLATFORM STREQUAL "MacOS") set_target_properties(${PROJECT_NAME} PROPERTIES SYSTEM_NAME MacOS @@ -62,7 +63,7 @@ elseif (GEODE_TARGET_PLATFORM STREQUAL "MacOS") set(GEODE_OUTPUT_NAME "Geode") set(GEODE_PLATFORM_BINARY "Geode.dylib") - + set(GEODE_MOD_BINARY_SUFFIX ".ios.dylib" CACHE STRING "" FORCE) elseif (GEODE_TARGET_PLATFORM STREQUAL "Win32") set_target_properties(${PROJECT_NAME} PROPERTIES SYSTEM_NAME Win32 @@ -83,6 +84,7 @@ elseif (GEODE_TARGET_PLATFORM STREQUAL "Win32") # Windows links against .lib and not .dll set(GEODE_OUTPUT_NAME "Geode") set(GEODE_PLATFORM_BINARY "Geode.lib") + set(GEODE_MOD_BINARY_SUFFIX ".dll" CACHE STRING "" FORCE) elseif (GEODE_TARGET_PLATFORM STREQUAL "Android32") set_target_properties(${PROJECT_NAME} PROPERTIES SYSTEM_NAME Android @@ -98,7 +100,7 @@ elseif (GEODE_TARGET_PLATFORM STREQUAL "Android32") set(GEODE_OUTPUT_NAME "Geode.armeabi-v7a") set(GEODE_PLATFORM_BINARY "Geode.armeabi-v7a.so") - + set(GEODE_MOD_BINARY_SUFFIX ".v7.so" CACHE STRING "" FORCE) elseif (GEODE_TARGET_PLATFORM STREQUAL "Android64") set_target_properties(${PROJECT_NAME} PROPERTIES SYSTEM_NAME Android @@ -114,6 +116,7 @@ elseif (GEODE_TARGET_PLATFORM STREQUAL "Android64") set(GEODE_OUTPUT_NAME "Geode.arm64-v8a") set(GEODE_PLATFORM_BINARY "Geode.arm64-v8a.so") + set(GEODE_MOD_BINARY_SUFFIX ".v8.so" CACHE STRING "" FORCE) else() message(FATAL_ERROR "Unknown platform ${GEODE_TARGET_PLATFORM}") endif()