From 35ca64f26d81281fa685c74b2748dda082d92d48 Mon Sep 17 00:00:00 2001 From: James Sherratt Date: Wed, 24 Aug 2022 02:48:07 +0100 Subject: [PATCH] some more improvements --- mk/windoze/build-mg-vs-cmake.ps1 | 9 +++++---- mk/windoze/install-deps-vcpkg.ps1 | 2 +- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/mk/windoze/build-mg-vs-cmake.ps1 b/mk/windoze/build-mg-vs-cmake.ps1 index bc3c7c02..945fdc1e 100644 --- a/mk/windoze/build-mg-vs-cmake.ps1 +++ b/mk/windoze/build-mg-vs-cmake.ps1 @@ -106,16 +106,17 @@ $topLevelTargetDir = $(Resolve-Path $(Join-Path $PSScriptRoot ../../)).ToString( $vsVersion=(msbuild --version | select -Last 1).Split(".")[0] -as [int] -echo "version is " $vsVersion - if ($vsVersion -eq 17) { $vsProjType = "Visual Studio 17 2022" } -else { +elseif ($vsVersion -eq 16) { $vsProjType = "Visual Studio 16 2019" } +else { + $vsProjType = "Visual Studio 17 2022" +} -cmake --no-warn-unused-cli -DCMAKE_TOOLCHAIN_FILE:STRING=$toolchainPath -DCMAKE_EXPORT_COMPILE_COMMANDS:BOOL=TRUE "-H$topLevelTargetDir" "-B$buildFolder" -G $vsProjType -T host=x64 -A x64 +cmake --no-warn-unused-cli -DCMAKE_TOOLCHAIN_FILE:STRING=$toolchainPath -DCMAKE_EXPORT_COMPILE_COMMANDS:BOOL=TRUE "-H$topLevelTargetDir" "-B$buildFolder" -G $vsProjType -T host=x64 -A x64 -DBUILD_MEGAGLEST_MODEL_IMPORT_EXPORT_TOOLS=OFF cmake --build $buildFolder --config Release --target ALL_BUILD diff --git a/mk/windoze/install-deps-vcpkg.ps1 b/mk/windoze/install-deps-vcpkg.ps1 index 36fee871..bfdec521 100644 --- a/mk/windoze/install-deps-vcpkg.ps1 +++ b/mk/windoze/install-deps-vcpkg.ps1 @@ -1,2 +1,2 @@ "Installing MegaGlest deps." -.\vcpkg.exe install --disable-metrics brotli:x64-windows-static bzip2:x64-windows-static curl:x64-windows-static expat:x64-windows-static freetype:x64-windows-static fribidi:x64-windows-static ftgl:x64-windows-static glew:x64-windows-static libiconv:x64-windows-static libjpeg-turbo:x64-windows-static liblzma:x64-windows-static libogg:x64-windows-static libpng:x64-windows-static libvorbis:x64-windows-static libxml2:x64-windows-static lua:x64-windows-static openal-soft:x64-windows-static opengl:x64-windows-static miniupnpc:x64-windows-static sdl2:x64-windows-static sqlite3:x64-windows-static tiff:x64-windows-static tool-meson:x64-windows-static wxwidgets:x64-windows-static xerces-c:x64-windows-static zlib:x64-windows-static +.\vcpkg.exe install --disable-metrics brotli:x64-windows-static bzip2:x64-windows-static curl:x64-windows-static expat:x64-windows-static freetype:x64-windows-static fribidi:x64-windows-static ftgl:x64-windows-static glew:x64-windows-static libiconv:x64-windows-static libjpeg-turbo:x64-windows-static liblzma:x64-windows-static libogg:x64-windows-static libpng:x64-windows-static libvorbis:x64-windows-static libxml2:x64-windows-static lua:x64-windows-static openal-soft:x64-windows-static opengl:x64-windows-static miniupnpc:x64-windows-static sdl2:x64-windows-static sqlite3:x64-windows-static tiff:x64-windows-static wxwidgets:x64-windows-static xerces-c:x64-windows-static zlib:x64-windows-static