this repo has no description
0
fork

Configure Feed

Select the types of activity you want to include in your feed.

libretro: Add a BUILD_WITH_ZLIB option to allow disabling zlib link (#2596)

authored by

Rob Loach and committed by
GitHub
7e40e849 1f23057e

+9 -53
+1
CMakeLists.txt
··· 38 38 option(BUILD_TOUCH_INPUT "Build with touch input support" ${BUILD_TOUCH_INPUT_DEFAULT}) 39 39 option(BUILD_NO_OPTIMIZATION "Build without optimizations for debugging" OFF) 40 40 option(BUILD_ASAN_DEBUG "Build with AddressSanitizer" OFF) 41 + option(BUILD_WITH_ZLIB "Build with zlib linked" ON) 41 42 42 43 if (BUILD_NO_OPTIMIZATION) 43 44 set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -g -O0")
+5 -1
cmake/core.cmake
··· 51 51 ${CMAKE_SOURCE_DIR}/include 52 52 ${CMAKE_SOURCE_DIR}/src) 53 53 54 - target_link_libraries(tic80core PRIVATE blipbuf zlib) 54 + target_link_libraries(tic80core PRIVATE blipbuf) 55 + 56 + if(BUILD_WITH_ZLIB) 57 + target_link_libraries(tic80core PRIVATE zlib) 58 + endif() 55 59 56 60 if(BUILD_STATIC) 57 61 if(BUILD_WITH_LUA)
+3 -52
cmake/libretro.cmake
··· 17 17 else() 18 18 set(LIBRETRO_EXTENSION "a") 19 19 endif() 20 - set_target_properties(tic80_libretro PROPERTIES SUFFIX "_partial.a") 21 - include(CheckCSourceCompiles) 22 - check_c_source_compiles( 23 - "#ifndef __MSDOS__ 24 - #error \"Not DOS\" 25 - #endif" 26 - IS_DOS 27 - ) 28 20 29 - # Build a list of language libraries to link against. 30 - if(BUILD_WITH_FENNEL) 31 - set(LIBRETRO_FENNEL_LIB ${CMAKE_BINARY_DIR}/lib/libfennel.a) 32 - endif() 33 - if(BUILD_WITH_JANET) 34 - set(LIBRETRO_JANET_LIB ${CMAKE_BINARY_DIR}/lib/libjanet.a) 35 - endif() 36 - if(BUILD_WITH_LUA) 37 - set(LIBRETRO_LUA_LIB ${CMAKE_BINARY_DIR}/lib/liblua.a) 38 - endif() 39 - if(BUILD_WITH_MOON) 40 - set(LIBRETRO_MOON_LIB ${CMAKE_BINARY_DIR}/lib/libmoon.a) 41 - endif() 42 - if(BUILD_WITH_MRUBY) 43 - set(LIBRETRO_MRUBY_LIB ${CMAKE_BINARY_DIR}/lib/libmruby.a) 44 - endif() 45 - if(BUILD_WITH_JS) 46 - set(LIBRETRO_JS_LIB ${CMAKE_BINARY_DIR}/lib/libquickjs.a) 47 - endif() 48 - if(BUILD_WITH_SCHEME) 49 - set(LIBRETRO_SCHEME_LIB ${CMAKE_BINARY_DIR}/lib/libscheme.a) 50 - endif() 51 - if(BUILD_WITH_SQUIRREL) 52 - set(LIBRETRO_SQUIRREL_LIB ${CMAKE_BINARY_DIR}/lib/libsquirrel.a) 53 - endif() 54 - if(BUILD_WITH_WASM) 55 - set(LIBRETRO_WASM_LIB ${CMAKE_BINARY_DIR}/lib/libwasm.a) 56 - endif() 57 - if(BUILD_WITH_WREN) 58 - set(LIBRETRO_WREN_LIB ${CMAKE_BINARY_DIR}/lib/libwren.a) 59 - endif() 60 - set(LIBRETRO_LANG_LIBS ${LIBRETRO_FENNEL_LIB} ${LIBRETRO_JANET_LIB} ${LIBRETRO_LUA_LIB} ${LIBRETRO_MOON_LIB} ${LIBRETRO_MRUBY_LIB} ${LIBRETRO_JS_LIB} ${LIBRETRO_SCHEME_LIB} ${LIBRETRO_SQUIRREL_LIB} ${LIBRETRO_WASM_LIB} ${LIBRETRO_WREN_LIB}) 61 - 62 - # Exact way to detect NGC/Wii depends on version of cmake files 63 - if("${CMAKE_SYSTEM_NAME}" STREQUAL "NintendoWii" OR "${CMAKE_SYSTEM_NAME}" STREQUAL "NintendoGameCube" OR GAMECUBE OR WII OR IS_DOS) 64 - add_custom_command(TARGET tic80_libretro 65 - POST_BUILD 66 - COMMAND ${CMAKE_SOURCE_DIR}/build/libretro/merge_static.sh $(AR) ${CMAKE_BINARY_DIR}/lib/tic80_libretro${LIBRETRO_SUFFIX}.${LIBRETRO_EXTENSION} ${CMAKE_BINARY_DIR}/lib/tic80_libretro_partial.a ${CMAKE_BINARY_DIR}/lib/libtic80core.a ${CMAKE_BINARY_DIR}/lib/libblipbuf.a ${CMAKE_BINARY_DIR}/lib/libgiflib.a ${CMAKE_BINARY_DIR}/lib/liblpeg.a ${LIBRETRO_LANG_LIBS} ${CMAKE_BINARY_DIR}/lib/libzlib.a) 67 - else() 68 - add_custom_command(TARGET tic80_libretro 69 - POST_BUILD 70 - COMMAND ${CMAKE_SOURCE_DIR}/build/libretro/merge_static.sh $(AR) ${CMAKE_BINARY_DIR}/lib/tic80_libretro${LIBRETRO_SUFFIX}.${LIBRETRO_EXTENSION} ${CMAKE_BINARY_DIR}/lib/tic80_libretro_partial.a ${CMAKE_BINARY_DIR}/lib/libtic80core.a ${CMAKE_BINARY_DIR}/lib/libblipbuf.a ${CMAKE_BINARY_DIR}/lib/libgiflib.a ${CMAKE_BINARY_DIR}/lib/liblpeg.a ${LIBRETRO_LANG_LIBS}) 71 - endif() 21 + set_target_properties(tic80_libretro PROPERTIES SUFFIX "${LIBRETRO_SUFFIX}.${LIBRETRO_EXTENSION}") 72 22 else() 73 23 add_library(tic80_libretro SHARED 74 24 ${LIBRETRO_SRC} ··· 77 27 78 28 target_include_directories(tic80_libretro PRIVATE 79 29 ${CMAKE_CURRENT_BINARY_DIR} 80 - ${TIC80CORE_DIR}) 30 + ${TIC80CORE_DIR} 31 + ) 81 32 82 33 if(MINGW) 83 34 target_link_libraries(tic80_libretro mingw32)