diff options
| -rw-r--r-- | Dalos/Dalos.cc | 10 | ||||
| -rw-r--r-- | cd-tool.cpp | 6 | ||||
| -rw-r--r-- | compile/linux/Makefile | 14 | ||||
| -rw-r--r-- | lib/cdreader.cpp | 14 | ||||
| -rw-r--r-- | luapatch.cpp | 6 |
5 files changed, 28 insertions, 22 deletions
diff --git a/Dalos/Dalos.cc b/Dalos/Dalos.cc index b7c201a..88171c4 100644 --- a/Dalos/Dalos.cc +++ b/Dalos/Dalos.cc @@ -17,7 +17,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -/* $Id: Dalos.cc,v 1.18 2005-06-20 22:43:35 pixel Exp $ */ +/* $Id: Dalos.cc,v 1.19 2005-10-13 16:00:37 pixel Exp $ */ #include <SDL.h> #include <SDL_thread.h> @@ -90,8 +90,8 @@ class threaded_locker : public locker_t { SDL_mutex * mutex; }; -static int lua_print(lua_State * _L) { - Lua * L = Lua::find(_L); +static int lua_print(lua_State * __L) { + Lua * L = Lua::find(__L); String t = L->tostring() + "\n"; char * tc = t.strdup(); @@ -102,10 +102,10 @@ static int lua_print(lua_State * _L) { return 0; } -static void lua_hook(lua_State * _L, lua_Debug * ar) { +static void lua_hook(lua_State * __L, lua_Debug * ar) { if (!lua_started) return; - Lua * L = Lua::find(_L); + Lua * L = Lua::find(__L); if (do_lua_break) { L->do_break(); diff --git a/cd-tool.cpp b/cd-tool.cpp index 16e24f0..8161e39 100644 --- a/cd-tool.cpp +++ b/cd-tool.cpp @@ -17,7 +17,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -/* $Id: cd-tool.cpp,v 1.43 2005-04-03 19:39:06 pixel Exp $ */ +/* $Id: cd-tool.cpp,v 1.44 2005-10-13 16:00:37 pixel Exp $ */ #define WIP @@ -156,8 +156,8 @@ bool interactive = false; cdutils * cdutil = 0; isobuilder * build = 0; -static int myprint(lua_State * _L) { - Lua * L = Lua::find(_L); +static int myprint(lua_State * __L) { + Lua * L = Lua::find(__L); String t = "From LUA: " + L->tostring() + "\n"; char * tc = t.strdup(); diff --git a/compile/linux/Makefile b/compile/linux/Makefile index d0443c6..615466f 100644 --- a/compile/linux/Makefile +++ b/compile/linux/Makefile @@ -1,7 +1,7 @@ -CC = gcc -CXX = g++ -LD = g++ -STRIP = strip --strip-all +CC = i686-pc-linux-gcc +CXX = i686-pc-linux-g++ +LD = i686-pc-linux-g++ +STRIP = i686-pc-linux-strip --strip-all INCLUDES = -I../../includes -I../../psxdev -I../../generic/include \ -I../../generic/lib/zlib/include \ @@ -12,7 +12,7 @@ INCLUDES = -I../../includes -I../../psxdev -I../../generic/include \ CPPFLAGS = $(INCLUDES) -O4 -march=i686 -DSTDC_HEADERS -DREADLINE_STATIC -DHAVE_UNISTD_H -fexceptions -LDFLAGS = -march=i586 -O4 `sdl-config --libs` +LDFLAGS = -march=i686 -O4 `sdl-config --libs` SOURCES = \ ../../Dalos/Dalos.cc ../../cd-tool.cpp @@ -133,12 +133,12 @@ clean: define OBJECT_C_template - $(addsuffix .o, $(notdir $(basename $(1)))): $(src) +$(addsuffix .o, $(notdir $(basename $(1)))): $(src) $$(CC) $$(CPPFLAGS) $$(CFLAGS) -c $(src) endef define OBJECT_CXX_template - $(addsuffix .o, $(notdir $(basename $(1)))): $(src) +$(addsuffix .o, $(notdir $(basename $(1)))): $(src) $$(CXX) $$(CPPFLAGS) $$(CXXFLAGS) -c $(src) endef diff --git a/lib/cdreader.cpp b/lib/cdreader.cpp index af1b419..3d0a2c4 100644 --- a/lib/cdreader.cpp +++ b/lib/cdreader.cpp @@ -17,7 +17,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -/* $Id: cdreader.cpp,v 1.21 2004-11-27 21:47:56 pixel Exp $ */ +/* $Id: cdreader.cpp,v 1.22 2005-10-13 16:00:37 pixel Exp $ */ #include <stdio.h> #include <string.h> @@ -246,9 +246,7 @@ void cdreader::getsector(void *buf, int sec, int nb) throw (GeneralException) { sector += nb; } -#endif - -#if defined (_MSC_VER) || defined (__MINGW32__) +#elif defined (_MSC_VER) || defined (__MINGW32__) cdreader::cdreader(const String & no) throw (GeneralException) : Handle(-1), n(no), sector(0) { if (!(hFile = cdabstract::OpenIOCTLFile(no[0]))) @@ -330,5 +328,13 @@ void cdreader::getsector(void *buf, int sec, int nb) throw (GeneralException) { sector += nb; } +#else +cdreader::cdreader(const String & no) throw (GeneralException) : Handle(-1) { + throw GeneralException("No support for cdreader on this platform."); +} + +void cdreader::getsector(void *buf, int sec, int nb) throw (GeneralException) { + throw GeneralException("Stop insisting... you. just. can't."); +} #endif diff --git a/luapatch.cpp b/luapatch.cpp index 8208a20..84a8d52 100644 --- a/luapatch.cpp +++ b/luapatch.cpp @@ -17,7 +17,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -/* $Id: luapatch.cpp,v 1.12 2004-12-23 02:32:54 pixel Exp $ */ +/* $Id: luapatch.cpp,v 1.13 2005-10-13 16:00:37 pixel Exp $ */ #define PARASITE_EVE_INI \ "[patch]\n" \ @@ -133,8 +133,8 @@ String source, dest, patch; int langid; CODE_BEGINS -static int myprint(lua_State * _L) { - Lua * L = Lua::find(_L); +static int myprint(lua_State * __L) { + Lua * L = Lua::find(__L); String t = L->tostring(); char * tc = t.strdup(); |