1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67
|
Description: Apply external build flags
Author: Stephen Kitt <skitt@debian.org>
--- a/src/game_em/Makefile
+++ b/src/game_em/Makefile
@@ -56,7 +56,7 @@
$(RANLIB) $(GAME_EM)
.c.o:
- $(CC) $(PROFILING) $(CFLAGS) -c $*.c
+ $(CC) $(CPPFLAGS) $(PROFILING) $(CFLAGS) -c $*.c
clean:
$(RM) $(OBJS)
--- a/src/game_sp/Makefile
+++ b/src/game_sp/Makefile
@@ -82,7 +82,7 @@
$(RANLIB) $(GAME_SP)
.c.o:
- $(CC) $(PROFILING) $(CFLAGS) -c $*.c
+ $(CC) $(CPPFLAGS) $(PROFILING) $(CFLAGS) -c $*.c
clean:
$(RM) $(OBJS)
--- a/src/libgame/Makefile
+++ b/src/libgame/Makefile
@@ -53,7 +53,7 @@
$(RANLIB) $(LIBGAME)
.c.o:
- $(CC) $(PROFILING) $(CFLAGS) -c $*.c
+ $(CC) $(CPPFLAGS) $(PROFILING) $(CFLAGS) -c $*.c
clean:
$(RM) $(OBJS)
--- a/src/Makefile
+++ b/src/Makefile
@@ -108,7 +108,7 @@
# OPTIONS = $(DEBUG) -Wall # only for debugging purposes
# OPTIONS = $(DEBUG) -O3 -Wall # only for debugging purposes
# OPTIONS = $(DEBUG) -Wall # only for debugging purposes
-OPTIONS = $(DEBUG) -Wall -Wstrict-prototypes -Wmissing-prototypes
+# OPTIONS = $(DEBUG) -Wall -Wstrict-prototypes -Wmissing-prototypes
# OPTIONS = $(DEBUG) -Wall -ansi -pedantic # only for debugging purposes
# OPTIONS = -O3 -Wall -ansi -pedantic
# OPTIONS = -O3 -Wall
@@ -120,8 +120,8 @@
OPTIONS = -O3 -Wall
endif
-CFLAGS = $(OPTIONS) $(SYS_CFLAGS) $(EXTRA_CFLAGS) $(CONFIG)
-LDFLAGS = $(SYS_LDFLAGS) $(EXTRA_LDFLAGS) -lm
+CFLAGS += $(OPTIONS) $(SYS_CFLAGS) $(EXTRA_CFLAGS) $(CONFIG)
+LDFLAGS += $(SYS_LDFLAGS) $(EXTRA_LDFLAGS) -lm
SRCS = main.c \
@@ -278,7 +278,7 @@
echo "$(ICONBASE) ICON $(ICONBASE).ico" | $(WINDRES) -o $(ICON)
.c.o:
- $(CC) $(PROFILING) $(CFLAGS) -c $*.c
+ $(CC) $(CPPFLAGS) $(PROFILING) $(CFLAGS) -c $*.c
graphics_dir:
@test -f $(GRAPHICS_DIR)/Makefile && $(MAKE) -C $(GRAPHICS_DIR) || true
|