Merge pull request #473 from wilzbach/win64

Build win64 binaries
merged-on-behalf-of: BBasile <BBasile@users.noreply.github.com>
This commit is contained in:
The Dlang Bot 2018-05-02 21:16:49 +02:00 committed by GitHub
commit c29a3a4cd2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 12 additions and 2 deletions

View File

@ -53,7 +53,7 @@ jobs:
os: linux os: linux
language: generic language: generic
sudo: yes 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: addons:
apt: apt:
packages: packages:

View File

@ -1,4 +1,5 @@
IF "%DC%"=="" SET DC="dmd" IF "%DC%"=="" SET DC="dmd"
IF "%MFLAGS%"=="" SET MFLAGS="-m32"
set containers_modules= set containers_modules=
for /r "containers/src" %%F in (*.d) do call set containers_modules=%%containers_modules%% "%%F" 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%^ %msgspack_modules%^
-Imsgpack-d\src^ -Imsgpack-d\src^
-release -inline -O -wi^ -release -inline -O -wi^
%MFLAGS%^
-of%client_name% -of%client_name%
%DC%^ %DC%^
@ -47,6 +49,7 @@ set server_name=bin\dcd-server
-Ilibdparse/src^ -Ilibdparse/src^
-Istdx-allocator/source^ -Istdx-allocator/source^
-wi -O -release^ -wi -O -release^
%MFLAGS%^
-of%server_name% -of%server_name%
if exist %server_name%.obj del %server_name%.obj if exist %server_name%.obj del %server_name%.obj

View File

@ -3,7 +3,14 @@
set -eux -o pipefail set -eux -o pipefail
VERSION=$(git describe --abbrev=0 --tags) VERSION=$(git describe --abbrev=0 --tags)
OS=windows 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 # Allow the script to be run from anywhere
DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"