NoozAbooz/minecraft-pi-reborn
1
0
Fork 0
forked from minecraft-pi-reborn/minecraft-pi-reborn
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 +4 -2
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit f2bd893241 - Show all commits

3
dependencies/libpng/CMakeLists.txt vendored
View File

@ -8,7 +8,6 @@ add_compile_options(-w)
## LibPNG ## LibPNG
# Download # Download
set(SKIP_INSTALL_ALL TRUE) # Skip Default LibPNG Installation
FetchContent_Declare( FetchContent_Declare(
libpng libpng
GIT_REPOSITORY "https://github.com/glennrp/libpng.git" GIT_REPOSITORY "https://github.com/glennrp/libpng.git"
@ -23,6 +22,8 @@ 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 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 set_target_properties(png12 PROPERTIES DEBUG_POSTFIX "") # Fix LibPNG Suffix In Debug Mode
# Ensure Build
set_target_properties(png12 PROPERTIES EXCLUDE_FROM_ALL FALSE)
# Install # Install
install(TARGETS png12 DESTINATION "${MCPI_LIB_DIR}") install(TARGETS png12 DESTINATION "${MCPI_LIB_DIR}")

3
dependencies/zlib/CMakeLists.txt vendored
View File

@ -8,7 +8,6 @@ add_compile_options(-w)
## zlib ## zlib
# Download # Download
set(SKIP_INSTALL_ALL TRUE) # Skip Default ZLib Installation
FetchContent_Declare( FetchContent_Declare(
zlib zlib
GIT_REPOSITORY "https://github.com/madler/zlib.git" GIT_REPOSITORY "https://github.com/madler/zlib.git"
@ -18,6 +17,8 @@ FetchContent_Populate(zlib)
include_directories("${zlib_SOURCE_DIR}" "${zlib_BINARY_DIR}") # Fix ZLib Build include_directories("${zlib_SOURCE_DIR}" "${zlib_BINARY_DIR}") # Fix ZLib Build
add_subdirectory("${zlib_SOURCE_DIR}" "${zlib_BINARY_DIR}" EXCLUDE_FROM_ALL) add_subdirectory("${zlib_SOURCE_DIR}" "${zlib_BINARY_DIR}" EXCLUDE_FROM_ALL)
# Ensure Build
set_target_properties(zlib PROPERTIES EXCLUDE_FROM_ALL FALSE)
# Install # Install
install(TARGETS zlib DESTINATION "${MCPI_LIB_DIR}") install(TARGETS zlib DESTINATION "${MCPI_LIB_DIR}")