diff options
Diffstat (limited to 'games-arcade/tomatoes/files')
3 files changed, 76 insertions, 0 deletions
diff --git a/games-arcade/tomatoes/files/tomatoes-1.55-c_str.patch b/games-arcade/tomatoes/files/tomatoes-1.55-c_str.patch new file mode 100644 index 000000000000..dd6927e54153 --- /dev/null +++ b/games-arcade/tomatoes/files/tomatoes-1.55-c_str.patch @@ -0,0 +1,24 @@ +--- src/config.cpp.orig 2004-09-27 11:35:48.000000000 +0200 ++++ src/config.cpp 2006-02-13 00:00:01.000000000 +0100 +@@ -78,6 +78,7 @@ + // makefile. + char *get_config_location(bool write) { + #ifdef LINUX ++ static char *config_path = NULL; + // Get the path to the config file + string tmp = get_tomatoes_dir() + "config.cfg"; + +@@ -90,8 +91,11 @@ + } + fclose(ftest); + } +- +- return (char*)tmp.c_str(); ++ if (!config_path) { ++ config_path = new char[tmp.length()+1]; ++ strcpy(config_path,tmp.c_str()); ++ } ++ return config_path; + #endif + + // Return the CONFIG_DIR diff --git a/games-arcade/tomatoes/files/tomatoes-1.55-gcc43.patch b/games-arcade/tomatoes/files/tomatoes-1.55-gcc43.patch new file mode 100644 index 000000000000..cd85e31e5936 --- /dev/null +++ b/games-arcade/tomatoes/files/tomatoes-1.55-gcc43.patch @@ -0,0 +1,14 @@ +--- src/config.cpp ++++ src/config.cpp +@@ -27,8 +27,9 @@ + + *************************************************************************/ + +-#include <stdio.h> +-#include <stdlib.h> ++#include <cstring> ++#include <cstdio> ++#include <cstdlib> + #include "config.h" + #include "init.h" + diff --git a/games-arcade/tomatoes/files/tomatoes-1.55-underlink.patch b/games-arcade/tomatoes/files/tomatoes-1.55-underlink.patch new file mode 100644 index 000000000000..c028c79ba4a7 --- /dev/null +++ b/games-arcade/tomatoes/files/tomatoes-1.55-underlink.patch @@ -0,0 +1,38 @@ +--- makefile.old 2011-06-18 17:35:38.947020335 +0200 ++++ makefile 2011-06-18 17:37:42.337811088 +0200 +@@ -48,7 +47,7 @@ + LDFLAGS = `sdl-config --libs` -lSDL_image -lSDL_mixer -lGL -lGLU -pg + else + CFLAGS = -MMD -O3 -march=$(MARCH) -Wall $(SDL_FLAGS) +-LDFLAGS = `sdl-config --libs` -lSDL_image -lSDL_mixer -lGL -lGLU -s ++LDLIBS = `sdl-config --libs` -lSDL_image -lSDL_mixer -lGL -lGLU -lm + endif + endif + +@@ -58,7 +57,7 @@ + OBJS := $(subst src/,obj/,$(OBJS)) + + # Include directories +-INCLUDES = -I./include ++INCLUDES = -I./include $(SDL_FLAGS) + + + # Targets +@@ -69,7 +68,7 @@ + -include $(DEPS) + + $(TARGET): $(OBJS) +- $(CC) -o $(TARGET) $(OBJS) $(LDFLAGS) ++ $(CXX) -o $(TARGET) $(OBJS) $(LDFLAGS) $(LDLIBS) + + clean: + rm -f $(OBJS) $(TARGET) +@@ -80,7 +79,7 @@ + rebuild: veryclean all + + obj/%.o: src/%.cpp +- $(CC) $(CFLAGS) $(INCLUDES) $(DIR_DEFINES) -c $< -o $@ ++ $(CXX) $(CXXFLAGS) $(INCLUDES) $(DIR_DEFINES) -c $< -o $@ + + # Compress the exe with UPX + compress: $(TARGET) |