aboutsummaryrefslogtreecommitdiff
path: root/configure
diff options
context:
space:
mode:
authorlukaslw2014-06-22 19:59:00 +0200
committerlukaslw2014-06-22 20:00:45 +0200
commit5a8b68676b8f6b31123e88ebdfbef1be4e57a717 (patch)
tree02ea77ebb3e058a29e9c274fd8d5efd94bb6bab3 /configure
parent770a45390d4422dc9cbcb213808861297ba8e620 (diff)
parentc340570138e84277d39c64aaa7fdaf6d8be2cefb (diff)
downloadscummvm-rg350-5a8b68676b8f6b31123e88ebdfbef1be4e57a717.tar.gz
scummvm-rg350-5a8b68676b8f6b31123e88ebdfbef1be4e57a717.tar.bz2
scummvm-rg350-5a8b68676b8f6b31123e88ebdfbef1be4e57a717.zip
Merge branch 'master' into prince-lukaslw
Diffstat (limited to 'configure')
-rwxr-xr-xconfigure3
1 files changed, 3 insertions, 0 deletions
diff --git a/configure b/configure
index caf88b3720..4b1bba4d3f 100755
--- a/configure
+++ b/configure
@@ -967,6 +967,7 @@ Optional Libraries:
--with-freetype2-prefix=DIR Prefix where the freetype-config script is
installed (optional)
+ --disable-freetype2 disable freetype2 TTF library usage [autodetect]
--with-nasm-prefix=DIR Prefix where nasm executable is installed (optional)
--disable-nasm disable assembly language optimizations [autodetect]
@@ -2058,6 +2059,8 @@ case $_host_os in
# We have to use 'long' for our 4 byte typedef because AmigaOS already typedefs (u)int32
# as (unsigned) long, and consequently we'd get a compiler error otherwise.
type_4_byte='long'
+ # Supress format warnings as the long 4 byte causes noisy warnings.
+ CXXFLAGS="$CXXFLAGS -Wno-format"
add_line_to_config_mk 'AMIGAOS = 1'
;;
android)