joaquin/fritzing-build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: fix zlib and clipper

Browse Source
This commit is contained in:
rzlamrr
2026-03-16 07:16:24 +07:00
parent 5eb5e03542
commit 12565d9ada
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.github/workflows/windows.yml
+6 -5
View File
@@ -120,7 +120,7 @@ jobs:
-DCMAKE_BUILD_TYPE=Release ^ -DCMAKE_BUILD_TYPE=Release ^
-DBUILD_SHARED_LIBS=OFF ^ -DBUILD_SHARED_LIBS=OFF ^
-DUSE_BUNDLED_ZLIB=OFF ^ -DUSE_BUNDLED_ZLIB=OFF ^
-DZLIB_LIBRARY="%ZLIB_ROOT%\build\zs.lib" ^ -DZLIB_LIBRARY="%ZLIB_ROOT%\build\zlibstatic.lib" ^
-DZLIB_INCLUDE_DIR="%ZLIB_ROOT%" ^ -DZLIB_INCLUDE_DIR="%ZLIB_ROOT%" ^
.. ..
nmake nmake
@@ -149,7 +149,7 @@ jobs:
Push-Location build Push-Location build
cmake -G "NMake Makefiles" ` cmake -G "NMake Makefiles" `
-DCMAKE_PREFIX_PATH="$QtPath" ` -DCMAKE_PREFIX_PATH="$QtPath" `
-DZLIB_LIBRARY="$ZlibRoot\build\zs.lib" ` -DZLIB_LIBRARY="$ZlibRoot\build\zlibstatic.lib" `
-DZLIB_INCLUDE_DIR="$ZlibRoot" ` -DZLIB_INCLUDE_DIR="$ZlibRoot" `
-DCMAKE_BUILD_TYPE=Release .. -DCMAKE_BUILD_TYPE=Release ..
nmake nmake
@@ -193,9 +193,10 @@ jobs:
} }
# Build clipper as a static library # Build clipper as a static library
Push-Location "Clipper1-6.4.2\include\polyclipping" Push-Location "Clipper1-6.4.2"
cl /c /EHsc /O2 /DNDEBUG clipper.cpp cl /c /O2 /EHsc /MD /Iinclude\polyclipping include\polyclipping\clipper.cpp
lib /OUT:..\..\lib\polyclipping.lib clipper.obj lib /OUT:polyclipping.lib clipper.obj
Move-Item polyclipping.lib lib\
Remove-Item clipper.obj -ErrorAction SilentlyContinue Remove-Item clipper.obj -ErrorAction SilentlyContinue
Pop-Location Pop-Location