aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaweł Kołodziejski2012-03-21 22:20:48 -0700
committerPaweł Kołodziejski2012-03-21 22:20:48 -0700
commit47c72dbd75873972142ec4155d491f8d0cc743af (patch)
tree7a0bb5d226e242f533034ef985f80c6ffb4a2590
parent57abb8f8439e9f8aeaf584a0d7b2e6407f09ea3c (diff)
parentfb3ac5a5ec9f5bc95372db97b9d4fc2f8327c8c4 (diff)
downloadscummvm-rg350-47c72dbd75873972142ec4155d491f8d0cc743af.tar.gz
scummvm-rg350-47c72dbd75873972142ec4155d491f8d0cc743af.tar.bz2
scummvm-rg350-47c72dbd75873972142ec4155d491f8d0cc743af.zip
Merge pull request #212 from aquadran/master
OSX: fix making bundle when freetype2 is enabled
-rwxr-xr-xconfigure2
-rw-r--r--ports.mk3
2 files changed, 4 insertions, 1 deletions
diff --git a/configure b/configure
index 7cb3987027..82620f3afd 100755
--- a/configure
+++ b/configure
@@ -3501,7 +3501,7 @@ fi
echocheck "FreeType2"
echo "$_freetype2"
-define_in_config_h_if_yes "$_freetype2" "USE_FREETYPE2"
+define_in_config_if_yes "$_freetype2" "USE_FREETYPE2"
#
# Check for OpenGL (ES)
diff --git a/ports.mk b/ports.mk
index 419b91581a..40a2972ed5 100644
--- a/ports.mk
+++ b/ports.mk
@@ -76,6 +76,9 @@ endif
ifneq ($(BACKEND), iphone)
# Static libaries, used for the scummvm-static and iphone targets
OSX_STATIC_LIBS := `$(STATICLIBPATH)/bin/sdl-config --static-libs`
+ifdef USE_FREETYPE2
+OSX_STATIC_LIBS += $(STATICLIBPATH)/lib/libfreetype.a $(STATICLIBPATH)/lib/libbz2.a
+endif
endif
ifdef USE_VORBIS