Skip to content

Commit

Permalink
updated configure files to be very explicit
Browse files Browse the repository at this point in the history
  • Loading branch information
janwilmans committed Nov 10, 2019
1 parent 954ce6a commit a895f68
Show file tree
Hide file tree
Showing 3 changed files with 45 additions and 28 deletions.
20 changes: 0 additions & 20 deletions configure-x64-v140-runtime.bat

This file was deleted.

21 changes: 13 additions & 8 deletions configure-x64-v141-runtime.bat
Original file line number Diff line number Diff line change
@@ -1,15 +1,20 @@

:: do not change the build target paths (causes stashed.io misses)
:: the ninja generator will use the default target platform of the 'Native Tools Command Prompt' it runs in.
:: at least "Visual Studio 2017 Version 15.8" is required to build
:: vs2019 community edition is required to build.

set SRC=%cd%
mkdir x64
mkdir x64\release
pushd x64\release
cmake -G Ninja -DCMAKE_BUILD_TYPE=RelWithDebInfo ..
pushd x64
:: remember -DCMAKE_BUILD_TYPE=RelWithDebInfo has no effect on "Visual Studio" multi-config generatators
cmake -G "Visual Studio 15 2017" -A x64 -T v141,host=x64 %SRC%
popd

mkdir x64\debug
pushd x64\debug
cmake -G Ninja -DCMAKE_BUILD_TYPE=Debug ..
popd
@echo off
echo Compile using: (order of arguments is important!)
echo cmake --build x64 --config Debug
echo or
echo cmake --build x64 --config RelWithDebInfo

pause

32 changes: 32 additions & 0 deletions configure-x64-v142-runtime.bat
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
:: do not change the build target paths (causes stashed.io misses)
:: the ninja generator will use the default target platform of the 'Native Tools Command Prompt' it runs in.

set SRC=%cd%
set COM_BUILD="C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Auxiliary\Build\vcvarsall.bat"
set PRO_BUILD="C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Auxiliary\Build\vcvarsall.bat"
set ENT_BUILD="C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvarsall.bat"

if exist %COM_BUILD% (
call %COM_BUILD% x64
)

if exist %PRO_BUILD% (
call %PRO_BUILD% x64
)

if exist %ENT_BUILD% (
call %ENT_BUILD% x64
)

mkdir x64
mkdir x64\release
pushd x64\release
cmake -DCMAKE_C_COMPILER="cl.exe" -DCMAKE_CXX_COMPILER="cl.exe" -DMSVC_TOOLSET_VERSION=142 -DCMAKE_BUILD_TYPE=RelWithDebInfo -G Ninja %SRC%
popd

mkdir x64\debug
pushd x64\debug
cmake -DCMAKE_C_COMPILER="cl.exe" -DCMAKE_CXX_COMPILER="cl.exe" -DMSVC_TOOLSET_VERSION=142 -DCMAKE_BUILD_TYPE=Debug -G Ninja %SRC%
popd


0 comments on commit a895f68

Please sign in to comment.