[Scummvm-cvs-logs] SF.net SVN: scummvm:[46637] tools/branches/gsoc2009-gui

[lordhoto at users.sourceforge.net]

Revision: 46637
          http://scummvm.svn.sourceforge.net/scummvm/?rev=46637&view=rev
Author:   lordhoto
Date:     2009-12-27 12:59:44 +0000 (Sun, 27 Dec 2009)

Log Message:
-----------
Fix compilation of create_sjisfnt.

Modified Paths:
--------------
    tools/branches/gsoc2009-gui/Makefile.common
    tools/branches/gsoc2009-gui/create_sjisfnt.cpp

Modified: tools/branches/gsoc2009-gui/Makefile.common
===================================================================
--- tools/branches/gsoc2009-gui/Makefile.common	2009-12-27 12:56:14 UTC (rev 46636)
+++ tools/branches/gsoc2009-gui/Makefile.common	2009-12-27 12:59:44 UTC (rev 46637)
@@ -138,9 +138,9 @@
 
 
 create_sjisfnt_OBJS := create_sjisfnt.o $(UTILS)
-create_sjisfnt_LIBS := `freetype-config --libs` -liconv
+create_sjisfnt_LIBS := `freetype-config --libs` #-liconv # TODO: Some systems seem to require "iconv" to be linked, we need to handle that...
 # Set custom build flags
-create_sjisfnt.o: CPPFLAGS+=`pkg-config --cflags gtk+-2.0`
+create_sjisfnt.o: CPPFLAGS+=`freetype-config --cflags`
 
 
 sword2_clue_OBJS := engines/sword2/sword2_clue.o

Modified: tools/branches/gsoc2009-gui/create_sjisfnt.cpp
===================================================================
--- tools/branches/gsoc2009-gui/create_sjisfnt.cpp	2009-12-27 12:56:14 UTC (rev 46636)
+++ tools/branches/gsoc2009-gui/create_sjisfnt.cpp	2009-12-27 12:59:44 UTC (rev 46637)
@@ -337,7 +337,8 @@
 
 	size_t inBufSize = sizeof(inBuf);
 	size_t outBufSize = sizeof(outBuf);
-	const char *inBufWrap = inBuf;
+	// This need to be "char *", because iconv requires the second parameter to be "char **" (at least on Linux).
+	char *inBufWrap = inBuf;
 	char *outBufWrap = outBuf;
 
 	if (iconv(confSetup, &inBufWrap, &inBufSize, &outBufWrap, &outBufSize) == (size_t)-1)


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.