PonyMirrors/libsuperderpy
1
0
Fork 0
mirror of https://gitlab.com/dosowisko.net/libsuperderpy.git synced 2024-12-05 00:38:00 +01:00
Code Issues Projects Releases Packages Wiki Activity

Don't install data file overrides of unrelated platforms

Browse source
This commit is contained in:
Sebastian Krzyszkowiak 2022-07-28 21:39:55 +02:00
parent dd35960724
commit 901d43a520
No known key found for this signature in database
GPG key ID: E8F235CF3BDBC3FF
3 changed files with 86 additions and 76 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
cmake/libsuperderpy-data.cmake
View file

@ -30,7 +30,26 @@ install(DIRECTORY . DESTINATION ${DATADIR}
PATTERN ".gitignore" EXCLUDE
PATTERN ".directory" EXCLUDE
PATTERN "CMakeLists.txt" EXCLUDE
REGEX "${DATA_EXCLUDE_REGEX}" EXCLUDE)
PATTERN "android" EXCLUDE
PATTERN "maemo5" EXCLUDE
PATTERN "pocketchip" EXCLUDE
PATTERN "raspberrypi" EXCLUDE
PATTERN "steamlink" EXCLUDE
PATTERN "emscripten" EXCLUDE
PATTERN "vita" EXCLUDE
REGEX "${DATA_EXCLUDE_REGEX}" EXCLUDE
)
if (LIBSUPERDERPY_PLATFORM_OVERRIDE)
if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/${LIBSUPERDERPY_PLATFORM_OVERRIDE}")
install(DIRECTORY "${LIBSUPERDERPY_PLATFORM_OVERRIDE}/" DESTINATION ${DATADIR}
PATTERN ".git" EXCLUDE
PATTERN ".gitignore" EXCLUDE
PATTERN ".directory" EXCLUDE
REGEX "${DATA_EXCLUDE_REGEX}" EXCLUDE
)
endif()
endif()
file(GLOB_RECURSE RES_FILES CONFIGURE_DEPENDS *)
add_custom_target(data SOURCES ${RES_FILES})

75
cmake/libsuperderpy.cmake
View file

@ -223,20 +223,28 @@ if (NOT LIBSUPERDERPY_CONFIG_INCLUDED)
if(MAEMO5)
add_definitions(-DMAEMO5=1)
add_definitions(-D_Noreturn=)
set(LIBSUPERDERPY_PLATFORM_OVERRIDE "maemo5")
endif(MAEMO5)
if(POCKETCHIP)
add_definitions(-DPOCKETCHIP=1)
set(LIBSUPERDERPY_PLATFORM_OVERRIDE "pocketchip")
endif(POCKETCHIP)
if(RASPBERRYPI)
add_definitions(-DRASPBERRYPI=1)
set(LIBSUPERDERPY_PLATFORM_OVERRIDE "raspberrypi")
endif(RASPBERRYPI)
if(VITA)
add_definitions(-DLIBSUPERDERPY_VITA_HEAP_SIZE=${VITA_HEAP_SIZE})
set(LIBSUPERDERPY_PLATFORM_OVERRIDE "vita")
endif(VITA)
if(STEAMLINK)
set(LIBSUPERDERPY_PLATFORM_OVERRIDE "steamlink")
endif(STEAMLINK)
if(MAEMO5 OR POCKETCHIP)
add_definitions(-DLIBSUPERDERPY_EMULATE_TOUCH=1)
endif(MAEMO5 OR POCKETCHIP)
@ -279,6 +287,8 @@ if (NOT LIBSUPERDERPY_CONFIG_INCLUDED)
set(CMAKE_INSTALL_RPATH "\$ORIGIN/../${LIB_DIR}/${LIBSUPERDERPY_GAMENAME}:\$ORIGIN/gamestates:\$ORIGIN:\$ORIGIN/../${LIB_DIR}:\$ORIGIN/${LIB_DIR}:\$ORIGIN/${BIN_DIR}")
if(EMSCRIPTEN)
set(LIBSUPERDERPY_PLATFORM_OVERRIDE "emscripten")
set(CMAKE_EXECUTABLE_SUFFIX ".bc")
set(CMAKE_SHARED_LIBRARY_SUFFIX ".so")
@ -584,8 +594,10 @@ if (NOT LIBSUPERDERPY_CONFIG_INCLUDED)
set(ANDROID_TARGET "android-30" CACHE STRING "What Android target to compile for.")
STRING(REGEX REPLACE "^android-" "" ANDROID_TARGET_VERSION ${ANDROID_TARGET})
set(LIBSUPERDERPY_PLATFORM_OVERRIDE "android")
file(REMOVE_RECURSE "${CMAKE_BINARY_DIR}/android")
file(COPY "${LIBSUPERDERPY_DIR}/android" DESTINATION "${CMAKE_BINARY_DIR}")
file(INSTALL "${LIBSUPERDERPY_DIR}/android" DESTINATION "${CMAKE_BINARY_DIR}")
MACRO(configure_android_file PATH)
configure_file("${CMAKE_BINARY_DIR}/android/${PATH}.in" "${CMAKE_BINARY_DIR}/android/${PATH}" ${ARGN})
@ -613,20 +625,37 @@ if (NOT LIBSUPERDERPY_CONFIG_INCLUDED)
endif()
configure_android_file("app/src/main/java/net/dosowisko/libsuperderpy/Activity.java")
file(COPY ${Allegro5_LIBS} DESTINATION ${LIBRARY_OUTPUT_PATH})
file(INSTALL ${Allegro5_LIBS} DESTINATION ${LIBRARY_OUTPUT_PATH})
configure_file("${ANDROID_ALLEGRO_ROOT}/lib/allegro-release.aar" ${CMAKE_BINARY_DIR}/android/app/libs/allegro.aar COPYONLY)
file(COPY "${CMAKE_SOURCE_DIR}/data" DESTINATION "${CMAKE_BINARY_DIR}/android/app/src/main/assets/" PATTERN "stuff" EXCLUDE
file(INSTALL "${CMAKE_SOURCE_DIR}/data" DESTINATION "${CMAKE_BINARY_DIR}/android/app/src/main/assets/"
PATTERN "stuff" EXCLUDE
PATTERN ".git" EXCLUDE
PATTERN ".gitignore" EXCLUDE
PATTERN ".directory" EXCLUDE
PATTERN "CMakeLists.txt" EXCLUDE)
PATTERN "CMakeLists.txt" EXCLUDE
PATTERN "android" EXCLUDE
PATTERN "maemo5" EXCLUDE
PATTERN "pocketchip" EXCLUDE
PATTERN "raspberrypi" EXCLUDE
PATTERN "steamlink" EXCLUDE
PATTERN "emscripten" EXCLUDE
PATTERN "vita" EXCLUDE
)
file(COPY "${CMAKE_SOURCE_DIR}/data/icons/48/${LIBSUPERDERPY_GAMENAME}.png" DESTINATION "${CMAKE_BINARY_DIR}/android/app/src/main/res/mipmap-mdpi/")
file(COPY "${CMAKE_SOURCE_DIR}/data/icons/72/${LIBSUPERDERPY_GAMENAME}.png" DESTINATION "${CMAKE_BINARY_DIR}/android/app/src/main/res/mipmap-hdpi/")
file(COPY "${CMAKE_SOURCE_DIR}/data/icons/96/${LIBSUPERDERPY_GAMENAME}.png" DESTINATION "${CMAKE_BINARY_DIR}/android/app/src/main/res/mipmap-xhdpi/")
file(COPY "${CMAKE_SOURCE_DIR}/data/icons/144/${LIBSUPERDERPY_GAMENAME}.png" DESTINATION "${CMAKE_BINARY_DIR}/android/app/src/main/res/mipmap-xxhdpi/")
file(COPY "${CMAKE_SOURCE_DIR}/data/icons/192/${LIBSUPERDERPY_GAMENAME}.png" DESTINATION "${CMAKE_BINARY_DIR}/android/app/src/main/res/mipmap-xxxhdpi/")
if(EXISTS "${CMAKE_SOURCE_DIR}/data/android")
file(INSTALL "${CMAKE_SOURCE_DIR}/data/android/" DESTINATION "${CMAKE_BINARY_DIR}/android/app/src/main/assets/data/"
PATTERN ".git" EXCLUDE
PATTERN ".gitignore" EXCLUDE
PATTERN ".directory" EXCLUDE
)
endif()
file(INSTALL "${CMAKE_SOURCE_DIR}/data/icons/48/${LIBSUPERDERPY_GAMENAME}.png" DESTINATION "${CMAKE_BINARY_DIR}/android/app/src/main/res/mipmap-mdpi/")
file(INSTALL "${CMAKE_SOURCE_DIR}/data/icons/72/${LIBSUPERDERPY_GAMENAME}.png" DESTINATION "${CMAKE_BINARY_DIR}/android/app/src/main/res/mipmap-hdpi/")
file(INSTALL "${CMAKE_SOURCE_DIR}/data/icons/96/${LIBSUPERDERPY_GAMENAME}.png" DESTINATION "${CMAKE_BINARY_DIR}/android/app/src/main/res/mipmap-xhdpi/")
file(INSTALL "${CMAKE_SOURCE_DIR}/data/icons/144/${LIBSUPERDERPY_GAMENAME}.png" DESTINATION "${CMAKE_BINARY_DIR}/android/app/src/main/res/mipmap-xxhdpi/")
file(INSTALL "${CMAKE_SOURCE_DIR}/data/icons/192/${LIBSUPERDERPY_GAMENAME}.png" DESTINATION "${CMAKE_BINARY_DIR}/android/app/src/main/res/mipmap-xxxhdpi/")
endif(ANDROID)
@ -638,15 +667,33 @@ if (NOT LIBSUPERDERPY_CONFIG_INCLUDED)
endif()
file(REMOVE_RECURSE "${CMAKE_BINARY_DIR}/vita")
file(COPY "${CMAKE_SOURCE_DIR}/data" DESTINATION "${CMAKE_BINARY_DIR}/vita/" PATTERN "stuff" EXCLUDE
file(INSTALL "${CMAKE_SOURCE_DIR}/data" DESTINATION "${CMAKE_BINARY_DIR}/vita/"
PATTERN "stuff" EXCLUDE
PATTERN ".git" EXCLUDE
PATTERN ".gitignore" EXCLUDE
PATTERN ".directory" EXCLUDE
PATTERN "CMakeLists.txt" EXCLUDE
PATTERN "vita/sce_sys" EXCLUDE)
PATTERN "android" EXCLUDE
PATTERN "maemo5" EXCLUDE
PATTERN "pocketchip" EXCLUDE
PATTERN "raspberrypi" EXCLUDE
PATTERN "steamlink" EXCLUDE
PATTERN "emscripten" EXCLUDE
PATTERN "vita" EXCLUDE
)
if(EXISTS "${CMAKE_SOURCE_DIR}/data/vita")
file(INSTALL "${CMAKE_SOURCE_DIR}/data/vita/" DESTINATION "${CMAKE_BINARY_DIR}/vita/data/"
PATTERN ".git" EXCLUDE
PATTERN ".gitignore" EXCLUDE
PATTERN ".directory" EXCLUDE
PATTERN "sce_sys" EXCLUDE
)
endif()
if(EXISTS "${CMAKE_SOURCE_DIR}/data/vita/sce_sys")
file(COPY "${CMAKE_SOURCE_DIR}/data/vita/sce_sys" DESTINATION "${CMAKE_BINARY_DIR}/vita/")
file(INSTALL "${CMAKE_SOURCE_DIR}/data/vita/sce_sys" DESTINATION "${CMAKE_BINARY_DIR}/vita/")
else()
file(MAKE_DIRECTORY "${CMAKE_BINARY_DIR}/vita/sce_sys")
endif()
@ -726,6 +773,10 @@ if (NOT LIBSUPERDERPY_CONFIG_INCLUDED)
configure_file("${LIBSUPERDERPY_DIR}/cmake/cmake_uninstall.cmake.in" "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake" IMMEDIATE @ONLY)
add_custom_target(uninstall COMMAND ${CMAKE_COMMAND} -P ${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake)
if (LIBSUPERDERPY_PLATFORM_OVERRIDE)
add_definitions(-DLIBSUPERDERPY_PLATFORM_OVERRIDE=\"${LIBSUPERDERPY_PLATFORM_OVERRIDE}\")
endif()
set(LIBSUPERDERPY_CONFIG_INCLUDED 1)
endif (NOT LIBSUPERDERPY_CONFIG_INCLUDED)

66
src/utils.c
View file

@ -407,69 +407,9 @@ static char* TestDataFilePath(struct Game* game, const char* filename) {
SYMBOL_EXPORT const char* FindDataFilePath(struct Game* game, const char* filename) {
char* result = 0;
#ifdef ALLEGRO_ANDROID
char origfn[255] = "android/";
strncat(origfn, filename, 246);
result = TestDataFilePath(game, origfn);
if (result) {
return AddGarbage(game, result);
}
#endif
#ifdef MAEMO5
char origfn[255] = "maemo5/";
strncat(origfn, filename, 247);
result = TestDataFilePath(game, origfn);
if (result) {
return AddGarbage(game, result);
}
#endif
#ifdef POCKETCHIP
char origfn[255] = "pocketchip/";
strncat(origfn, filename, 243);
result = TestDataFilePath(game, origfn);
if (result) {
return AddGarbage(game, result);
}
#endif
#ifdef RASPBERRYPI
char origfn[255] = "raspberrypi/";
strncat(origfn, filename, 242);
result = TestDataFilePath(game, origfn);
if (result) {
return AddGarbage(game, result);
}
#endif
#ifdef STEAMLINK
char origfn[255] = "steamlink/";
strncat(origfn, filename, 244);
result = TestDataFilePath(game, origfn);
if (result) {
return AddGarbage(game, result);
}
#endif
#ifdef __EMSCRIPTEN__
char origfn[255] = "emscripten/";
strncat(origfn, filename, 243);
result = TestDataFilePath(game, origfn);
if (result) {
return AddGarbage(game, result);
}
#endif
#ifdef __vita__
char origfn[255] = "vita/";
strncat(origfn, filename, 249);
#ifdef LIBSUPERDERPY_PLATFORM_OVERRIDE
char origfn[255] = LIBSUPERDERPY_PLATFORM_OVERRIDE "/";
strncat(origfn, filename, 254 - strlen(LIBSUPERDERPY_PLATFORM_OVERRIDE));
result = TestDataFilePath(game, origfn);
if (result) {