From 444218dbec318c1a43ecfab77fb6cad4662f9e5c Mon Sep 17 00:00:00 2001 From: Sebastian Wilzbach Date: Sun, 29 Apr 2018 20:37:59 +0200 Subject: [PATCH] Build win64 binaries --- .travis.yml | 2 +- build.bat | 3 +++ release-windows.sh | 9 ++++++++- 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index bfd6319..957e278 100644 --- a/.travis.yml +++ b/.travis.yml @@ -53,7 +53,7 @@ jobs: os: linux language: generic sudo: yes - script: echo "Deploying to GitHub releases ..." && ./release-windows.sh + script: echo "Deploying to GitHub releases ..." && ./release-windows.sh && ARCH=64 ./release-windows.sh addons: apt: packages: diff --git a/build.bat b/build.bat index 89daf2f..4021b01 100644 --- a/build.bat +++ b/build.bat @@ -1,4 +1,5 @@ IF "%DC%"=="" SET DC="dmd" +IF "%MFLAGS%"=="" SET MFLAGS="-m32" set containers_modules= for /r "containers/src" %%F in (*.d) do call set containers_modules=%%containers_modules%% "%%F" @@ -32,6 +33,7 @@ set server_name=bin\dcd-server %msgspack_modules%^ -Imsgpack-d\src^ -release -inline -O -wi^ + %MFLAGS%^ -of%client_name% %DC%^ @@ -47,6 +49,7 @@ set server_name=bin\dcd-server -Ilibdparse/src^ -Istdx-allocator/source^ -wi -O -release^ + %MFLAGS%^ -of%server_name% if exist %server_name%.obj del %server_name%.obj diff --git a/release-windows.sh b/release-windows.sh index 19bd29c..d9f6acb 100755 --- a/release-windows.sh +++ b/release-windows.sh @@ -3,7 +3,14 @@ set -eux -o pipefail VERSION=$(git describe --abbrev=0 --tags) OS=windows -ARCH_SUFFIX="x86" +if [ "${ARCH:-32}" == "64" ] ; then + ARCH_SUFFIX="x86_64" + export MFLAGS="-m64" +else + ARCH_SUFFIX="x86" + export MFLAGS="-m32" +fi + # Allow the script to be run from anywhere DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"