diff --git a/build/project.json b/build/project.json index ce0c1c8..4f1517d 100644 --- a/build/project.json +++ b/build/project.json @@ -1,6 +1,6 @@ { "dependencies": { - "zlib": "1.2.8.8", + "zlib": "1.3.1", }, "frameworks": { ".NETFramework,Version=v4.0": { } diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index cc800b3..37fe41f 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -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) @@ -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