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

(Windows) CMake configuration changes to make rlottie build correctly.

Browse source
This commit is contained in:
Leon Styhre 2022-01-07 00:29:31 +01:00
parent 5f9505f780
commit 19147eee66
3 changed files with 13 additions and 3 deletions

6
es-app/CMakeLists.txt
View file

@ -116,7 +116,9 @@ endif()
#--------------------------------------------------------------------------------------------------- #---------------------------------------------------------------------------------------------------
# Miscellaneous configuration. # Miscellaneous configuration.
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wunused-macros") if(NOT CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wunused-macros")
endif()
#--------------------------------------------------------------------------------------------------- #---------------------------------------------------------------------------------------------------
# OS-specific installation and package generation setup. # OS-specific installation and package generation setup.
@ -153,6 +155,7 @@ if(WIN32)
../libssl-1_1-x64.dll ../libssl-1_1-x64.dll
../MSVCP140.dll ../MSVCP140.dll
../pugixml.dll ../pugixml.dll
../rlottie.dll
../SDL2.dll ../SDL2.dll
../VCOMP140.DLL ../VCOMP140.DLL
../VCRUNTIME140.dll ../VCRUNTIME140.dll
@ -172,6 +175,7 @@ if(WIN32)
../libcurl-x64.dll ../libcurl-x64.dll
../libfreetype.dll ../libfreetype.dll
../libpugixml.dll ../libpugixml.dll
../librlottie.dll
../libssl-1_1-x64.dll ../libssl-1_1-x64.dll
../SDL2.dll ../SDL2.dll
../vcomp140.dll ../vcomp140.dll

4
es-core/CMakeLists.txt
View file

@ -167,7 +167,9 @@ set(CORE_SOURCES
#--------------------------------------------------------------------------------------------------- #---------------------------------------------------------------------------------------------------
# Miscellaneous configuration. # Miscellaneous configuration.
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wunused-macros") if(NOT CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wunused-macros")
endif()
include_directories(${COMMON_INCLUDE_DIRS}) include_directories(${COMMON_INCLUDE_DIRS})
add_library(es-core STATIC ${CORE_SOURCES} ${CORE_HEADERS}) add_library(es-core STATIC ${CORE_SOURCES} ${CORE_HEADERS})

6
external/CMakeLists.txt vendored
View file

@ -6,6 +6,10 @@
# CMake configuration for bundled dependencies built in-tree. # CMake configuration for bundled dependencies built in-tree.
# #
set(BUILD_SHARED_LIBS OFF) # On Windows, rlottie is built as a DLL file.
if(NOT WIN32)
set(BUILD_SHARED_LIBS OFF)
endif()
option(LOTTIE_MODULE OFF) option(LOTTIE_MODULE OFF)
add_subdirectory("rlottie") add_subdirectory("rlottie")