diff options
| author | Paul Gardiner <paulg.artifex@glidos.net> | 2012-08-08 14:03:34 +0100 |
|---|---|---|
| committer | Paul Gardiner <paulg.artifex@glidos.net> | 2012-08-08 14:03:34 +0100 |
| commit | 274ab2d66943bb891976ef712a816e7d128eff22 (patch) | |
| tree | bee912b4426f3dfe4acc176a57fd5b55db58d53c /ios | |
| parent | 51661f29a5f229f30ae16e16bd0ef6396cd001af (diff) | |
| parent | 511ea75a53db6e72334438bcda2ce774c7d72d1e (diff) | |
| download | mupdf-274ab2d66943bb891976ef712a816e7d128eff22.tar.xz | |
Merge branch 'master' into forms
Conflicts:
Makefile
apps/mudraw.c
pdf/pdf_write.c
win32/libmupdf-v8.vcproj
Diffstat (limited to 'ios')
| -rw-r--r-- | ios/build_libs.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ios/build_libs.sh b/ios/build_libs.sh index 72c07ce0..836601d1 100644 --- a/ios/build_libs.sh +++ b/ios/build_libs.sh @@ -27,7 +27,7 @@ make -C .. libs || exit 1 echo Assembling final library in $TARGET_BUILD_DIR/. mkdir -p "$TARGET_BUILD_DIR" rm -f $TARGET_BUILD_DIR/libLibraries.a -ar cru $TARGET_BUILD_DIR/libLibraries.a ../$OUT/*.o +ar cr $TARGET_BUILD_DIR/libLibraries.a ../$OUT/*.o ranlib $TARGET_BUILD_DIR/libLibraries.a echo Done. |