Skip to content

Commit f68fb05

Browse files
committed
test fix appveyor. Part 17
1 parent 6e1ffa9 commit f68fb05

File tree

2 files changed

+7
-2
lines changed

2 files changed

+7
-2
lines changed

CMakeLists.txt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,10 @@ project(OpenXRay)
33

44
set(CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake)
55

6+
IF(MINGW)
7+
SET(CMAKE_BUILD_TOOL mingw32-make)
8+
ENDIF(MINGW)
9+
610
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fpermissive --std=c++17")
711

812
add_definitions(-D_MT -D_CPPUNWIND -DPURE_DYNAMIC_CAST -DDECLARE_SPECIALIZATION -DM_NOSTDCONTAINERS_EXT -DUSE_OGL)

appveyor.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,12 +28,13 @@ install:
2828
invoke '7z' 'x -oC:\ mw64.7z';
2929
}
3030
build_script:
31-
- git submodule update --init --recursive
31+
- C:\mingw-w64\x86_64-7.2.0-posix-seh-rt_v5-rev1\mingw64\bin\mingw32-make --version
3232
- C:\mingw-w64\x86_64-7.2.0-posix-seh-rt_v5-rev1\mingw64\bin\g++ --version
3333
- ECHO %PATH%
34+
- git submodule update --init --recursive
3435
- if [%tbs_tools%]==[mingw] (
35-
SET "PATH=C:\mingw-w64\x86_64-7.2.0-posix-seh-rt_v5-rev1\mingw64\bin;%PATH%" &&
3636
SET "PATH=%PATH:C:\Program Files\Git\usr\bin=%" &&
37+
SET "PATH=C:\mingw-w64\x86_64-7.2.0-posix-seh-rt_v5-rev1\mingw64\bin;%PATH%" &&
3738
MKDIR bin &&
3839
CD bin &&
3940
cmake .. -G "MinGW Makefiles"&&

0 commit comments

Comments
 (0)