diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2017-10-29 11:22:34 +0000 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2017-10-29 11:22:34 +0000 |
| commit | bd7908c6630f38067350d396ac5d18c3cc2434a0 (patch) | |
| tree | 3559b3e11424f5529527f2474d8a977a91ee3389 /games-roguelike/stone-soup/files | |
| parent | 8b2628ad8526c806375e7b157889e4274b70248b (diff) | |
gentoo resync : 29.10.2017
Diffstat (limited to 'games-roguelike/stone-soup/files')
| -rw-r--r-- | games-roguelike/stone-soup/files/stone-soup-0.16.2-Use-pkg-config-for-linking-to-ncurses.patch | 4 | ||||
| -rw-r--r-- | games-roguelike/stone-soup/files/stone-soup-0.20.1-rltiles-ldflags-libs.patch | 45 |
2 files changed, 47 insertions, 2 deletions
diff --git a/games-roguelike/stone-soup/files/stone-soup-0.16.2-Use-pkg-config-for-linking-to-ncurses.patch b/games-roguelike/stone-soup/files/stone-soup-0.16.2-Use-pkg-config-for-linking-to-ncurses.patch index 0c029c9f0966..e0b676c3d2e7 100644 --- a/games-roguelike/stone-soup/files/stone-soup-0.16.2-Use-pkg-config-for-linking-to-ncurses.patch +++ b/games-roguelike/stone-soup/files/stone-soup-0.16.2-Use-pkg-config-for-linking-to-ncurses.patch @@ -18,12 +18,12 @@ index df51e70..2db2781 100644 ifdef LIBNCURSES_IS_UNICODE -NC_LIB = ncurses -NC_INCLUDE = $(NC_PREFIX)/include/ncurses -+NC_LIBS = $(shell $(PKGCONFIG) --lib ncurses 2>/dev/null || echo "-L$(NC_PREFIX)/lib -lncurses") ++NC_LIBS = $(shell $(PKGCONFIG) --libs ncurses 2>/dev/null || echo "-L$(NC_PREFIX)/lib -lncurses") +NC_CFLAGS = $(shell $(PKGCONFIG) --cflags ncurses 2>/dev/null || echo "-isystem $(NC_PREFIX)/include/ncurses") else -NC_LIB = ncursesw -NC_INCLUDE = $(NC_PREFIX)/include/ncursesw -+NC_LIBS = $(shell $(PKGCONFIG) --lib ncursesw || echo "-L$(NC_PREFIX)/lib -lncursesw") ++NC_LIBS = $(shell $(PKGCONFIG) --libs ncursesw || echo "-L$(NC_PREFIX)/lib -lncursesw") +NC_CFLAGS = $(shell $(PKGCONFIG) --cflags ncursesw 2>/dev/null || echo "-isystem $(NC_PREFIX)/include/ncursesw") endif diff --git a/games-roguelike/stone-soup/files/stone-soup-0.20.1-rltiles-ldflags-libs.patch b/games-roguelike/stone-soup/files/stone-soup-0.20.1-rltiles-ldflags-libs.patch new file mode 100644 index 000000000000..010c729b92eb --- /dev/null +++ b/games-roguelike/stone-soup/files/stone-soup-0.20.1-rltiles-ldflags-libs.patch @@ -0,0 +1,45 @@ +--- a/rltiles/Makefile ++++ b/rltiles/Makefile +@@ -1,7 +1,7 @@ + uname_S := $(shell uname -s) + + ifneq (,$(findstring MINGW,$(uname_S))) +-LDFLAGS += -lmingw32 ++LIBS += -lmingw32 + endif + + # Note: since generation of tiles is done on the host, we don't care about +@@ -29,7 +29,7 @@ + endif + + CFLAGS += $(PNG_INCLUDE) +- LDFLAGS += $(PNG_LIB) ++ LIBS += $(PNG_LIB) + + CFLAGS += -DUSE_TILE + endif +@@ -39,13 +39,13 @@ + endif + + ifneq (,$(findstring MINGW,$(uname_S))) +-LDFLAGS += -lgdi32 -lwinmm -lole32 -loleaut32 -limm32 -lshell32 -lversion -luuid ++LIBS += -lgdi32 -lwinmm -lole32 -loleaut32 -limm32 -lshell32 -lversion -luuid + endif + ifeq ($(uname_S),Darwin) +-LDFLAGS += -framework AppKit -framework AudioUnit -framework CoreAudio -framework ForceFeedback -framework Carbon -framework IOKit -framework OpenGL ++LIBS += -framework AppKit -framework AudioUnit -framework CoreAudio -framework ForceFeedback -framework Carbon -framework IOKit -framework OpenGL + endif + ifeq ($(uname_S),Linux) +-LDFLAGS += -ldl -lpthread ++LIBS += -ldl -lpthread + endif + + # Attempt to use a full compiler name, to make +@@ -134,6 +134,6 @@ + $(QUIET_HOSTCXX)$(HOSTCXX) $(CFLAGS) -MMD -c $< -o $@ + + $(TILEGEN): $(OBJECTS) +- $(QUIET_HOSTLINK)$(HOSTCXX) $(CFLAGS) $(OBJECTS) -o $@ $(LDFLAGS) ++ $(QUIET_HOSTLINK)$(HOSTCXX) $(CFLAGS) $(OBJECTS) -o $@ $(LDFLAGS) $(LIBS) + + .PHONY: all clean distclean |