Makefiles: do not rely on /bin/true. define do_strip as a macro for debug and

non-debug cases and use it, instead. (adapted from tyrquake makefile.)


git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@141 af15c1b1-3010-417e-b628-4374ebc0bcbd
This commit is contained in:
Ozkan Sezer 2010-04-24 14:50:18 +00:00
parent 714cc395cf
commit 986fd86c79
4 changed files with 24 additions and 16 deletions

View file

@ -63,14 +63,16 @@ CFLAGS += $(CPUFLAGS)
ifneq ($(DEBUG),0) ifneq ($(DEBUG),0)
DFLAGS += -DDEBUG DFLAGS += -DDEBUG
CFLAGS += -g CFLAGS += -g
#STRIP_CMD := @echo "not stripping" do_strip=
STRIP_CMD := @/bin/true
else else
DFLAGS += -DNDEBUG DFLAGS += -DNDEBUG
CFLAGS += -O2 CFLAGS += -O2
CFLAGS += $(call check_gcc,-fweb,) CFLAGS += $(call check_gcc,-fweb,)
CFLAGS += $(call check_gcc,-frename-registers,) CFLAGS += $(call check_gcc,-frename-registers,)
STRIP_CMD := $(STRIP) cmd_strip=$(STRIP) $(1)
define do_strip
$(call cmd_strip,$(1));
endef
endif endif
### X11BASE only gets used if its in an unusual place ### X11BASE only gets used if its in an unusual place
@ -139,7 +141,7 @@ common.o gl_rlight.o host_cmd.o net_loop.o r_brush.o sv_main.o conb
quakespasm: $(OBJS) quakespasm: $(OBJS)
$(CC) $(CFLAGS) -o quakespasm $(OBJS) $(X11_LFLAGS) $(SDL_LFLAGS) $(LIBS) $(CC) $(CFLAGS) -o quakespasm $(OBJS) $(X11_LFLAGS) $(SDL_LFLAGS) $(LIBS)
$(STRIP_CMD) $@ $(call do_strip,$@)
release: quakespasm release: quakespasm
debug: debug:

View file

@ -69,14 +69,16 @@ CFLAGS += $(CPUFLAGS)
ifneq ($(DEBUG),0) ifneq ($(DEBUG),0)
DFLAGS += -DDEBUG DFLAGS += -DDEBUG
CFLAGS += -g CFLAGS += -g
#STRIP_CMD := @echo "not stripping" do_strip=
STRIP_CMD := @/bin/true
else else
DFLAGS += -DNDEBUG DFLAGS += -DNDEBUG
CFLAGS += -O2 CFLAGS += -O2
CFLAGS += $(call check_gcc,-fweb,) CFLAGS += $(call check_gcc,-fweb,)
CFLAGS += $(call check_gcc,-frename-registers,) CFLAGS += $(call check_gcc,-frename-registers,)
STRIP_CMD := $(STRIP) cmd_strip=$(STRIP) $(1)
define do_strip
$(call cmd_strip,$(1));
endef
endif endif
### X11BASE only gets used if its in an unusual place ### X11BASE only gets used if its in an unusual place
@ -147,7 +149,7 @@ common.o gl_rlight.o host_cmd.o net_loop.o r_brush.o sv_main.o conb
quakespasm: $(OBJS) quakespasm: $(OBJS)
$(CC) $(CFLAGS) -o quakespasm $(OBJS) $(X11_LFLAGS) $(SDL_LFLAGS) $(LIBS) $(CC) $(CFLAGS) -o quakespasm $(OBJS) $(X11_LFLAGS) $(SDL_LFLAGS) $(LIBS)
$(STRIP_CMD) $@ $(call do_strip,$@)
release: quakespasm release: quakespasm
debug: debug:

View file

@ -34,14 +34,16 @@ CFLAGS += $(CPUFLAGS)
ifneq ($(DEBUG),0) ifneq ($(DEBUG),0)
DFLAGS += -DDEBUG DFLAGS += -DDEBUG
CFLAGS += -g CFLAGS += -g
#STRIP_CMD := @echo "not stripping" do_strip=
STRIP_CMD := @/bin/true
else else
DFLAGS += -DNDEBUG DFLAGS += -DNDEBUG
CFLAGS += -O2 CFLAGS += -O2
CFLAGS += $(call check_gcc,-fweb,) CFLAGS += $(call check_gcc,-fweb,)
CFLAGS += $(call check_gcc,-frename-registers,) CFLAGS += $(call check_gcc,-frename-registers,)
STRIP_CMD := $(STRIP) cmd_strip=$(STRIP) $(1)
define do_strip
$(call cmd_strip,$(1));
endef
endif endif
SDL_CONFIG ?= sdl-config SDL_CONFIG ?= sdl-config
@ -93,7 +95,7 @@ QuakeSpasm.res
quakespasm.exe: $(OBJS) quakespasm.exe: $(OBJS)
$(CC) $(CFLAGS) -o quakespasm.exe $(OBJS) $(SDL_LFLAGS) $(LIBS) $(CC) $(CFLAGS) -o quakespasm.exe $(OBJS) $(SDL_LFLAGS) $(LIBS)
$(STRIP_CMD) quakespasm.exe $(call do_strip,$@)
release: quakespasm.exe release: quakespasm.exe
debug: debug:

View file

@ -34,14 +34,16 @@ CFLAGS += $(CPUFLAGS)
ifneq ($(DEBUG),0) ifneq ($(DEBUG),0)
DFLAGS += -DDEBUG DFLAGS += -DDEBUG
CFLAGS += -g CFLAGS += -g
#STRIP_CMD := @echo "not stripping" do_strip=
STRIP_CMD := @/bin/true
else else
DFLAGS += -DNDEBUG DFLAGS += -DNDEBUG
CFLAGS += -O2 CFLAGS += -O2
CFLAGS += $(call check_gcc,-fweb,) CFLAGS += $(call check_gcc,-fweb,)
CFLAGS += $(call check_gcc,-frename-registers,) CFLAGS += $(call check_gcc,-frename-registers,)
STRIP_CMD := $(STRIP) cmd_strip=$(STRIP) $(1)
define do_strip
$(call cmd_strip,$(1));
endef
endif endif
SDL_CONFIG ?= sdl-config SDL_CONFIG ?= sdl-config
@ -93,7 +95,7 @@ QuakeSpasm.res
quakespasm.exe: $(OBJS) quakespasm.exe: $(OBJS)
$(CC) $(CFLAGS) -o quakespasm.exe $(OBJS) $(SDL_LFLAGS) $(LIBS) $(CC) $(CFLAGS) -o quakespasm.exe $(OBJS) $(SDL_LFLAGS) $(LIBS)
$(STRIP_CMD) quakespasm.exe $(call do_strip,$@)
release: quakespasm.exe release: quakespasm.exe
debug: debug: