Work on CI support for MingW

This commit is contained in:
Steffen Schuemann 2019-05-13 09:27:35 +02:00
parent 585e66b75b
commit 122da7d33d
2 changed files with 3 additions and 2 deletions

View File

@ -47,12 +47,13 @@ init:
install: install:
- cmd: reg add "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\AppModelUnlock" /t REG_DWORD /f /v "AllowDevelopmentWithoutDevLicense" /d "1" - cmd: reg add "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\AppModelUnlock" /t REG_DWORD /f /v "AllowDevelopmentWithoutDevLicense" /d "1"
- cmd: ren "C:\Program Files\Git\usr\bin\sh.exe" _sh.exe
build_script: build_script:
- mkdir build - mkdir build
- cd build - cd build
- if [%compiler%]==[msvc] cmake -G"%generator%" .. - if [%compiler%]==[msvc] cmake -G"%generator%" ..
- if [%compiler%]==[mingw] set PATH=%toolchain%/bin;%PATH:C:\Program Files (x86)\Git\bin;=% - if [%compiler%]==[mingw] set PATH=%toolchain%/bin;%PATH%
- if [%compiler%]==[mingw] cmake -G"%generator%" -DCMAKE_SH=CMAKE_SH-NOTFOUND -DCMAKE_PREFIX_PATH=C:\mingw-w64\%toolchain% -DCMAKE_BUILD_TYPE=%configuration% .. - if [%compiler%]==[mingw] cmake -G"%generator%" -DCMAKE_SH=CMAKE_SH-NOTFOUND -DCMAKE_PREFIX_PATH=C:\mingw-w64\%toolchain% -DCMAKE_BUILD_TYPE=%configuration% ..
- cmake --build . --config %configuration% - cmake --build . --config %configuration%

View File

@ -212,7 +212,7 @@ inline bool isWow64Proc()
bIsWow64 = FALSE; bIsWow64 = FALSE;
} }
} }
return bIsWow64; return bIsWow64 == TRUE;
} }
static bool is_symlink_creation_supported() static bool is_symlink_creation_supported()