Add libzip to macOS builds

OpenRCT2 · Dec 7, 2016 · eaff86a · eaff86a
1 parent b0af049
commit eaff86a
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 6 deletions.
diff --git a/buildmac.sh b/buildmac.sh
@@ -39,6 +39,14 @@ cd src
     install_name_tool -id @rpath/libjansson.dylib "$PREFIXDIR/lib/libjansson.dylib"
   cd ..
 
+  echo -e "\n\nBuilding libzip ...\n\n"
+  cd libzip
+    autoreconf -i
+    eval ./configure $CONFIGUREOPTS
+    eval $COMMONMAKE
+    install_name_tool -id @rpath/libzip.dylib "$PREFIXDIR/lib/libzip.dylib"
+  cd ..
+
   echo -e "\n\nBuilding speexdsp ...\n\n"
   cd speexdsp
     ./autogen.sh
@@ -81,17 +89,20 @@ mkdir artifacts
 
 # Manually copy headers wanted. Mostly to exclude freetype, which isn't directly used
 mkdir artifacts/include
-cp -R build/include/libpng16   artifacts/include/
-cp    build/include/jansson*.h artifacts/include/
-cp -R build/include/speex      artifacts/include/
-cp -R build/include/SDL2       artifacts/include/
-cp -R build/include/openssl    artifacts/include/
+cp -R build/include/libpng16     artifacts/include/
+cp    build/include/jansson*.h   artifacts/include/
+cp    build/include/zip.h        artifacts/include/
+cp -R build/lib/libzip/include/* artifacts/include/
+cp -R build/include/speex        artifacts/include/
+cp -R build/include/SDL2         artifacts/include/
+cp -R build/include/openssl      artifacts/include/
 
 # Manually copy libs wanted. Removes static libraries and versioned libs
 mkdir artifacts/lib
 cp build/lib/libpng16.dylib    artifacts/lib/
 cp build/lib/libfreetype.dylib artifacts/lib/
 cp build/lib/libjansson.dylib  artifacts/lib/
+cp build/lib/libzip.dylib      artifacts/lib/
 cp build/lib/libspeexdsp.dylib artifacts/lib/
 cp build/lib/libSDL2.dylib     artifacts/lib/
 cp build/lib/libSDL2_ttf.dylib artifacts/lib/

diff --git a/src/libzip b/src/libzip
+0 −7		.hgignore
+0 −1		.hgtags
+0 −6		.travis.yml
+1 −1		CMakeLists.txt
+0 −8		NEWS.md
+0 −4		THANKS
+0 −1		TODO.md
+1 −1		configure.ac
+0 −1		lib/CMakeLists.txt
+0 −2		lib/Makefile.am
+1 −3		lib/zip.h
+41 −55		lib/zip_buffer.c
+11 −40		lib/zip_dirent.c
+0 −64		lib/zip_fseek.c
+0 −61		lib/zip_ftell.c
+43 −67		lib/zip_open.c
+2 −2		lib/zip_source_file.c
+74 −98		lib/zip_source_filep.c
+3 −6		lib/zip_source_win32handle.c
+0 −3		lib/zipint.h
+0 −1		man/CMakeLists.txt
+0 −2		man/Makefile.am
+1 −5		man/libzip.mdoc
+2 −3		man/zip_fclose.mdoc
+1 −2		man/zip_fopen.mdoc
+1 −2		man/zip_fread.mdoc
+0 −72		man/zip_fseek.mdoc
+0 −67		man/zip_ftell.mdoc
+2 −15		man/ziptool.mdoc
+1 −4		regress/CMakeLists.txt
+7 −44		regress/Makefile.am
+0 −97		regress/fseek.c
+0 −6		regress/fseek_deflated.test
+0 −6		regress/fseek_fail.test
+0 −6		regress/fseek_ok.test
+ −		regress/incons-central-file-comment-shorter.zip
+ −		regress/junk-at-end.zip
+ −		regress/junk-at-start.zip
+0 −5		regress/junk_at_end.test
+0 −5		regress/junk_at_start.test
+ −		regress/manyfiles-zip.zip
+2 −2		regress/open_file_count.test
+0 −11		regress/open_many_fail.test
+2 −8		regress/open_many_ok.test
+1 −2		src/zipcmp.c
+48 −73		src/ziptool.c
+2 −2		xcode/config.h