stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2024-11-14 00:40:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

Makefile

Browse source 
Also allow overwrite of OBJCOPY, OBJDUMP and WINDRES
This commit is contained in:
Alam Ed Arias 2023-10-12 19:40:35 -04:00
parent 5449ca2dbf
commit 4e2324216d
3 changed files with 38 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
.gitlab-ci.yml
View file

@ -78,7 +78,7 @@ build-i686-linux-gnu:
- export OBJDUMP=i686-linux-gnu-objdump - export OBJDUMP=i686-linux-gnu-objdump
- export PKG_CONFIG_PATH=/usr/lib/i386-linux-gnu/pkgconfig - export PKG_CONFIG_PATH=/usr/lib/i386-linux-gnu/pkgconfig
- *ccache - *ccache
- make --directory=src CCACHE=1 OBJCOPY=$OBJCOPY OBJDUMP=$OBJDUMP LINUX=1 - make --directory=src CCACHE=1 LINUX=1
build-aarch64-linux-gnu: build-aarch64-linux-gnu:
<<: *job_build <<: *job_build
@ -95,7 +95,7 @@ build-aarch64-linux-gnu:
- export OBJDUMP=aarch64-linux-gnu-objdump - export OBJDUMP=aarch64-linux-gnu-objdump
- export PKG_CONFIG_PATH=/usr/lib/aarch64-linux-gnu/pkgconfig - export PKG_CONFIG_PATH=/usr/lib/aarch64-linux-gnu/pkgconfig
- *ccache - *ccache
- make --directory=src CCACHE=1 OBJCOPY=$OBJCOPY OBJDUMP=$OBJDUMP LINUX64=1 NONX86=1 - make --directory=src CCACHE=1 LINUX64=1 NONX86=1
build-x86_64-linux-gnu: build-x86_64-linux-gnu:
<<: *job_build <<: *job_build
@ -112,7 +112,7 @@ build-x86_64-linux-gnu:
- export OBJDUMP=x86_64-linux-gnu-objdump - export OBJDUMP=x86_64-linux-gnu-objdump
- export PKG_CONFIG_PATH=/usr/lib/x86_64-linux-gnu/pkgconfig - export PKG_CONFIG_PATH=/usr/lib/x86_64-linux-gnu/pkgconfig
- *ccache - *ccache
- make --directory=src CCACHE=1 OBJCOPY=$OBJCOPY OBJDUMP=$OBJDUMP LINUX64=1 - make --directory=src CCACHE=1 LINUX64=1
build-i686-w64-mingw32: build-i686-w64-mingw32:
<<: *job_build <<: *job_build

64
cpdebug.mk
View file

@ -1,32 +1,32 @@
#Add-on Makefile for wxDev-C++ project file #Add-on Makefile for wxDev-C++ project file
ifdef ComSpec ifdef ComSpec
COMSPEC=$(ComSpec) COMSPEC=$(ComSpec)
endif endif
ifdef COMSPEC ifdef COMSPEC
OBJCOPY?=objcopy.exe OBJCOPY?=objcopy.exe
OBJDUMP?=objdump.exe OBJDUMP?=objdump.exe
GZIP?=gzip.exe GZIP?=gzip.exe
else else
OBJCOPY?=objcopy OBJCOPY?=objcopy
OBJDUMP?=objdump OBJDUMP?=objdump
GZIP?=gzip GZIP?=gzip
endif endif
DBGNAME=$(BIN).debug DBGNAME=$(BIN).debug
OBJDUMP_OPTS?=--wide --source --line-numbers OBJDUMP_OPTS?=--wide --source --line-numbers
GZIP_OPTS?=-9 -f -n GZIP_OPTS?=-9 -f -n
GZIP_OPT2=$(GZIP_OPTS) --rsyncable GZIP_OPT2=$(GZIP_OPTS) --rsyncable
UPX?=upx UPX?=upx
UPX_OPTS?=--best --preserve-build-id UPX_OPTS?=--best --preserve-build-id
UPX_OPTS+=-q UPX_OPTS+=-q
all-after: all-after:
$(OBJDUMP) $(OBJDUMP_OPTS) "$(BIN)" > "$(DBGNAME).txt" $(OBJDUMP) $(OBJDUMP_OPTS) "$(BIN)" > "$(DBGNAME).txt"
$(OBJCOPY) $(BIN) $(DBGNAME) $(OBJCOPY) $(BIN) $(DBGNAME)
$(OBJCOPY) --strip-debug $(BIN) $(OBJCOPY) --strip-debug $(BIN)
-$(OBJCOPY) --add-gnu-debuglink=$(DBGNAME) $(BIN) -$(OBJCOPY) --add-gnu-debuglink=$(DBGNAME) $(BIN)
-$(GZIP) $(GZIP_OPTS) "$(DBGNAME).txt" -$(GZIP) $(GZIP_OPTS) "$(DBGNAME).txt"
ifndef COMSPEC ifndef COMSPEC
-$(GZIP) $(GZIP_OPT2) "$(DBGNAME).txt" -$(GZIP) $(GZIP_OPT2) "$(DBGNAME).txt"
endif endif
-$(UPX) $(UPX_OPTS) $(BIN) -$(UPX) $(UPX_OPTS) $(BIN)

6
src/Makefile
View file

@ -141,9 +141,9 @@ endif
OBJDUMP_OPTS?=--wide --source --line-numbers OBJDUMP_OPTS?=--wide --source --line-numbers
OBJCOPY:=$(call Prefix,objcopy) OBJCOPY?=$(call Prefix,objcopy)
OBJDUMP:=$(call Prefix,objdump) OBJDUMP?=$(call Prefix,objdump)
WINDRES:=$(call Prefix,windres) WINDRES?=$(call Prefix,windres)
GZIP?=gzip GZIP?=gzip
GZIP_OPTS?=-9 -f -n GZIP_OPTS?=-9 -f -n