windows: Clearer build scripts and set colored output

This commit is contained in:
João Paulo Taylor Ienczak Zanette 2020-03-04 14:59:18 -03:00
parent 464fffac86
commit f9e21cd841
3 changed files with 42 additions and 27 deletions

View File

@ -1 +1,3 @@
"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Auxiliary\Build\vcvars64.bat" && "C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\Common7\IDE\CommonExtensions\Microsoft\CMake\Ninja\ninja.exe" -vC build
set vcvars64="C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Auxiliary\Build\vcvars64.bat"
set CLICOLOR_FORCE=1
%vcvars64% && ninja --verbose -C build

View File

@ -1,11 +1,22 @@
@Rem ---------------------------------
@Rem Windows terminal specific options
set CC=clang-cl
set CXX=clang-cl
set CFLAGS=-Wno-language-extension-token
@Rem ---------------------------------
@Rem Windows terminal specific options
set CFLAGS=-fansi-escape-codes -fcolor-diagnostics %CFLAGS%
@Rem ---------------------------------
@Rem Default flags
set CFLAGS=-Wno-language-extension-token %CFLAGS%
meson build ^
-Dopenssl_dir="C:/Users/Tiz/source/repos/openssl/"^
-Dregex_include_dir="C:/Users/Tiz/source/repos/efl/src/lib/evil/pcre/"^
-Dregex_dir="C:/Users/Tiz/source/repos/pcre-win-build/build-VS2019/x64/Debug"^
-Dopenssl_dir="C:/Users/Tiz/source/pkg/openssl/"^
-Dregex_include_dir="C:/Users/Tiz/source/pkg/pcre-7.0/include/"^
-Dregex_dir="C:/Users/Tiz/source/pkg/pcre-7.0/lib/"^
-Dcrypto=openssl^
-Dnls=false^
-Dsystemd=false^
-Dglib=false^
@ -29,4 +40,6 @@ meson build ^
"-Demotion-loaders-disabler=gstreamer1,libvlc,xine"^
-Dbuild-tests=false^
-Dbuild-examples=false^
-Dbindings= --native-file native-file-windows.txt
-Dbindings=^
--wipe^
--native-file native-file-windows.txt

View File

@ -214,29 +214,29 @@ endif
regexp = []
if sys_windows == true
if sys_windows == true
inc_arg = '-I' + get_option('regex_include_dir')
if cc.has_header('regex.h', args: inc_arg) == false
error('regex can not be found')
endif
regexp = cc.find_library('pcre',
dirs : [get_option('regex_dir')],
required: true)
else
regexp = cc.find_library('regex',
has_headers: ['regex.h', 'fnmatch.h'],
required: true)
endif
if regexp.found() == false
if sys_windows == true
inc_arg = '-I' + get_option('regex_include_dir')
if cc.has_header('regex.h', args: inc_arg) == false
error('regex can not be found')
endif
endif
regexp = cc.find_library('pcre',
dirs : [get_option('regex_dir')],
required: true)
else
regexp = cc.find_library('regex',
has_headers: ['regex.h', 'fnmatch.h'],
required: true)
endif
if regexp.found() == false
error('regex can not be found')
endif
else
if cc.has_header_symbol('fnmatch.h', 'fnmatch') == false
error('fnmatch can not be found')
endif
if cc.has_header_symbol('regex.h', 'regcomp') == false
error('regcomp can not be found')
endif
if cc.has_header_symbol('fnmatch.h', 'fnmatch') == false
error('fnmatch can not be found')
endif
if cc.has_header_symbol('regex.h', 'regcomp') == false
error('regcomp can not be found')
endif
endif
config_h.set('VMAJ', version_major)