1 --- edgar-0.57/makefile~ 2010-05-26 18:37:35.000000000 +0200
2 +++ edgar-0.57/makefile 2010-05-27 09:52:00.852135096 +0200
6 PREFIX = $(DESTDIR)/usr
7 -BIN_DIR = $(PREFIX)/games/
8 +BIN_DIR = $(PREFIX)/bin/
9 DOC_DIR = $(PREFIX)/share/doc/$(PROG)/
10 ICON_DIR = $(PREFIX)/share/icons/hicolor/
11 DESKTOP_DIR = $(PREFIX)/share/applications/
13 DATA_DIR = $(PREFIX)/share/games/edgar/
17 -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)
18 -#CFLAGS = -Wall -Os -pedantic -DVERSION=$(VERSION) -DRELEASE=$(RELEASE) -DDEV=$(DEV) -DINSTALL_PATH=\"$(DATA_DIR)\" -DLOCALE_DIR=\"$(LOCALE_DIR)\" -DPAK_FILE=\"$(PAK_FILE)\"
20 -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)
22 +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)
24 ifeq ($(OS),Windows_NT)
25 LFLAGS = `sdl-config --libs` -lSDL -lSDL_image -lSDL_mixer -lSDL_ttf -lSDL_net -lz -llibintl -lm
27 all : $(PROG) makefile.dep $(ED_PROG) $(PAK_PROG) $(LOCALE_MO) $(PO_PROG)
29 makefile.dep : src/*/*.c src/*.c
30 - for i in src/*.c src/*/*.c; do gcc -MM "$${i}"; done > $@
31 + for i in src/*.c src/*/*.c; do $(CXX) -MM "$${i}"; done > $@
33 # compiling other source files.
37 # linking the program.
38 $(PROG): $(MAIN_OBJS) $(CORE_OBJS)
39 - $(CXX) $(MAIN_OBJS) $(CORE_OBJS) -o $(PROG) $(LFLAGS)
40 + $(CXX) $(LDFLAGS) $(MAIN_OBJS) $(CORE_OBJS) -o $(PROG) $(LFLAGS)
42 # linking the program.
43 $(ED_PROG): $(EDIT_OBJS) $(CORE_OBJS)
44 - $(CXX) $(EDIT_OBJS) $(CORE_OBJS) -o $(ED_PROG) $(LFLAGS)
45 + $(CXX) $(LDFLAGS) $(EDIT_OBJS) $(CORE_OBJS) -o $(ED_PROG) $(LFLAGS)
47 # linking the program.
48 $(PAK_PROG): $(PAK_OBJS)
49 - $(CXX) $(PAK_OBJS) -o $(PAK_PROG) $(LFLAGS)
50 + $(CXX) $(LDFLAGS) $(PAK_OBJS) -o $(PAK_PROG) $(LFLAGS)
52 # linking the program.
53 $(PO_PROG): $(PO_OBJS)
54 - $(CXX) $(PO_OBJS) -o $(PO_PROG) $(LFLAGS)
55 + $(CXX) $(LDFLAGS) $(PO_OBJS) -o $(PO_PROG) $(LFLAGS)
57 # linking the program.
58 $(TILE_PROG): $(TILE_OBJS)
59 - $(CXX) $(TILE_OBJS) -o $(TILE_PROG) $(LFLAGS)
60 + $(CXX) $(LDFLAGS) $(TILE_OBJS) -o $(TILE_PROG) $(LFLAGS)
62 # cleaning everything that can be automatically recreated with "make".