diff options
| author | Robin Haberkorn <robin.haberkorn@googlemail.com> | 2015-09-22 04:11:09 +0200 |
|---|---|---|
| committer | Robin Haberkorn <robin.haberkorn@googlemail.com> | 2015-09-22 04:11:09 +0200 |
| commit | bdc80bdcafcc56627e91b8fd89578fec8921eb3a (patch) | |
| tree | bff02f231e2bf2cc8996775070dfdf75045b743b /fheroes2/patches | |
| parent | 2b78636c61184f9bcc5f8907c26a83da4e39f0c1 (diff) | |
| download | nanonote-ports-bdc80bdcafcc56627e91b8fd89578fec8921eb3a.tar.gz | |
updated fheroes2 package to r3277
Diffstat (limited to 'fheroes2/patches')
| -rw-r--r-- | fheroes2/patches/0001-crosscompile.patch | 19 | ||||
| -rw-r--r-- | fheroes2/patches/001-crosscompile.patch | 20 |
2 files changed, 19 insertions, 20 deletions
diff --git a/fheroes2/patches/0001-crosscompile.patch b/fheroes2/patches/0001-crosscompile.patch new file mode 100644 index 0000000..364d1e8 --- /dev/null +++ b/fheroes2/patches/0001-crosscompile.patch @@ -0,0 +1,19 @@ +--- a/src/Makefile 2015-09-22 03:47:13.777305599 +0200 ++++ b/src/Makefile 2015-09-22 03:48:24.565303557 +0200 +@@ -12,7 +12,7 @@ + SDL_FLAGS := $(shell sdl-config --cflags) + endif + +-CFLAGS := $(CFLAGS) -Wall -fsigned-char ++CFLAGS := $(CFLAGS) $(CPPFLAGS) -Wall -fsigned-char + LDFLAGS := $(LDFLAGS) + LIBS := + +--- a/src/Makefile.all 2015-09-22 03:49:00.833302511 +0200 ++++ b/src/Makefile.all 2015-09-22 03:49:12.929302162 +0200 +@@ -1,4 +1,4 @@ +-AR := ar ++AR ?= ar + + ifndef CXX + CXX := g++ diff --git a/fheroes2/patches/001-crosscompile.patch b/fheroes2/patches/001-crosscompile.patch deleted file mode 100644 index ad1f5c2..0000000 --- a/fheroes2/patches/001-crosscompile.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- a/src/Makefile 2010-10-02 21:43:52.099078234 +0200 -+++ b/src/Makefile 2010-10-02 23:46:44.197838553 +0200 -@@ -6,8 +6,8 @@ - SDL_LIBS := $(shell sdl-config --libs) - SDL_FLAGS := $(shell sdl-config --cflags) - --CFLAGS := $(CFLAGS) -Wall -fsigned-char -DWITH_KEYMAPPING --LDFLAGS := -+CFLAGS := $(CFLAGS) $(CPPFLAGS) -Wall -fsigned-char -DWITH_KEYMAPPING -+LDFLAGS := $(LDFLAGS) - LIBS := - - ifdef DEBUG ---- a/src/Makefile.unix 2010-10-02 21:43:38.669081686 +0200 -+++ b/src/Makefile.unix 2010-10-02 21:43:47.457845197 +0200 -@@ -1,2 +1,2 @@ --AR := ar --CXX := g++ -+AR ?= ar -+CXX ?= g++ |