diff options
| author | madget | 2011-05-20 19:35:10 (GMT) |
|---|---|---|
| committer | cvs2git | 2012-06-24 12:13:13 (GMT) |
| commit | 4165e334dfd8f4eeb6db79dc73f1bfb06ed32607 (patch) | |
| tree | e611222e9e8fd439536b204a5b7b36054ff26cd9 | |
| parent | 84e2476e7eb5acd9b29ed9ee63d64bdac868b93a (diff) | |
| download | edgar-4165e334dfd8f4eeb6db79dc73f1bfb06ed32607.zip edgar-4165e334dfd8f4eeb6db79dc73f1bfb06ed32607.tar.gz | |
- updated for 0.85
Changed files:
edgar-makefile.patch -> 1.9
| -rw-r--r-- | edgar-makefile.patch | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/edgar-makefile.patch b/edgar-makefile.patch index abbdd2e..1b8c494 100644 --- a/edgar-makefile.patch +++ b/edgar-makefile.patch @@ -1,5 +1,5 @@ ---- edgar-0.72/makefile~ 2010-10-02 20:11:24.000000000 +0200 -+++ edgar-0.72/makefile 2010-10-05 10:56:40.559985331 +0200 +--- edgar-0.85/makefile.orig 2011-05-16 22:00:04.000000000 +0200 ++++ edgar-0.85/makefile 2011-05-20 21:09:49.046666675 +0200 @@ -24,7 +24,7 @@ CXX = gcc @@ -17,23 +17,23 @@ -CFLAGS = -Wall -g -pedantic -Werror -DVERSION=$(VERSION) -DRELEASE=$(RELEASE) -DDEV=$(DEV) -DINSTALL_PATH=\"$(DATA_DIR)\" -DLOCALE_DIR=\"$(LOCALE_DIR)\" -DPAK_FILE=\"$(PAK_FILE)\" -DMEDAL_SERVER_HOST=\"$(MEDAL_SERVER_HOST)\" -DMEDAL_SERVER_PORT=$(MEDAL_SERVER_PORT) -#CFLAGS = -Wall -O2 -pedantic -DVERSION=$(VERSION) -DRELEASE=$(RELEASE) -DDEV=$(DEV) -DINSTALL_PATH=\"$(DATA_DIR)\" -DLOCALE_DIR=\"$(LOCALE_DIR)\" -DPAK_FILE=\"$(PAK_FILE)\" -DMEDAL_SERVER_HOST=\"$(MEDAL_SERVER_HOST)\" -DMEDAL_SERVER_PORT=$(MEDAL_SERVER_PORT) -else --CFLAGS = -Wall -pedantic -DVERSION=$(VERSION) -DRELEASE=$(RELEASE) -DDEV=$(DEV) -DINSTALL_PATH=\"$(DATA_DIR)\" -DLOCALE_DIR=\"$(LOCALE_DIR)\" -DPAK_FILE=\"$(PAK_FILE)\" -DMEDAL_SERVER_HOST=\"$(MEDAL_SERVER_HOST)\" -DMEDAL_SERVER_PORT=$(MEDAL_SERVER_PORT) +-CFLAGS = -Wall -O2 -pedantic -DVERSION=$(VERSION) -DRELEASE=$(RELEASE) -DDEV=$(DEV) -DINSTALL_PATH=\"$(DATA_DIR)\" -DLOCALE_DIR=\"$(LOCALE_DIR)\" -DPAK_FILE=\"$(PAK_FILE)\" -DMEDAL_SERVER_HOST=\"$(MEDAL_SERVER_HOST)\" -DMEDAL_SERVER_PORT=$(MEDAL_SERVER_PORT) -#CFLAGS = -Wall -Os -pedantic -DVERSION=$(VERSION) -DRELEASE=$(RELEASE) -DDEV=$(DEV) -DINSTALL_PATH=\"$(DATA_DIR)\" -DLOCALE_DIR=\"$(LOCALE_DIR)\" -DPAK_FILE=\"$(PAK_FILE)\" -DMEDAL_SERVER_HOST=\"$(MEDAL_SERVER_HOST)\" -DMEDAL_SERVER_PORT=$(MEDAL_SERVER_PORT) -endif +CFLAGS = $(OPTFLAGS) -DVERSION=$(VERSION) -DRELEASE=$(RELEASE) -DDEV=$(DEV) -DINSTALL_PATH=\"$(DATA_DIR)\" -DLOCALE_DIR=\"$(LOCALE_DIR)\" -DPAK_FILE=\"$(PAK_FILE)\" -DMEDAL_SERVER_HOST=\"$(MEDAL_SERVER_HOST)\" -DMEDAL_SERVER_PORT=$(MEDAL_SERVER_PORT) ifeq ($(OS),Windows_NT) LFLAGS = `sdl-config --libs` -lSDL -lSDL_image -lSDL_mixer -lSDL_ttf -lSDL_net -lz -llibintl -lm -@@ -97,7 +91,7 @@ +@@ -102,7 +96,7 @@ all : $(PROG) makefile.dep $(ED_PROG) $(PAK_PROG) $(LOCALE_MO) $(PO_PROG) - makefile.dep : src/*/*.c src/*.c + makefile.dep : src/*/*.h src/*.h - for i in src/*.c src/*/*.c; do gcc -MM "$${i}"; done > $@ + for i in src/*.c src/*/*.c; do $(CXX) -MM "$${i}"; done > $@ # compiling other source files. %.o: -@@ -108,23 +102,23 @@ +@@ -113,23 +107,23 @@ # linking the program. $(PROG): $(MAIN_OBJS) $(CORE_OBJS) |