[Scummvm-cvs-logs] SF.net SVN: scummvm:[53226] scummvm/trunk/engines/sword25

sev at users.sourceforge.net sev at users.sourceforge.net
Wed Oct 13 00:38:49 CEST 2010


Revision: 53226
          http://scummvm.svn.sourceforge.net/scummvm/?rev=53226&view=rev
Author:   sev
Date:     2010-10-12 22:38:49 +0000 (Tue, 12 Oct 2010)

Log Message:
-----------
SWORD25: Linking fixes.

Modified Paths:
--------------
    scummvm/trunk/engines/sword25/module.mk
    scummvm/trunk/engines/sword25/util/lua/lbaselib.c

Modified: scummvm/trunk/engines/sword25/module.mk
===================================================================
--- scummvm/trunk/engines/sword25/module.mk	2010-10-12 22:38:23 UTC (rev 53225)
+++ scummvm/trunk/engines/sword25/module.mk	2010-10-12 22:38:49 UTC (rev 53226)
@@ -102,10 +102,13 @@
 	util/pluto/pluto.o \
 	util/pluto/plzio.o
 
+# HACK. Use proper CC compiler here
 %.o: %.c
 	$(QUIET)$(MKDIR) $(*D)/$(DEPDIR)
-	$(QUIET_CXX)$(CXX) $(CXX_UPDATE_DEP_FLAG) $(CXXFLAGS) $(CPPFLAGS) -c $(<) -o $*.o
+	$(QUIET_CXX)gcc  $(CXX_UPDATE_DEP_FLAG) $(CXXFLAGS) $(CPPFLAGS) -c $(<) -o $*.o
 
+LIBS += -lpng
+
 # This module can be built as a plugin
 ifeq ($(ENABLE_SWORD25), DYNAMIC_PLUGIN)
 PLUGIN := 1

Modified: scummvm/trunk/engines/sword25/util/lua/lbaselib.c
===================================================================
--- scummvm/trunk/engines/sword25/util/lua/lbaselib.c	2010-10-12 22:38:23 UTC (rev 53225)
+++ scummvm/trunk/engines/sword25/util/lua/lbaselib.c	2010-10-12 22:38:49 UTC (rev 53226)
@@ -31,12 +31,10 @@
 // BS25
 // Aufruf der BS25 Log-Funktion
 // -----------------------------------------------------------------------------
-void BS_Log_C(const char* Message);
 static int luaB_print (lua_State *L) {
   int n = lua_gettop(L);  /* number of arguments */
   int i;
   lua_getglobal(L, "tostring");
-  BS_Log_C("LUA: ");
   for (i=1; i<=n; i++) {
     const char *s;
     lua_pushvalue(L, -1);  /* function to be called */
@@ -46,11 +44,8 @@
     if (s == NULL)
       return luaL_error(L, LUA_QL("tostring") " must return a string to "
                            LUA_QL("print"));
-    if (i>1) BS_Log_C("\t");
-    BS_Log_C(s);
     lua_pop(L, 1);  /* pop result */
   }
-  BS_Log_C("\n");
   return 0;
 }
 


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




More information about the Scummvm-git-logs mailing list