Skip to content

Commit

Permalink
Stripping port specific zlib nonsense
Browse files Browse the repository at this point in the history
  • Loading branch information
Honeybunch committed Sep 18, 2024
1 parent 42d100d commit bd93387
Show file tree
Hide file tree
Showing 2 changed files with 48 additions and 6 deletions.
52 changes: 47 additions & 5 deletions ports/libmysofa/use-vcpkg-zlib.patch
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 018f4ce..3ef752e 100644
index 018f4ce..90ec50d 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -13,6 +13,8 @@ use_c99()
@@ -13,21 +13,25 @@ use_c99()
configure_file(config.h.in config.h)
include_directories(${CMAKE_CURRENT_BINARY_DIR})

Expand All @@ -11,7 +11,49 @@ index 018f4ce..3ef752e 100644
if(NOT MSVC)
if(NOT WIN32)
find_library(MATH m)
@@ -81,6 +83,8 @@ set(public-headers
else()
set(MATH "")
endif()
- include(FindZLIB)
+ #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)
@@ -36,12 +40,13 @@ if(NOT MSVC)
else()
set(MATH "")
endif()
- include(FindZLIB)
- include_directories(${ZLIB_INCLUDE_DIRS})
+ #include(FindZLIB)
+ #include_directories(${ZLIB_INCLUDE_DIRS})
set(PKG_CONFIG_PRIVATELIBS "-lm ${PKG_CONFIG_PRIVATELIBS}")
set(PKG_CONFIG_PRIVATELIBS "-lz ${PKG_CONFIG_PRIVATELIBS}")
else()
set(MATH "")
+ #[[
find_program(NUGET nuget)
if(NOT NUGET)
message(
@@ -53,6 +58,7 @@ else()
endif()
include_directories(
${PROJECT_SOURCE_DIR}/windows/third-party/zlib-1.2.11/include/)
+ ]]#
endif()

set(libsrc
@@ -81,6 +87,8 @@ set(public-headers
hrtf/mysofa.h
)

Expand All @@ -20,7 +62,7 @@ index 018f4ce..3ef752e 100644
if(BUILD_STATIC_LIBS)
add_library(mysofa-static STATIC ${libsrc})
target_include_directories(mysofa-static
@@ -88,7 +92,7 @@ target_include_directories(mysofa-static
@@ -88,7 +96,7 @@ target_include_directories(mysofa-static
"$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/hrtf>"
$<INSTALL_INTERFACE:include/>
)
Expand All @@ -29,7 +71,7 @@ index 018f4ce..3ef752e 100644
set_target_properties(
mysofa-static
PROPERTIES OUTPUT_NAME mysofa CLEAN_DIRECT_OUTPUT 1 POSITION_INDEPENDENT_CODE
@@ -120,7 +124,7 @@ if(BUILD_SHARED_LIBS)
@@ -120,7 +128,7 @@ if(BUILD_SHARED_LIBS)
"$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/hrtf>"
$<INSTALL_INTERFACE:include/>
)
Expand Down
2 changes: 1 addition & 1 deletion versions/l-/libmysofa.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"versions": [
{
"git-tree": "5890fa56a6686c822dd5143b9c2e822d845bfd61",
"git-tree": "8baeb806ef3c7728c05b3a3f7c9b5d47d6891054",
"version": "1.3.2",
"port-version": 0
}
Expand Down

0 comments on commit bd93387

Please sign in to comment.