From ff01dece3f69a24fb37bd714eff019c33b0fae78 Mon Sep 17 00:00:00 2001 From: woblight Date: Thu, 19 Jul 2018 20:12:16 +0200 Subject: [PATCH] CI: fix GAM_BUILD_NAME --- CI.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CI.mk b/CI.mk index a8ada9e..debade9 100644 --- a/CI.mk +++ b/CI.mk @@ -12,7 +12,7 @@ qmake=$(wine) $(pwd)/Qt/5.11.1/mingw53_32/bin/qmake.exe .PHONY: build build: - mkdir -p GitAddonsManager && cd GitAddonsManager && qmake-qt5 .. -spec linux-g++ GAM_BUILD_NAME="Linux_x64" && make + mkdir -p GitAddonsManager && cd GitAddonsManager && qmake-qt5 .. -spec linux-g++ DEFINES+='GAM_BUILD_NAME=\\\"Linux_x64\\\"' && make cmake-3.12.0-rc3-win32-x86.msi: wget https://cmake.org/files/v3.12/cmake-3.12.0-rc3-win32-x86.msi @@ -75,7 +75,7 @@ libgit2-0.27.2/build/libgit2.dll: wine/drive_c/Program\ Files\ (x86)/CMake libgi $(wine) mingw32-make -C libgit2-0.27.2/build -j $(shell nproc) build_win32/GitAddonsManager.exe: Qt libgit2-0.27.2/build/libgit2.dll - mkdir -p build_win32 && cd build_win32 && $(qmake) $(qmake_opts) ../GitAddonsManager.pro GIT_DESCRIBE="$(shell git describe --tags)" GAM_BUILD_NAME="Win32" + mkdir -p build_win32 && cd build_win32 && $(qmake) $(qmake_opts) ../GitAddonsManager.pro GIT_DESCRIBE="$(shell git describe --tags)" DEFINES+='GAM_BUILD_NAME=\\\"Win32\\\"' $(wine) mingw32-make -C build_win32 winbuild: build_win32/GitAddonsManager.exe