[Scummvm-cvs-logs] scummvm master -> 638814d3c473cd527ecffeb7f535df7b94283873

lordhoto lordhoto at gmail.com
Mon Jun 9 23:39:09 CEST 2014


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:
638814d3c4 BUILD: Remove USE_TERMCONV related bits in port.mk.


Commit: 638814d3c473cd527ecffeb7f535df7b94283873
    https://github.com/scummvm/scummvm/commit/638814d3c473cd527ecffeb7f535df7b94283873
Author: Johannes Schickel (lordhoto at scummvm.org)
Date: 2014-06-09T23:37:53+02:00

Commit Message:
BUILD: Remove USE_TERMCONV related bits in port.mk.

We don't have any TERMCONV feature anymore, thus no need to keep this around.

Changed paths:
    ports.mk



diff --git a/ports.mk b/ports.mk
index 306e0f0..b7b1925 100644
--- a/ports.mk
+++ b/ports.mk
@@ -156,10 +156,6 @@ ifdef USE_SPARKLE
 OSX_STATIC_LIBS += -framework Sparkle -F$(STATICLIBPATH)
 endif
 
-ifdef USE_TERMCONV
-OSX_ICONV ?= -liconv
-endif
-
 # Special target to create a static linked binary for Mac OS X.
 # We use -force_cpusubtype_ALL to ensure the binary runs on every
 # PowerPC machine.
@@ -167,8 +163,7 @@ scummvm-static: $(OBJS)
 	$(CXX) $(LDFLAGS) -force_cpusubtype_ALL -o scummvm-static $(OBJS) \
 		-framework CoreMIDI \
 		$(OSX_STATIC_LIBS) \
-		$(OSX_ZLIB) \
-		$(OSX_ICONV)
+		$(OSX_ZLIB)
 
 # Special target to create a static linked binary for the iPhone
 iphone: $(OBJS)






More information about the Scummvm-git-logs mailing list