ShuriZma
/
flycast
mirror of https://github.com/flyinghead/flycast.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

deps: update libchdr and remove patch

This commit is contained in:
scribam 2021-11-26 19:16:07 +01:00 committed by flyinghead
parent 4ab3f01867
commit 8164c96379
3 changed files with 2 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CMakeLists.txt
View File

@ -297,9 +297,7 @@ if(NOT LIBRETRO)
endif() endif()
endif() endif()
execute_process(COMMAND git apply -p1 ${CMAKE_CURRENT_SOURCE_DIR}/core/deps/patches/libchdr.patch add_subdirectory(core/deps/libchdr EXCLUDE_FROM_ALL)
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/core/deps/libchdr)
add_subdirectory(core/deps/libchdr)
target_link_libraries(${PROJECT_NAME} PRIVATE chdr-static) target_link_libraries(${PROJECT_NAME} PRIVATE chdr-static)
target_include_directories(${PROJECT_NAME} PRIVATE core/deps/libchdr/include) target_include_directories(${PROJECT_NAME} PRIVATE core/deps/libchdr/include)

2
core/deps/libchdr

@ -1 +1 @@
Subproject commit d3ffd20ca71686877372dea7f9eed359dbf65ba2 Subproject commit 7972daa6ca6bf631bf54d60c5ed09eb76472bb79

49
core/deps/patches/libchdr.patch
View File

@ -1,49 +0,0 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 06bc77c..9ac12fc 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -12,8 +12,8 @@ option(INSTALL_STATIC_LIBS "Install static libraries" OFF)
option(WITH_SYSTEM_ZLIB "Use system provided zlib library" OFF)
if(CMAKE_C_COMPILER_ID MATCHES "GNU")
- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fvisibility=hidden -fPIC -O3 -flto")
- set(CMAKE_INTERPROCEDURAL_OPTIMIZATION ON)
+ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fvisibility=hidden -fPIC -O3")
+ set(CMAKE_INTERPROCEDURAL_OPTIMIZATION OFF)
elseif(CMAKE_C_COMPILER_ID MATCHES "Clang")
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -O3")
set(CMAKE_INTERPROCEDURAL_OPTIMIZATION OFF)
@@ -34,7 +34,11 @@ add_subdirectory(deps/lzma-19.00 EXCLUDE_FROM_ALL)
# zlib
if (WITH_SYSTEM_ZLIB)
- pkg_check_modules(ZLIB REQUIRED zlib)
+ if (WINDOWS_STORE)
+ find_package(ZLIB REQUIRED)
+ else()
+ pkg_check_modules(ZLIB REQUIRED zlib)
+ endif()
list(APPEND PLATFORM_INCLUDES ${ZLIB_INCLUDE_DIRS})
list(APPEND PLATFORM_LIBS ${ZLIB_LIBRARIES})
else()
@@ -68,6 +72,10 @@ if (INSTALL_STATIC_LIBS)
)
endif()
+if(MSVC)
+ target_compile_definitions(chdr-static PRIVATE _CRT_SECURE_NO_WARNINGS)
+endif()
+
if (BUILD_SHARED_LIBS)
set(CMAKE_CXX_VISIBILITY_PRESET hidden)
set(CMAKE_VISIBILITY_INLINES_HIDDEN 1)
@@ -79,7 +87,7 @@ if (BUILD_SHARED_LIBS)
if(MSVC)
target_compile_definitions(chdr PUBLIC "CHD_DLL")
- target_compile_definitions(chdr PRIVATE "CHD_DLL_EXPORTS")
+ target_compile_definitions(chdr PRIVATE "CHD_DLL_EXPORTS" _CRT_SECURE_NO_WARNINGS)
elseif(APPLE)
target_link_options(chdr PRIVATE -Wl,-dead_strip -Wl,-exported_symbol,_chd_*)
else()