summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Makefile6
-rw-r--r--platform/ios/build_libs.sh2
2 files changed, 4 insertions, 4 deletions
diff --git a/Makefile b/Makefile
index aad26389..8a0b01cf 100644
--- a/Makefile
+++ b/Makefile
@@ -9,15 +9,15 @@ default: all
# --- Configuration ---
+include Makerules
+include Makethird
+
# Do not specify CFLAGS or LIBS on the make invocation line - specify
# XCFLAGS or XLIBS instead. Make ignores any lines in the makefile that
# set a variable that was set on the command line.
CFLAGS += $(XCFLAGS) -Iinclude -I$(GEN)
LIBS += $(XLIBS) -lm
-include Makerules
-include Makethird
-
THIRD_LIBS += $(FREETYPE_LIB)
THIRD_LIBS += $(JBIG2DEC_LIB)
THIRD_LIBS += $(JPEG_LIB)
diff --git a/platform/ios/build_libs.sh b/platform/ios/build_libs.sh
index 966a0b7e..4882575b 100644
--- a/platform/ios/build_libs.sh
+++ b/platform/ios/build_libs.sh
@@ -14,7 +14,7 @@ fi
export OS=ios
export build=$(echo $CONFIGURATION | tr A-Z a-z)
-FLAGS=""
+FLAGS="-Wno-unused-function"
for A in $ARCHS
do
FLAGS="$FLAGS -arch $A"