diff options
Diffstat (limited to 'games/stone-soup/patches/patch-source_Makefile')
| -rw-r--r-- | games/stone-soup/patches/patch-source_Makefile | 93 |
1 files changed, 0 insertions, 93 deletions
diff --git a/games/stone-soup/patches/patch-source_Makefile b/games/stone-soup/patches/patch-source_Makefile deleted file mode 100644 index adc2a3c..0000000 --- a/games/stone-soup/patches/patch-source_Makefile +++ /dev/null | |||
| @@ -1,93 +0,0 @@ | |||
| 1 | Index: source/Makefile | ||
| 2 | --- source/Makefile.orig | ||
| 3 | +++ source/Makefile | ||
| 4 | @@ -260,9 +260,6 @@ ifdef msys | ||
| 5 | BUILD_LIBPNG = YesPlease | ||
| 6 | COPY_FONTS = yes | ||
| 7 | endif | ||
| 8 | - ifeq ($(shell gcc -v -static -static-libstdc++ 2>&1 | grep 'unrecognized option'),) | ||
| 9 | - EXTRA_LIBS += -static -static-libgcc -static-libstdc++ | ||
| 10 | - endif | ||
| 11 | endif | ||
| 12 | ifeq ($(uname_S),Darwin) | ||
| 13 | ifdef MAC_TARGET | ||
| 14 | @@ -371,11 +368,8 @@ endif | ||
| 15 | # | ||
| 16 | ifndef NO_APPLE_PLATFORM | ||
| 17 | ifeq ($(uname_S),Darwin) | ||
| 18 | -ifneq ($(shell gcc -v 2>&1 | grep Apple),) | ||
| 19 | -APPLE_PLATFORM = YesPlease | ||
| 20 | endif | ||
| 21 | endif | ||
| 22 | -endif | ||
| 23 | |||
| 24 | |||
| 25 | ifdef WIN32 | ||
| 26 | @@ -501,15 +495,7 @@ ifneq ($(GCC_VER),) | ||
| 27 | GCC_VER_SUFFIX:=-$(GCC_VER) | ||
| 28 | endif | ||
| 29 | |||
| 30 | -# Attempt to use a full compiler name, to make | ||
| 31 | -# distcc builds work nicely. | ||
| 32 | -LMACH := $(shell gcc -dumpmachine)- | ||
| 33 | -ifeq ($(LMACH),-) | ||
| 34 | LMACH := | ||
| 35 | -endif | ||
| 36 | -ifeq ($(shell which $(LMACH)gcc$(GCC_VER_SUFFIX) > /dev/null 2> /dev/null && echo "Yes"),) | ||
| 37 | -LMACH := | ||
| 38 | -endif | ||
| 39 | |||
| 40 | ifneq ($(FORCE_CC),) | ||
| 41 | GCC := $(FORCE_CC) | ||
| 42 | @@ -1151,51 +1137,6 @@ ifndef NO_OPTIMIZE | ||
| 43 | endif | ||
| 44 | endif | ||
| 45 | endif | ||
| 46 | -endif | ||
| 47 | - | ||
| 48 | -ifdef BUILD_PCRE | ||
| 49 | -CONTRIBS += pcre | ||
| 50 | -CONTRIB_LIBS += $(LIBPCRE) | ||
| 51 | -endif | ||
| 52 | -ifdef BUILD_FREETYPE | ||
| 53 | -CONTRIBS += freetype | ||
| 54 | -CONTRIB_LIBS += $(LIBFREETYPE) | ||
| 55 | -endif | ||
| 56 | -ifdef BUILD_LIBPNG | ||
| 57 | -CONTRIBS += libpng | ||
| 58 | -CONTRIB_LIBS := $(LIBPNG) $(CONTRIB_LIBS) | ||
| 59 | -endif | ||
| 60 | -ifdef BUILD_SDL2 | ||
| 61 | -CONTRIBS += sdl2 | ||
| 62 | -CONTRIB_LIBS := $(LIBSDL2) $(CONTRIB_LIBS) | ||
| 63 | -ifeq ($(uname_S),Linux) | ||
| 64 | -LIBS += -ldl -lrt | ||
| 65 | -endif | ||
| 66 | -endif | ||
| 67 | -ifdef BUILD_SDL2IMAGE | ||
| 68 | -CONTRIBS += sdl2-image | ||
| 69 | -CONTRIB_LIBS := $(LIBSDL2IMAGE) $(CONTRIB_LIBS) | ||
| 70 | -endif | ||
| 71 | -ifdef BUILD_SDL2MIXER | ||
| 72 | -CONTRIBS += sdl2-mixer | ||
| 73 | -CONTRIB_LIBS := $(LIBSDL2MIXER) $(CONTRIB_LIBS) | ||
| 74 | -endif | ||
| 75 | -ifdef BUILD_ZLIB | ||
| 76 | -CONTRIBS += zlib | ||
| 77 | -CONTRIB_LIBS += $(LIBZ) | ||
| 78 | -endif | ||
| 79 | -ifdef BUILD_LUA | ||
| 80 | -ifdef USE_LUAJIT | ||
| 81 | -CONTRIBS += luajit/src | ||
| 82 | -CFOTHER_L += -DUSE_LUAJIT | ||
| 83 | -else | ||
| 84 | -CONTRIBS += lua/src | ||
| 85 | -endif | ||
| 86 | -CONTRIB_LIBS += $(LIBLUA) | ||
| 87 | -endif | ||
| 88 | -ifdef BUILD_SQLITE | ||
| 89 | -CONTRIBS += sqlite | ||
| 90 | -CONTRIB_LIBS += $(LIBSQLITE) | ||
| 91 | endif | ||
| 92 | |||
| 93 | EXTRA_OBJECTS += version.o | ||
