[Scummvm-cvs-logs] scummvm master -> 553843a2b52f27fcfe431253cb4f86afc1680e2e

[lordhoto]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
553843a2b5 IPHONE: Allow FreeType2 support.


Commit: 553843a2b52f27fcfe431253cb4f86afc1680e2e
    https://github.com/scummvm/scummvm/commit/553843a2b52f27fcfe431253cb4f86afc1680e2e
Author: Johannes Schickel (lordhoto at scummvm.org)
Date: 2014-02-15T19:18:07-08:00

Commit Message:
IPHONE: Allow FreeType2 support.

This moves the static library handling for USE_FREETYPE2 outside a block which
is not executed for the iPhone backend.

Changed paths:
    ports.mk



diff --git a/ports.mk b/ports.mk
index e432c8c..306e0f0 100644
--- a/ports.mk
+++ b/ports.mk
@@ -97,10 +97,11 @@ endif
 ifneq ($(BACKEND), iphone)
 # Static libaries, used for the scummvm-static and iphone targets
 OSX_STATIC_LIBS := `$(STATICLIBPATH)/bin/sdl-config --static-libs`
+endif
+
 ifdef USE_FREETYPE2
 OSX_STATIC_LIBS += $(STATICLIBPATH)/lib/libfreetype.a $(STATICLIBPATH)/lib/libbz2.a
 endif
-endif
 
 ifdef USE_VORBIS
 OSX_STATIC_LIBS += \