parent
8eba3f67b4
commit
0947e523e7
|
@ -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"
|
||||
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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 \
|
||||
|
|
|
@ -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"
|
||||
|
||||
|
|
Loading…
Reference in New Issue