From 23380c6df66651dda2d9a335bb7c1a9e29892564 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20Mail=C3=A4nder?= Date: Sat, 17 Jan 2015 13:30:11 +0100 Subject: [PATCH] don't fetch native Windows binaries on Unix --- Makefile | 3 +++ thirdparty/fetch-thirdparty-deps-windows.sh | 18 ++++++++++++++++++ thirdparty/fetch-thirdparty-deps.sh | 8 -------- 3 files changed, 21 insertions(+), 8 deletions(-) create mode 100755 thirdparty/fetch-thirdparty-deps-windows.sh diff --git a/Makefile b/Makefile index 1503f80627..2608652128 100644 --- a/Makefile +++ b/Makefile @@ -310,6 +310,9 @@ distclean: clean dependencies: cli-dependencies native-dependencies +windows-dependencies: + cd thirdparty && ./fetch-thirdparty-deps-windows.sh && cd .. + cli-dependencies: cd thirdparty && ./fetch-thirdparty-deps.sh && cd .. @ $(CP_R) thirdparty/*.dll . diff --git a/thirdparty/fetch-thirdparty-deps-windows.sh b/thirdparty/fetch-thirdparty-deps-windows.sh new file mode 100755 index 0000000000..e617b71073 --- /dev/null +++ b/thirdparty/fetch-thirdparty-deps-windows.sh @@ -0,0 +1,18 @@ +#!/bin/bash + +# Die on any error for Travis CI to automatically retry: +set -e + +if [ ! -f windows/SDL2.dll ]; then + echo "Fetching SDL2 from nuget" + nuget install sdl2 -Version 2.0.3 + cp ./sdl2.redist.2.0.3/build/native/bin/Win32/dynamic/SDL2.dll ./windows/ + rm -rf sdl2.2.0.3 sdl2.redist.2.0.3 +fi + +if [ ! -f windows/freetype6.dll ]; then + echo "Fetching SharpFont from nuget" + nuget install SharpFont -Version 2.5.0.1 + cp ./SharpFont.2.5.0.1/Content/freetype6.dll ./windows/ + rm -rf SharpFont.2.5.0.1 +fi \ No newline at end of file diff --git a/thirdparty/fetch-thirdparty-deps.sh b/thirdparty/fetch-thirdparty-deps.sh index dd4c63c2fa..d55d238c2f 100755 --- a/thirdparty/fetch-thirdparty-deps.sh +++ b/thirdparty/fetch-thirdparty-deps.sh @@ -35,7 +35,6 @@ if [ ! -f SharpFont.dll ]; then nuget install SharpFont -Version 2.5.0.1 cp ./SharpFont.2.5.0.1/lib/net20/SharpFont* . cp ./SharpFont.2.5.0.1/Content/SharpFont.dll.config . - cp ./SharpFont.2.5.0.1/Content/freetype6.dll ./windows/ rm -rf SharpFont.2.5.0.1 fi @@ -46,13 +45,6 @@ if [ ! -f nunit.framework.dll ]; then rm -rf NUnit.2.6.4 fi -if [ ! -f windows/SDL2.dll ]; then - echo "Fetching SDL2 from nuget" - nuget install sdl2 -Version 2.0.3 - cp ./sdl2.redist.2.0.3/build/native/bin/Win32/dynamic/SDL2.dll ./windows/ - rm -rf sdl2.2.0.3 sdl2.redist.2.0.3 -fi - if [ ! -f Mono.Nat.dll ]; then echo "Fetching Mono.Nat from nuget" nuget install Mono.Nat -Version 1.2.21