[Scummvm-cvs-logs] scummvm master -> 6224f97cf060cb9cb0a2cac0ca003020047b1d00

lordhoto lordhoto at gmail.com
Wed Jan 13 14:55:45 CET 2016


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:
6224f97cf0 BUILD: Fix ios7bundle/iphone bundle targets again.


Commit: 6224f97cf060cb9cb0a2cac0ca003020047b1d00
    https://github.com/scummvm/scummvm/commit/6224f97cf060cb9cb0a2cac0ca003020047b1d00
Author: Johannes Schickel (lordhoto at scummvm.org)
Date: 2016-01-13T14:53:57+01:00

Commit Message:
BUILD: Fix ios7bundle/iphone bundle targets again.

iOS SDKs do not contain a libreadline, thus only link that for Mac OS X.
Regression from: cb5db404c005e9ce982bee2a7abccad3ba043dc4

Changed paths:
    ports.mk



diff --git a/ports.mk b/ports.mk
index 2640a27..fa38084 100644
--- a/ports.mk
+++ b/ports.mk
@@ -247,10 +247,16 @@ endif
 
 ifdef USE_FLUIDSYNTH
 OSX_STATIC_LIBS += \
-                -liconv -lreadline -framework CoreMIDI -framework CoreAudio\
+                -liconv -framework CoreMIDI -framework CoreAudio\
                 $(STATICLIBPATH)/lib/libfluidsynth.a \
                 $(STATICLIBPATH)/lib/libglib-2.0.a \
                 $(STATICLIBPATH)/lib/libintl.a
+
+ifneq ($(BACKEND), iphone)
+ifneq ($(BACKEND), ios7)
+OSX_STATIC_LIBS += -lreadline
+endif
+endif
 endif
 
 ifdef USE_MAD






More information about the Scummvm-git-logs mailing list