Merge branch 'fix-gzip-makefile-failure' into 'master'
Fix gzip failing to compress SRB2's objdump on non-Windows. See merge request STJr/SRB2!1191
This commit is contained in:
commit
7952408c8e
|
@ -606,8 +606,9 @@ ifndef VALGRIND
|
||||||
ifndef NOOBJDUMP
|
ifndef NOOBJDUMP
|
||||||
@echo Dumping debugging info
|
@echo Dumping debugging info
|
||||||
$(OBJDUMP) $(OBJDUMP_OPTS) $(BIN)/$(EXENAME) > $(BIN)/$(DBGNAME).txt
|
$(OBJDUMP) $(OBJDUMP_OPTS) $(BIN)/$(EXENAME) > $(BIN)/$(DBGNAME).txt
|
||||||
|
ifdef WINDOWSHELL
|
||||||
-$(GZIP) $(GZIP_OPTS) $(BIN)/$(DBGNAME).txt
|
-$(GZIP) $(GZIP_OPTS) $(BIN)/$(DBGNAME).txt
|
||||||
ifndef WINDOWSHELL
|
else
|
||||||
-$(GZIP) $(GZIP_OPT2) $(BIN)/$(DBGNAME).txt
|
-$(GZIP) $(GZIP_OPT2) $(BIN)/$(DBGNAME).txt
|
||||||
endif
|
endif
|
||||||
endif
|
endif
|
||||||
|
@ -627,8 +628,9 @@ endif
|
||||||
reobjdump:
|
reobjdump:
|
||||||
@echo Redumping debugging info
|
@echo Redumping debugging info
|
||||||
$(OBJDUMP) $(OBJDUMP_OPTS) $(BIN)/$(DBGNAME) > $(BIN)/$(DBGNAME).txt
|
$(OBJDUMP) $(OBJDUMP_OPTS) $(BIN)/$(DBGNAME) > $(BIN)/$(DBGNAME).txt
|
||||||
|
ifdef WINDOWSHELL
|
||||||
-$(GZIP) $(GZIP_OPTS) $(BIN)/$(DBGNAME).txt
|
-$(GZIP) $(GZIP_OPTS) $(BIN)/$(DBGNAME).txt
|
||||||
ifndef WINDOWSHELL
|
else
|
||||||
-$(GZIP) $(GZIP_OPT2) $(BIN)/$(DBGNAME).txt
|
-$(GZIP) $(GZIP_OPT2) $(BIN)/$(DBGNAME).txt
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue