diff --git a/.travis.yml b/.travis.yml index 8bde31259..fa4fccd4d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -22,14 +22,12 @@ jobs: # linux with win32 cross-compilation - os: linux compiler: gcc - dist: trusty env: - TARGET="win32" # linux with win64 cross-compilation - os: linux compiler: gcc - dist: trusty env: - TARGET="win64" diff --git a/.travis/before_install.sh b/.travis/before_install.sh index 0899122eb..3b88ed9f6 100644 --- a/.travis/before_install.sh +++ b/.travis/before_install.sh @@ -2,6 +2,10 @@ set -e +if [ "${TARGET}" = "macos" ]; then + rm -f /etc/apt/sources.list.d/*.list +fi + sudo add-apt-repository -y ppa:kxstudio-debian/kxstudio sudo add-apt-repository -y ppa:kxstudio-debian/mingw sudo add-apt-repository -y ppa:kxstudio-debian/toolchain diff --git a/.travis/install.sh b/.travis/install.sh index 766bd728c..f502d5a36 100755 --- a/.travis/install.sh +++ b/.travis/install.sh @@ -93,15 +93,22 @@ elif [ "${TARGET}" = "macos" ]; then elif [ "${TARGET}" = "win32" ]; then sudo apt-get install -y \ - mingw32-x-gcc \ - mingw32-x-pkgconfig + g++-multilib \ + mingw-w64 \ + binutils-mingw-w64-i686 \ + binutils-mingw-w64-x86-64 \ + g++-mingw-w64-i686 \ + g++-mingw-w64-x86-64 \ + wine-devel-dev \ + winehq-stable elif [ "${TARGET}" = "win64" ]; then sudo apt-get install -y \ - mingw32-x-gcc \ - mingw32-x-pkgconfig \ - mingw64-x-gcc \ - mingw64-x-pkgconfig + mingw-w64 \ + binutils-mingw-w64-x86-64 \ + g++-mingw-w64-x86-64 \ + wine-devel-dev \ + winehq-stable elif [ "${TARGET}" = "pylint" ]; then sudo apt-get install -y \ diff --git a/source/modules/dgl/src/Application.cpp b/source/modules/dgl/src/Application.cpp index 32d3d1468..6c10f26a7 100644 --- a/source/modules/dgl/src/Application.cpp +++ b/source/modules/dgl/src/Application.cpp @@ -14,6 +14,10 @@ * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ +#ifdef __WINE__ +# include "winsock2.h" +#endif + #include "ApplicationPrivateData.hpp" #include "../Window.hpp"