Emulator-Archive/melonds-ds
1
0
Fork 0
mirror of https://github.com/JesseTG/melonds-ds.git synced 2024-11-23 06:29:46 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Simplify library naming

Browse Source
This commit is contained in:
Jesse Talavera-Greenberg 2023-11-02 10:25:11 -04:00
parent 218e091c3b
commit 891c37627e
3 changed files with 3 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
.github/workflows/build.yaml vendored
View File

@ -35,11 +35,6 @@ on:
type: string
required: false
default: "build/dist"
lib-name:
description: The name of the library to build.
type: string
required: false
default: melondsds_libretro
lib-ext:
description: The extension of the library to build.
type: string
@ -108,8 +103,8 @@ jobs:
INFO_PATH: "${{ env.DIST_DIR }}/${{ inputs.info-dir }}"
run: |
mkdir -vp "$CORES_PATH" "$INFO_PATH"
cp -f "${{ env.BUILD_DIR }}/src/libretro/${{ inputs.lib-name }}.${{ inputs.lib-ext }}" "$CORES_PATH"
cp -f "${{ github.workspace }}/melondsds_libretro.info" "$INFO_PATH/${{ inputs.lib-name }}.info"
cp -f "${{ env.BUILD_DIR }}/src/libretro/melondsds_libretro.${{ inputs.lib-ext }}" "$CORES_PATH"
cp -f "${{ github.workspace }}/melondsds_libretro.info" "$INFO_PATH/melondsds_libretro.info"
- name: Upload Artifact
uses: actions/upload-artifact@v3

2
.github/workflows/main.yaml vendored
View File

@ -61,7 +61,6 @@ jobs:
lib-ext: so
target: android
archive-name: melondsds_libretro-android
lib-name: melondsds_libretro
cmake-args: -DENABLE_OGLRENDERER=OFF -DANDROID_ABI=arm64-v8a -DANDROID_PLATFORM=24 -DCMAKE_TOOLCHAIN_FILE="$ANDROID_NDK/build/cmake/android.toolchain.cmake"
runs-on: ubuntu-latest
# Disabled OpenGL on Android due to https://github.com/JesseTG/melonds-ds/issues/23
@ -75,7 +74,6 @@ jobs:
archive-name: melondsds_libretro-ios
info-dir: info
lib-ext: dylib
lib-name: melondsds_libretro_ios
cmake-args: -DENABLE_OGLRENDERER=OFF -DENABLE_JIT=OFF --toolchain ./cmake/toolchain/ios.toolchain.cmake -DPLATFORM=OS64 -DCMAKE_OSX_DEPLOYMENT_TARGET:STRING=13.0 -DDEPLOYMENT_TARGET=14 -DENABLE_STRICT_TRY_COMPILE_INT:BOOL=ON
# Disabled OpenGL on iOS due to https://github.com/JesseTG/melonds-ds/issues/23

11
src/libretro/CMakeLists.txt
View File

@ -181,16 +181,7 @@ if (ENABLE_JIT)
endif ()
# libretro cores do not start with "lib"
set_target_properties(libretro PROPERTIES PREFIX "")
# Most platforms use the name "<core name>_libretro", but a few have their own conventions
if(CMAKE_SYSTEM_NAME STREQUAL "tvOS")
set_target_properties(libretro PROPERTIES OUTPUT_NAME "melondsds_libretro_tvos")
elseif(IOS)
set_target_properties(libretro PROPERTIES OUTPUT_NAME "melondsds_libretro_ios")
else()
set_target_properties(libretro PROPERTIES OUTPUT_NAME "melondsds_libretro")
endif()
set_target_properties(libretro PROPERTIES PREFIX "" OUTPUT_NAME "melondsds_libretro")
# Some platforms or compilers don't use the expected suffixes for shared libraries
if (APPLE)