From fb142c7f25964e3ceaa05f3bef5c73f221309daa Mon Sep 17 00:00:00 2001 From: Deukhoofd Date: Thu, 5 Sep 2019 10:59:01 +0200 Subject: [PATCH] Fixed Windows issue --- .drone.yml | 4 ++-- CMakeLists.txt | 4 ++++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.drone.yml b/.drone.yml index 40595d7..6b4ad8e 100644 --- a/.drone.yml +++ b/.drone.yml @@ -24,7 +24,7 @@ steps: - update-alternatives --set i686-w64-mingw32-g++ /usr/bin/i686-w64-mingw32-g++-posix - update-alternatives --set x86_64-w64-mingw32-gcc /usr/bin/x86_64-w64-mingw32-gcc-posix - update-alternatives --set x86_64-w64-mingw32-g++ /usr/bin/x86_64-w64-mingw32-g++-posix - - cmake -DCMAKE_BUILD_TYPE=Release . -B build-release-windows -D CMAKE_C_COMPILER=/usr/bin/x86_64-w64-mingw32-gcc -D CMAKE_CXX_COMPILER=x86_64-w64-mingw32-g++ -D WINDOWS=ON - - cmake --build build-release-windows --target all -- -j 4 -D WINDOWS=on + - cmake -DCMAKE_BUILD_TYPE=Release . -B build-release-windows -D CMAKE_C_COMPILER=/usr/bin/x86_64-w64-mingw32-gcc -D CMAKE_CXX_COMPILER=x86_64-w64-mingw32-g++ -DWINDOWS=ON + - cmake --build build-release-windows --target all -- -j 4 - export WINEARCH=win64 - wine build-release-windows/PorygonLangTests.exe -s diff --git a/CMakeLists.txt b/CMakeLists.txt index 8eaaea2..519b618 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -6,6 +6,10 @@ set(CMAKE_CXX_STANDARD_REQUIRED ON) include_directories(extern) +if (WINDOWS) + ADD_DEFINITIONS(-D WINDOWS=1) +endif(WINDOWS) + file(GLOB_RECURSE SRC_FILES "src/*.cpp" "src/*.hpp") file(GLOB_RECURSE TEST_FILES "tests/*.cpp" "tests/*.hpp")