Path: blob/main/emulators/es-de/files/patch-CMakeLists.txt
16461 views
--- CMakeLists.txt.orig 2025-04-04 15:03:07 UTC1+++ CMakeLists.txt2@@ -155,6 +155,8 @@ elseif(NOT EMSCRIPTEN AND NOT ANDROID AND NOT IOS)3find_package(Libgit2 REQUIRED)4find_package(Pugixml REQUIRED)5find_package(SDL2 REQUIRED)6+ find_package(rlottie REQUIRED)7+ use_pkgconfig(lunasvg lunasvg)8endif()910# Add libCEC support.11@@ -197,8 +199,7 @@ if(CMAKE_BUILD_TYPE MATCHES Debug)12if(CMAKE_CXX_COMPILER_ID MATCHES MSVC)13set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /std:c++17 /Od /DEBUG:FULL")14else()15- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++17 -O0 -g3 -Wall -Wpedantic -Wsign-compare -Wnarrowing -Wmissing-field-initializers -Wunused-macros")16- set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -O0")17+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++17 -Wall -Wpedantic -Wsign-compare -Wnarrowing -Wmissing-field-initializers -Wunused-macros")18endif()19# If using Clang, then add additional debug data needed by GDB.20# Comment this out if you're using LLDB for debugging as this flag makes the binary21@@ -221,11 +222,11 @@ else()22if(CMAKE_CXX_COMPILER_ID MATCHES MSVC)23set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DNDEBUG /std:c++17 /O2 /DEBUG:NONE")24else()25- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++17 -O2 -DNDEBUG -Wall -Wpedantic -Wsign-compare -Wnarrowing -Wmissing-field-initializers -Wunused-macros")26+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++17 -DNDEBUG -Wall -Wpedantic -Wsign-compare -Wnarrowing -Wmissing-field-initializers -Wunused-macros")27if(APPLE)28set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -O2")29else()30- set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -O2 -s")31+ set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -s")32endif()33endif()34endif()35@@ -540,7 +541,9 @@ else()36${HarfBuzz_INCLUDE_DIRS}37${ICU_INCLUDE_DIRS}38${PUGIXML_INCLUDE_DIRS}39- ${SDL2_INCLUDE_DIR})40+ ${SDL2_INCLUDE_DIR}41+ ${UTF8CPP_INCLUDE_DIR}42+ ${lunasvg_INCLUDE_DIRS})43endif()4445# Add libCEC include directory.46@@ -698,7 +701,9 @@ else()47${HarfBuzz_LIBRARIES}48${ICU_LIBRARIES}49${PUGIXML_LIBRARIES}50- ${SDL2_LIBRARY})51+ ${SDL2_LIBRARY}52+ ${lunasvg_LINK_LIBRARIES}53+ ${rlottie_LIBRARIES})54if(Intl_LIBRARY)55# On Unix systems where the gettext functions are not part of the C standard library56# we need to explicitly link with the libintl library.57@@ -714,9 +719,6 @@ if(NOT WIN32)58elseif(IOS)59set(COMMON_LIBRARIES ${COMMON_LIBRARIES} ${PROJECT_SOURCE_DIR}/${CMAKE_BUILD_TYPE}/liblunasvg.a)60set(COMMON_LIBRARIES ${COMMON_LIBRARIES} ${PROJECT_SOURCE_DIR}/${CMAKE_BUILD_TYPE}/librlottie.a)61- else()62- set(COMMON_LIBRARIES ${COMMON_LIBRARIES} ${PROJECT_SOURCE_DIR}/liblunasvg.a)63- set(COMMON_LIBRARIES ${COMMON_LIBRARIES} ${PROJECT_SOURCE_DIR}/librlottie.a)64endif()65endif()6667@@ -770,18 +772,9 @@ add_subdirectory(es-pdf-converter)68endif()6970add_subdirectory(es-pdf-converter)71-add_subdirectory(external)72add_subdirectory(es-core)73add_subdirectory(es-app)7475-# Make sure that es-pdf-convert is built first, and then that rlottie is built before es-core.76-add_dependencies(lunasvg es-pdf-convert)77-78if(COMPILE_LOCALIZATIONS)79add_dependencies(es-pdf-convert localization)80endif()81-82-add_dependencies(es-core rlottie)83-84-# Set lottie2gif to not be built.85-set_target_properties(lottie2gif PROPERTIES EXCLUDE_FROM_ALL 1 EXCLUDE_FROM_DEFAULT_BUILD 1)868788