windows: Use --wipe only if build dir does not exist.
This commit is contained in:
parent
f9e21cd841
commit
a60f5c2c14
|
@ -1,3 +1,3 @@
|
||||||
set vcvars64="C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Auxiliary\Build\vcvars64.bat"
|
@set vcvars64="C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Auxiliary\Build\vcvars64.bat"
|
||||||
set CLICOLOR_FORCE=1
|
@set CLICOLOR_FORCE=1
|
||||||
%vcvars64% && ninja --verbose -C build
|
%vcvars64% && ninja --verbose -C build
|
||||||
|
|
|
@ -1,18 +1,26 @@
|
||||||
@Rem ---------------------------------
|
@echo off
|
||||||
@Rem Windows terminal specific options
|
@set vcvars64="C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Auxiliary\Build\vcvars64.bat"
|
||||||
|
|
||||||
set CC=clang-cl
|
|
||||||
set CXX=clang-cl
|
|
||||||
|
|
||||||
@Rem ---------------------------------
|
@Rem ---------------------------------
|
||||||
@Rem Windows terminal specific options
|
@Rem Windows terminal specific options
|
||||||
set CFLAGS=-fansi-escape-codes -fcolor-diagnostics %CFLAGS%
|
|
||||||
|
@set CC=clang-cl
|
||||||
|
@echo C Compiler: %CC%
|
||||||
|
@set CXX=clang-cl
|
||||||
|
@echo C++ Compiler: %CXX%
|
||||||
|
|
||||||
|
@Rem ---------------------------------
|
||||||
|
@Rem Windows terminal specific options
|
||||||
|
@set CFLAGS=-fansi-escape-codes -fcolor-diagnostics %CFLAGS%
|
||||||
|
|
||||||
@Rem ---------------------------------
|
@Rem ---------------------------------
|
||||||
@Rem Default flags
|
@Rem Default flags
|
||||||
set CFLAGS=-Wno-language-extension-token %CFLAGS%
|
@set CFLAGS=-Wno-language-extension-token %CFLAGS%
|
||||||
|
|
||||||
meson build ^
|
@echo Using CFLAGS=%CFLAGS%
|
||||||
|
|
||||||
|
@Rem ------------------------------------------------------
|
||||||
|
@set MESONFLAGS=^
|
||||||
-Dopenssl_dir="C:/Users/Tiz/source/pkg/openssl/"^
|
-Dopenssl_dir="C:/Users/Tiz/source/pkg/openssl/"^
|
||||||
-Dregex_include_dir="C:/Users/Tiz/source/pkg/pcre-7.0/include/"^
|
-Dregex_include_dir="C:/Users/Tiz/source/pkg/pcre-7.0/include/"^
|
||||||
-Dregex_dir="C:/Users/Tiz/source/pkg/pcre-7.0/lib/"^
|
-Dregex_dir="C:/Users/Tiz/source/pkg/pcre-7.0/lib/"^
|
||||||
|
@ -41,5 +49,14 @@ meson build ^
|
||||||
-Dbuild-tests=false^
|
-Dbuild-tests=false^
|
||||||
-Dbuild-examples=false^
|
-Dbuild-examples=false^
|
||||||
-Dbindings=^
|
-Dbindings=^
|
||||||
--wipe^
|
|
||||||
--native-file native-file-windows.txt
|
--native-file native-file-windows.txt
|
||||||
|
|
||||||
|
@if exist build (
|
||||||
|
@echo "Build directory ("build") already exists. Old config will be wiped with `--wipe`."
|
||||||
|
@set MESONFLAGS=%MESONFLAGS% --wipe
|
||||||
|
) else (
|
||||||
|
@echo No Creating new build directory.
|
||||||
|
)
|
||||||
|
|
||||||
|
@echo on
|
||||||
|
%vcvars64% && meson build %MESONFLAGS%
|
||||||
|
|
Loading…
Reference in New Issue