diff options
| author |   Michael Sterrett <mr_bones_@gentoo.org> | 2016-03-15 12:58:33 -0400 |
|---|---|---|
| committer | Michael Sterrett <mr_bones_@gentoo.org> | 2016-03-15 23:57:33 -0400 |
| commit | 42e839df24c6af7caa3e986227cfa1ccf7e2c065 (patch) | |
| tree | d4869cb3324ca1f142a0d002b9f7a04280f36ca9 /games-roguelike/tomenet/files | |
| parent | games-strategy/freeciv: clean old (diff) | |
| download | gentoo-42e839df24c6af7caa3e986227cfa1ccf7e2c065.tar.gz gentoo-42e839df24c6af7caa3e986227cfa1ccf7e2c065.tar.bz2 gentoo-42e839df24c6af7caa3e986227cfa1ccf7e2c065.zip | |
games-roguelike/tomenet: clean old
Package-Manager: portage-2.2.26
Diffstat (limited to 'games-roguelike/tomenet/files')
| -rw-r--r-- | games-roguelike/tomenet/files/tomenet-4.6.0-makefile.patch | 75 |
1 files changed, 0 insertions, 75 deletions
diff --git a/games-roguelike/tomenet/files/tomenet-4.6.0-makefile.patch b/games-roguelike/tomenet/files/tomenet-4.6.0-makefile.patch deleted file mode 100644 index 0dc9fb8171c3..000000000000 --- a/games-roguelike/tomenet/files/tomenet-4.6.0-makefile.patch +++ /dev/null @@ -1,75 +0,0 @@ ---- tomenet-4.5.9.orig/src/makefile -+++ tomenet-4.5.9/src/makefile -@@ -203,7 +203,7 @@ - # - # This is my compiler of choice, it seems to work most everywhere - # --CC = gcc -+CC ?= gcc - - # For allowing #if..#else..#endif constructs in LUA files - C. Blue - # Note: The flags must contain -@@ -215,16 +215,26 @@ - # need to use the gcc invocation below instead. - # - # cpp variant: --CPP = cpp --CPPFLAGS = -C -P -+#CPP = cpp -+#CPPFLAGS = -C -P - # gcc variant: --#CPP = gcc --#CPPFLAGS = -x c -E -Wp,-C,-P -+CPP ?= gcc -+CPPFLAGS = -x c -E -Wp,-C,-P - - - # For variations with X11 - X11BASE = /usr/X11R6 - -+# defines -+ifdef USE_SDL -+CFLAGS += -DSOUND_SDL $(shell sdl-config --cflags) -+SDL_LIBS = $(shell sdl-config --libs) -lSDL_mixer -+endif -+ -+ifdef USE_X -+CFLAGS += -I${X11BASE}/include -DUSE_X11 -+LIBS += -L${X11BASE}/lib -lX11 -+endif - - ## - ## Standard version -- supports X11 (main-x11.c) -@@ -234,8 +244,11 @@ - # "CFLAGS", if your machine places files in a weird location. - # - ## With SDL --#CFLAGS = -g -pipe -Wall -DUSE_X11 -I${X11BASE}/include -D_XOPEN_SOURCE -D_BSD_SOURCE -DMEXP=19937 -DSOUND_SDL `sdl-config --cflags` --#LIBS = -L${X11BASE}/lib -L/usr/pkg/lib -lX11 -lcrypt -lm `sdl-config --libs` -lSDL_mixer -+ -+CFLAGS += -Wall -+CFLAGS += -DUSE_GCU -D_XOPEN_SOURCE -D_BSD_SOURCE -DMEXP=19937 -+LIBS += -L/usr/pkg/lib $(shell ${PKG_CONFIG} --libs ncurses) -lcrypt -lm ${SDL_LIBS} -+ - ## - ## Without SDL - #CFLAGS = -g -pipe -Wall -DUSE_X11 -I${X11BASE}/include -D_XOPEN_SOURCE -D_BSD_SOURCE -DMEXP=19937 -@@ -257,7 +270,7 @@ - # - ## With SDL - CFLAGS = -g -pipe -Wall -DUSE_X11 -DUSE_GCU -I${X11BASE}/include -D_XOPEN_SOURCE -D_BSD_SOURCE -DMEXP=19937 -DSOUND_SDL `sdl-config --cflags` -D_DEFAULT_SOURCE -DACC32 --LIBS = -L${X11BASE}/lib -L/usr/pkg/lib -lX11 -lncurses -lcrypt -lm `sdl-config --libs` -lSDL_mixer -+LIBS = -L${X11BASE}/lib -L/usr/pkg/lib -lX11 $(shell ${PKG_CONFIG} --libs ncurses) -lcrypt -lm $(shell sdl-config --libs) -lSDL_mixer - ## - ## Without SDL - #CFLAGS = -g -pipe -Wall -DUSE_X11 -DUSE_GCU -I${X11BASE}/include -D_XOPEN_SOURCE -D_BSD_SOURCE -DMEXP=19937 -@@ -357,9 +370,6 @@ - # Compile a client with 'test client' version/tag - tomenet.test: CFLAGS += -DTEST_CLIENT -O0 - --# Normal release build --tomenet: CFLAGS += -O2 -- - - # Lua - SRCS += $(LUASRCS) |