diff options
| author | Eugene Sandulenko | 2010-08-13 15:24:13 +0000 |
|---|---|---|
| committer | Eugene Sandulenko | 2010-10-12 22:38:49 +0000 |
| commit | d50dcb80ad44465745a38ea42bd87db9480db949 (patch) | |
| tree | 469aab65bdaaf43323b9cd68c004212e1fb4d3eb | |
| parent | ad5b74c9de1eb3d6eda91e1bf21b24c87a78391e (diff) | |
| download | scummvm-rg350-d50dcb80ad44465745a38ea42bd87db9480db949.tar.gz scummvm-rg350-d50dcb80ad44465745a38ea42bd87db9480db949.tar.bz2 scummvm-rg350-d50dcb80ad44465745a38ea42bd87db9480db949.zip | |
SWORD25: Linking fixes.
svn-id: r53226
| -rw-r--r-- | engines/sword25/module.mk | 5 | ||||
| -rw-r--r-- | engines/sword25/util/lua/lbaselib.c | 5 |
2 files changed, 4 insertions, 6 deletions
diff --git a/engines/sword25/module.mk b/engines/sword25/module.mk index 62e3c8e200..47b8c01d3b 100644 --- a/engines/sword25/module.mk +++ b/engines/sword25/module.mk @@ -102,9 +102,12 @@ MODULE_OBJS := \ 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) diff --git a/engines/sword25/util/lua/lbaselib.c b/engines/sword25/util/lua/lbaselib.c index 20d7f62845..8b461d998b 100644 --- a/engines/sword25/util/lua/lbaselib.c +++ b/engines/sword25/util/lua/lbaselib.c @@ -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 @@ static int luaB_print (lua_State *L) { 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; } |