Glassvision/IfcOpenShell
1
0
Fork 0
mirror of https://github.com/IfcOpenShell/IfcOpenShell.git synced 2026-09-22 16:31:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

build-all: fix opencollada patch to support it being buildable as shared

Browse Source
This commit is contained in:
Andrej730
2026-08-04 14:19:00 +05:00
parent 6d21801e53
commit 6c750b0fdb
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
nix/build-all.py
+3 -3
View File
@@ -1112,9 +1112,9 @@ if "libxml2" in targets:
if "OpenCOLLADA" in targets: if "OpenCOLLADA" in targets:
patches = ["./patches/opencollada/pr622_and_disable_subdirs.patch"] patches = ["./patches/opencollada/pr622_and_disable_subdirs.patch"]
# This patch allows static libraries config on Unix, # OpenCOLLADAConfig.cmake.in hardcodes shared-lib targets on Unix regardless of
# because the config is weird and doesn't allow non-shared libraries on Unix. # whether shared libs were actually built. We make it follow `USE_SHARED` instead.
patches.append("./patches/opencollada/allow_static_libraries_config_on_unix.patch") patches.append("./patches/opencollada/config_select_libs_by_use_shared.patch")
if "wasm" in flags: if "wasm" in flags:
# This is necessary for the WASM build, because recent versions of # This is necessary for the WASM build, because recent versions of
nix/patches/opencollada/allow_static_libraries_config_on_unix.patch → nix/patches/opencollada/config_select_libs_by_use_shared.patch
+1 -1
View File
@@ -7,7 +7,7 @@ index d765b108..6800c2a7 100644
# Set the library variable # Set the library variable
-if(UNIX) -if(UNIX)
+if(0) +if(@USE_SHARED@)
set(OPENCOLLADA_LIBRARIES set(OPENCOLLADA_LIBRARIES
ftoa_shared ftoa_shared
buffer_shared buffer_shared