Xargon/Duckstation
1
0
Fork 0
mirror of https://github.com/RetroDECK/Duckstation.git synced 2025-03-06 14:27:44 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

CMake: Fix Android native library build

Browse source
This commit is contained in:
Connor McLaughlin 2021-05-23 18:00:57 +10:00
parent 70396621e8
commit c9029a88c7
2 changed files with 5 additions and 4 deletions

5
scripts/build_libretro_cores.sh
View file

@ -8,6 +8,7 @@ make_build() {
PLATFORM=$1 PLATFORM=$1
OPTIONS=$2 OPTIONS=$2
SUFFIX=$3 SUFFIX=$3
ZIPFILE=../duckstation_libretro_${PLATFORM}.zip
echo Building for ${PLATFORM}... echo Building for ${PLATFORM}...
@ -19,8 +20,8 @@ make_build() {
cmake -G Ninja -DCMAKE_BUILD_TYPE=Release -DBUILD_LIBRETRO_CORE=ON $OPTIONS $ROOTDIR cmake -G Ninja -DCMAKE_BUILD_TYPE=Release -DBUILD_LIBRETRO_CORE=ON $OPTIONS $ROOTDIR
ninja ninja
rm -f ../duckstation_${PLATFORM}.zip rm -f $ZIPFILE
zip -j ../duckstation_${PLATFORM}.zip duckstation_libretro${SUFFIX}.so zip -j $ZIPFILE duckstation_libretro${SUFFIX}.so
cd .. cd ..
} }

4
src/CMakeLists.txt
View file

@ -6,11 +6,11 @@ add_subdirectory(common)
add_subdirectory(core) add_subdirectory(core)
add_subdirectory(scmversion) add_subdirectory(scmversion)
if(BUILD_NOGUI_FRONTEND OR BUILD_QT_FRONTEND) if(NOT BUILD_LIBRETRO_CORE)
add_subdirectory(frontend-common) add_subdirectory(frontend-common)
endif() endif()
if(NOT BUILD_LIBRETRO_CORE) if(NOT BUILD_LIBRETRO_CORE AND NOT ANDROID)
add_subdirectory(common-tests) add_subdirectory(common-tests)
if(WIN32) if(WIN32)
add_subdirectory(updater) add_subdirectory(updater)