NoozAbooz
/
minecraft-pi-reborn
forked from minecraft-pi-reborn/minecraft-pi-reborn
1
0
Fork 0
Code Issues Pull Requests Actions Projects Releases Activity

master #2

Merged
NoozAbooz merged 28 commits from minecraft-pi-reborn/minecraft-pi-reborn:master into master 2021-11-12 16:07:02 +00:00
Conversation 0 Commits 28 Files Changed 49 +2 -2
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 28424aa86a - Show all commits

2
dependencies/libpng/CMakeLists.txt vendored
View File

@ -18,7 +18,7 @@ FetchContent_Populate(libpng)
set(ZLIB_LIBRARY zlib)
set(ZLIB_INCLUDE_DIR "${zlib_SOURCE_DIR}" "${zlib_BINARY_DIR}")
set(CMAKE_POLICY_DEFAULT_CMP0054 OLD) # Silence Warning
add_subdirectory("${libpng_SOURCE_DIR}" "${libpng_BINARY_DIR}")
add_subdirectory("${libpng_SOURCE_DIR}" "${libpng_BINARY_DIR}" EXCLUDE_FROM_ALL)
set(CMAKE_POLICY_DEFAULT_CMP0054 NEW) # Re-Enable New Behavior
set_target_properties(png12 PROPERTIES LINK_FLAGS "-Wl,--version-script='${CMAKE_CURRENT_SOURCE_DIR}/libpng.vers'") # Use Symbol Versioning
set_target_properties(png12 PROPERTIES DEBUG_POSTFIX "") # Fix LibPNG Suffix In Debug Mode

2
dependencies/zlib/CMakeLists.txt vendored
View File

@ -16,7 +16,7 @@ FetchContent_Declare(
)
FetchContent_Populate(zlib)
include_directories("${zlib_SOURCE_DIR}" "${zlib_BINARY_DIR}") # Fix ZLib Build
add_subdirectory("${zlib_SOURCE_DIR}" "${zlib_BINARY_DIR}")
add_subdirectory("${zlib_SOURCE_DIR}" "${zlib_BINARY_DIR}" EXCLUDE_FROM_ALL)
# Install
install(TARGETS zlib DESTINATION "${MCPI_LIB_DIR}")