yesBad/proton-bridge
1
0
Fork 0
forked from Silverfish/proton-bridge
Code Actions Activity

GODT-1675: Add resrource file to both launcher and bridge-go.

Browse Source
This commit is contained in:
Jakub
2022-08-24 10:56:28 +02:00
committed by Jakub Cuth
parent 58ba3b012e
commit 72e949c644
1 changed files with 13 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
Makefile
View File

@ -40,6 +40,7 @@ BUILD_FLAGS_GUI+=-ldflags "${GO_LDFLAGS}"
BUILD_FLAGS_LAUNCHER+=-ldflags '${GO_LDFLAGS_LAUNCHER}' BUILD_FLAGS_LAUNCHER+=-ldflags '${GO_LDFLAGS_LAUNCHER}'
DEPLOY_DIR:=cmd/${TARGET_CMD}/deploy DEPLOY_DIR:=cmd/${TARGET_CMD}/deploy
BUILD_PATH:=cmd/${TARGET_CMD}
DIRNAME:=$(shell basename ${CURDIR}) DIRNAME:=$(shell basename ${CURDIR})
LAUNCHER_EXE:=proton-bridge LAUNCHER_EXE:=proton-bridge
@ -80,25 +81,25 @@ build-gui: ${TGZ_TARGET}
build-nogui: ${EXE_NAME} build-nogui: ${EXE_NAME}
go-build=go build $(1) -o $(2) $(3) go-build=go build $(1) -o $(2) $(3)
go-build-unify=${go-build} go-build-finalize=${go-build}
ifeq "${GOOS}-$(shell uname -m)" "darwin-arm64" ifeq "${GOOS}-$(shell uname -m)" "darwin-arm64"
go-build-unify= \ go-build-finalize= \
CGO_ENABLED=1 GOARCH=arm64 $(call go-build,$(1),$(2)_arm,$(3)) && \ CGO_ENABLED=1 GOARCH=arm64 $(call go-build,$(1),$(2)_arm,$(3)) && \
CGO_ENABLED=1 GOARCH=amd64 $(call go-build,$(1),$(2)_amd,$(3)) && \ CGO_ENABLED=1 GOARCH=amd64 $(call go-build,$(1),$(2)_amd,$(3)) && \
lipo -create -output $(2) $(2)_arm $(2)_amd && rm -f $(2)_arm $(2)_amd lipo -create -output $(2) $(2)_arm $(2)_amd && rm -f $(2)_arm $(2)_amd
endif endif
ifeq "${GOOS}-$(shell uname -m)" "darwin-arm64"
go-build-finalize= \
mv ${RESOURCE_FILE} $(3)/ && \
$(call go-build,$(1),$(2)_amd,$(3)) && \
rm -f $(3)/${RESOURCE_FILE}
endif
${EXE_NAME}: gofiles ${EXE_NAME}: gofiles ${RESOURCE_FILE}
$(call go-build-unify,${BUILD_FLAGS},"${EXE_NAME}","cmd/${TARGET_CMD}/main.go") $(call go-build-finalize,${BUILD_FLAGS},"${EXE_NAME}","${BUILD_PATH}")
build-launcher: ${RESOURCE_FILE} build-launcher: ${RESOURCE_FILE}
ifeq "${GOOS}" "windows" $(call go-build-finalize,${BUILD_FLAGS_LAUNCHER},"${LAUNCHER_EXE}","${LAUNCHER_PATH}")
powershell Copy-Item ${ROOT_DIR}/${RESOURCE_FILE} ${ROOT_DIR}/${LAUNCHER_PATH}${RESOURCE_FILE}
endif
$(call go-build-unify,${BUILD_FLAGS_LAUNCHER},"${LAUNCHER_EXE}","${LAUNCHER_PATH}")
ifeq "${GOOS}" "windows"
powershell Remove-Item ${ROOT_DIR}/${LAUNCHER_PATH}${RESOURCE_FILE} -Force
endif
versioner: versioner:
go build ${BUILD_FLAGS} -o versioner utils/versioner/main.go go build ${BUILD_FLAGS} -o versioner utils/versioner/main.go
@ -152,7 +153,7 @@ ${EXE_TARGET}: check-build-essentials ${EXE_NAME}
WINDRES_YEAR:=$(shell date +%Y) WINDRES_YEAR:=$(shell date +%Y)
APP_VERSION_COMMA:=$(shell echo "${APP_VERSION}" | sed -e 's/[^0-9,.]*//g' -e 's/\./,/g') APP_VERSION_COMMA:=$(shell echo "${APP_VERSION}" | sed -e 's/[^0-9,.]*//g' -e 's/\./,/g')
${RESOURCE_FILE}: ./dist/info.rc ./dist/${SRC_ICO} .FORCE resource.syso: ./dist/info.rc ./dist/${SRC_ICO} .FORCE
rm -f ./*.syso rm -f ./*.syso
windres --target=pe-x86-64 \ windres --target=pe-x86-64 \
-I ./internal/frontend/share/ \ -I ./internal/frontend/share/ \