Skip to content

fix issue with zlib 1.3.1 and Windows #242

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
hoene wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix issue with zlib 1.3.1 and Windows #242

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion build/project.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"dependencies": {
"zlib": "1.2.8.8",
"zlib": "1.3.1",
},
"frameworks": {
".NETFramework,Version=v4.0": { }
Expand Down
19 changes: 1 addition & 18 deletions src/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,23 +3,6 @@ set(CMAKE_C_STANDARD 99)
configure_file(config.h.in config.h)
include_directories(${CMAKE_CURRENT_BINARY_DIR})

if(NOT MSVC)
if(NOT WIN32)
find_library(MATH m)
else()
set(MATH "")
endif()
include(FindZLIB)
else()
set(MATH "")
find_program(NUGET nuget)
if(NUGET)
execute_process(COMMAND ${NUGET} install zlib)
endif()
include_directories(
${PROJECT_SOURCE_DIR}/windows/third-party/zlib-1.2.11/include/)
endif()

if(NOT MSVC)
if(NOT WIN32)
find_library(MATH m)
Expand All @@ -42,7 +25,7 @@ else()
execute_process(COMMAND ${NUGET} install zlib)
endif()
include_directories(
${PROJECT_SOURCE_DIR}/windows/third-party/zlib-1.2.11/include/)
${PROJECT_SOURCE_DIR}/windows/third-party/zlib-1.3.1/include/)
endif()

set(libsrc
Expand Down
Loading