From 93926278467e756a38ff071b93a52193d6d7b214 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mika=C3=ABl=20Capelle?= Date: Sun, 2 Jun 2024 20:53:56 +0200 Subject: [PATCH] Add good old tests to CI. --- .github/workflows/build.yml | 51 ++++---- .gitignore | 1 + src/shared/test_helpers.cpp | 2 +- src/shared/test_helpers.h | 4 +- src/shared/winapi.h | 1 + test/shared_test/main.cpp | 2 + .../test_file_operations.cpp | 6 +- test/thooklib_test/main.cpp | 4 + test/tinjectlib_test/main.cpp | 4 +- test/tvfs_test/main.cpp | 4 + test/usvfs_test/usvfs_test.cpp | 6 +- test/usvfs_test/usvfs_test_base.cpp | 2 + test/usvfs_test/usvfs_test_base.h | 4 +- test/usvfs_test_runner/usvfs_test_runner.cpp | 2 + vsbuild/asmjit.vcxproj | 54 +++++++++ vsbuild/fmt.vcxproj | 52 ++++++++ vsbuild/shared.vcxproj | 70 +++++++++++ vsbuild/shared_test.vcxproj | 71 +++++++++++ vsbuild/spdlog.vcxproj | 54 +++++++++ vsbuild/test_file_operations.vcxproj | 71 +++++++++++ vsbuild/testinject_bin.vcxproj | 60 ++++++++++ vsbuild/testinject_dll.vcxproj | 58 +++++++++ vsbuild/thooklib.vcxproj | 68 +++++++++++ vsbuild/thooklib_test.vcxproj | 61 ++++++++++ vsbuild/tinjectlib.vcxproj | 60 ++++++++++ vsbuild/tinjectlib_test.vcxproj | 60 ++++++++++ vsbuild/tvfs_test.vcxproj | 68 +++++++++++ vsbuild/udis86.vcxproj | 86 ++++++++++++++ vsbuild/usvfs.sln | 93 +++++++++++++-- vsbuild/usvfs_dll.vcxproj | 112 ++++++++++++++++++ vsbuild/usvfs_helper.vcxproj | 62 ++++++++++ vsbuild/usvfs_proxy.vcxproj | 86 ++++++++++++++ vsbuild/usvfs_test.vcxproj | 72 +++++++++++ vsbuild/usvfs_test_runner.vcxproj | 68 +++++++++++ 34 files changed, 1436 insertions(+), 43 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 604c6e38..1307abd0 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -10,8 +10,13 @@ env: BOOST_PREBUILT_URL: "https://github.com/ModOrganizer2/mob/releases/download/2.5-dependencies/boost_prebuilt_1_85_0.7z" jobs: - build-x64: - name: Build USVFS x64 + build: + name: Build USVFS + strategy: + matrix: + arch: [x86, x64] + config: [Release] + tests: ["", "Test"] runs-on: windows-2022 steps: - uses: actions/checkout@v4 @@ -23,37 +28,27 @@ jobs: Expand-7ZipArchive -Path boost.7z -Destination .\boost - name: Add msbuild to PATH uses: microsoft/setup-msbuild@v2 - - name: Build x64 - run: | - msbuild -nologo ` - -maxCpuCount "-property:UseMultiToolTask=true" "-property:EnforceProcessCountAcrossBuilds=true" ` - "-property:Configuration=Release" ` - "-property:Platform=x64" ` - "-property:BOOST_PATH=..\boost" ` - "-property:RunCodeAnalysis=false" ` - .\vsbuild\usvfs.sln - - build-x86: - name: Build USVFS x86 - runs-on: windows-2022 - steps: - - uses: actions/checkout@v4 with: - submodules: true - - name: Fetch Boost prebuilt - run: | - Invoke-WebRequest -Uri ${env:BOOST_PREBUILT_URL} -OutFile boost.7z - Expand-7ZipArchive -Path boost.7z -Destination .\boost - - name: Add msbuild to PATH - uses: microsoft/setup-msbuild@v2 + msbuild-architecture: ${{ matrix.arch }} + - if: ${{ matrix.tests }} == 'Test' + name: Fetch googletest + uses: actions/checkout@v4 with: - msbuild-architecture: x86 - - name: Build x86 + repository: google/googletest + path: ./googletest + - if: ${{ matrix.tests }} == 'Test' + name: Build googletest + run: | + cmake -B googletest/build_${{ matrix.arch }} -A ${{ matrix.arch == 'x86' && 'Win32' || 'x64' }} + cmake --build googletest/build_${{ matrix.arch }} --config ${{ matrix.config }} + - name: Build run: | msbuild -nologo ` -maxCpuCount "-property:UseMultiToolTask=true" "-property:EnforceProcessCountAcrossBuilds=true" ` - "-property:Configuration=Release" ` - "-property:Platform=x86" ` + "-property:Configuration=${{ matrix.config }}${{ matrix.tests }}" ` + "-property:Platform=${{ matrix.arch }}" ` "-property:BOOST_PATH=..\boost" ` + "-property:GTEST_PATH=..\googletest" ` + "-property:GTEST_LIBDIR=..\googletest\build_${{ matrix.arch }}\lib\${{ matrix.config }}" ` "-property:RunCodeAnalysis=false" ` .\vsbuild\usvfs.sln diff --git a/.gitignore b/.gitignore index 14ef70b2..1e0e45f0 100644 --- a/.gitignore +++ b/.gitignore @@ -8,6 +8,7 @@ # build intermediates: /vsbuild/Release +/vsbuild/ReleaseTest /vsbuild/Debug # test "side effects" diff --git a/src/shared/test_helpers.cpp b/src/shared/test_helpers.cpp index 5ff5bb79..5b6da3da 100644 --- a/src/shared/test_helpers.cpp +++ b/src/shared/test_helpers.cpp @@ -1,6 +1,6 @@ #pragma once -#if 0 +#if USVFS_BUILD_TESTS #include "test_helpers.h" #include "winapi.h" diff --git a/src/shared/test_helpers.h b/src/shared/test_helpers.h index ce968604..1ca928e0 100644 --- a/src/shared/test_helpers.h +++ b/src/shared/test_helpers.h @@ -1,9 +1,11 @@ #pragma once -#if 0 +#if USVFS_BUILD_TESTS #include "windows_sane.h" +#include + namespace test { class FuncFailed : public std::runtime_error diff --git a/src/shared/winapi.h b/src/shared/winapi.h index 3a28b9d0..e66da750 100644 --- a/src/shared/winapi.h +++ b/src/shared/winapi.h @@ -21,6 +21,7 @@ along with usvfs. If not, see . #pragma once #include "windows_sane.h" +#include #include "logging.h" #include "stringcast.h" diff --git a/test/shared_test/main.cpp b/test/shared_test/main.cpp index 8d3d168c..7c9c58c8 100644 --- a/test/shared_test/main.cpp +++ b/test/shared_test/main.cpp @@ -10,6 +10,8 @@ #include #undef PRIVATE +#include + using namespace usvfs::shared; using namespace boost::interprocess; diff --git a/test/test_file_operations/test_file_operations.cpp b/test/test_file_operations/test_file_operations.cpp index 074c5f84..3cc049d9 100644 --- a/test/test_file_operations/test_file_operations.cpp +++ b/test/test_file_operations/test_file_operations.cpp @@ -1,7 +1,11 @@ #include #include -#include #include + +#include +#include +#include + #include #include "test_ntapi.h" #include "test_w32api.h" diff --git a/test/thooklib_test/main.cpp b/test/thooklib_test/main.cpp index 13a65ce2..10ac2219 100644 --- a/test/thooklib_test/main.cpp +++ b/test/thooklib_test/main.cpp @@ -5,9 +5,13 @@ #include #include //#include +#include #include #include #include + +namespace fs = boost::filesystem; + #include diff --git a/test/tinjectlib_test/main.cpp b/test/tinjectlib_test/main.cpp index 0ea2263d..d7bdc7ef 100644 --- a/test/tinjectlib_test/main.cpp +++ b/test/tinjectlib_test/main.cpp @@ -1,9 +1,9 @@ #include #include -#include +#include +#include #include #include -#include using namespace usvfs::shared; using namespace InjectLib; diff --git a/test/tvfs_test/main.cpp b/test/tvfs_test/main.cpp index 7629c280..f14d1bf6 100644 --- a/test/tvfs_test/main.cpp +++ b/test/tvfs_test/main.cpp @@ -19,6 +19,10 @@ You should have received a copy of the GNU General Public License along with usvfs. If not, see . */ +// this file depends on so many stuff that the easiest way is to include +// pch.h from shared +#include "pch.h" + #include #pragma warning (push, 3) diff --git a/test/usvfs_test/usvfs_test.cpp b/test/usvfs_test/usvfs_test.cpp index 40a14dc1..d6d67d23 100644 --- a/test/usvfs_test/usvfs_test.cpp +++ b/test/usvfs_test/usvfs_test.cpp @@ -1,9 +1,13 @@ #include #include + +#include +#include #include -#include + #include "usvfs_basic_test.h" +#include void print_usage(const std::wstring& exe_name, const std::wstring& test_name) { using namespace std; diff --git a/test/usvfs_test/usvfs_test_base.cpp b/test/usvfs_test/usvfs_test_base.cpp index e8ba3d3c..eab3a4d1 100644 --- a/test/usvfs_test/usvfs_test_base.cpp +++ b/test/usvfs_test/usvfs_test_base.cpp @@ -1,5 +1,7 @@ #include "usvfs_test_base.h" +#include +#include #include #include #include diff --git a/test/usvfs_test/usvfs_test_base.h b/test/usvfs_test/usvfs_test_base.h index 747fc6cb..10f41405 100644 --- a/test/usvfs_test/usvfs_test_base.h +++ b/test/usvfs_test/usvfs_test_base.h @@ -1,9 +1,9 @@ #pragma once -#include -#include #include +#include + class usvfs_test_options { public: static constexpr auto DEFAULT_MAPPING = L"vfs_mappings.txt"; diff --git a/test/usvfs_test_runner/usvfs_test_runner.cpp b/test/usvfs_test_runner/usvfs_test_runner.cpp index e2fb7d81..b36bffab 100644 --- a/test/usvfs_test_runner/usvfs_test_runner.cpp +++ b/test/usvfs_test_runner/usvfs_test_runner.cpp @@ -1,4 +1,6 @@ #include + +#include #include #include #include diff --git a/vsbuild/asmjit.vcxproj b/vsbuild/asmjit.vcxproj index 37a9a04d..50d2134c 100644 --- a/vsbuild/asmjit.vcxproj +++ b/vsbuild/asmjit.vcxproj @@ -5,6 +5,14 @@ Debug Win32 + + ReleaseTest + Win32 + + + ReleaseTest + x64 + Release Win32 @@ -95,6 +103,13 @@ true Unicode + + StaticLibrary + false + v143 + true + Unicode + StaticLibrary true @@ -108,6 +123,13 @@ true Unicode + + StaticLibrary + false + v143 + true + Unicode + @@ -121,6 +143,10 @@ + + + + @@ -129,6 +155,10 @@ + + + + @@ -155,6 +185,18 @@ true + + + MaxSpeed + true + true + ASMJIT_STATIC;%(PreprocessorDefinitions) + + + true + true + + MaxSpeed @@ -167,6 +209,18 @@ true + + + MaxSpeed + true + true + ASMJIT_STATIC;%(PreprocessorDefinitions) + + + true + true + + diff --git a/vsbuild/fmt.vcxproj b/vsbuild/fmt.vcxproj index ae91c2f0..26ad775f 100644 --- a/vsbuild/fmt.vcxproj +++ b/vsbuild/fmt.vcxproj @@ -5,6 +5,14 @@ Debug Win32 + + ReleaseTest + Win32 + + + ReleaseTest + x64 + Release Win32 @@ -38,6 +46,13 @@ true Unicode + + StaticLibrary + false + v143 + true + Unicode + StaticLibrary true @@ -51,6 +66,13 @@ true Unicode + + StaticLibrary + false + v143 + true + Unicode + @@ -64,6 +86,10 @@ + + + + @@ -72,6 +98,10 @@ + + + + @@ -95,6 +125,17 @@ true + + + MaxSpeed + true + true + + + true + true + + MaxSpeed @@ -106,6 +147,17 @@ true + + + MaxSpeed + true + true + + + true + true + + diff --git a/vsbuild/shared.vcxproj b/vsbuild/shared.vcxproj index 70d9f03b..ccdf46a5 100644 --- a/vsbuild/shared.vcxproj +++ b/vsbuild/shared.vcxproj @@ -5,6 +5,14 @@ Debug Win32 + + ReleaseTest + Win32 + + + ReleaseTest + x64 + Release Win32 @@ -38,6 +46,13 @@ true Unicode + + StaticLibrary + false + v143 + true + Unicode + StaticLibrary true @@ -51,6 +66,13 @@ true Unicode + + StaticLibrary + false + v143 + true + Unicode + @@ -66,6 +88,11 @@ + + + + + @@ -76,6 +103,11 @@ + + + + + @@ -113,6 +145,24 @@ true + + + MaxSpeed + true + Default + true + false + stdcpp17 + Use + pch.h + pch.h + USVFS_BUILD_TESTS;%(PreprocessorDefinitions) + + + true + true + + MaxSpeed @@ -130,6 +180,24 @@ true + + + MaxSpeed + true + Default + true + false + stdcpp17 + Use + pch.h + pch.h + USVFS_BUILD_TESTS;SPDLOG_NO_NAME;SPDLOG_NO_REGISTRY_MUTEX;NOMINMAX;%(PreprocessorDefinitions) + + + true + true + + @@ -138,8 +206,10 @@ Create Create + Create Create Create + Create diff --git a/vsbuild/shared_test.vcxproj b/vsbuild/shared_test.vcxproj index d5df1a44..824c3b35 100644 --- a/vsbuild/shared_test.vcxproj +++ b/vsbuild/shared_test.vcxproj @@ -5,6 +5,14 @@ Debug Win32 + + ReleaseTest + Win32 + + + ReleaseTest + x64 + Release Win32 @@ -38,6 +46,13 @@ true Unicode + + Application + false + v143 + true + Unicode + Application true @@ -51,6 +66,13 @@ true Unicode + + Application + false + v143 + true + Unicode + @@ -66,6 +88,11 @@ + + + + + @@ -76,6 +103,11 @@ + + + + + @@ -109,6 +141,25 @@ Console + + + MaxSpeed + true + true + stdcpp17 + NotUsing + pch.h + MultiThreaded + $(GTEST_PATH)\googletest\include;$(BOOST_PATH);%(AdditionalIncludeDirectories) + USVFS_BUILD_TESTS;UNITTEST;%(PreprocessorDefinitions) + + + true + true + Console + %(AdditionalLibraryDirectories);$(GTEST_LIBDIR);$(GTEST_PATH)\build$(PLATFORM_32)\lib + + MaxSpeed @@ -122,10 +173,30 @@ Console + + + MaxSpeed + true + true + stdcpp17 + $(GTEST_PATH)\googletest\include;$(BOOST_PATH);%(AdditionalIncludeDirectories) + USVFS_BUILD_TESTS;UNITTEST;%(PreprocessorDefinitions) + pch.h + + + true + true + Console + %(AdditionalLibraryDirectories);$(GTEST_LIBDIR);$(GTEST_PATH)\build$(PLATFORM_32)\lib + + + + {e75f344a-1373-4e3f-97ea-bc80ca42e0f0} + {2bb3300b-f08a-4063-95c4-8a0fadae6c51} diff --git a/vsbuild/spdlog.vcxproj b/vsbuild/spdlog.vcxproj index 8b32b433..46c5b6f8 100644 --- a/vsbuild/spdlog.vcxproj +++ b/vsbuild/spdlog.vcxproj @@ -5,6 +5,14 @@ Debug Win32 + + ReleaseTest + Win32 + + + ReleaseTest + x64 + Release Win32 @@ -38,6 +46,13 @@ true MultiByte + + Application + false + v143 + true + MultiByte + Application true @@ -51,6 +66,13 @@ true MultiByte + + Application + false + v143 + true + MultiByte + @@ -64,6 +86,10 @@ + + + + @@ -72,6 +98,10 @@ + + + + @@ -86,6 +116,18 @@ true + + + MaxSpeed + true + true + true + + + true + true + + Disabled @@ -110,6 +152,18 @@ true + + + MaxSpeed + true + true + true + + + true + true + + diff --git a/vsbuild/test_file_operations.vcxproj b/vsbuild/test_file_operations.vcxproj index b9ff5758..ba47a66e 100644 --- a/vsbuild/test_file_operations.vcxproj +++ b/vsbuild/test_file_operations.vcxproj @@ -5,6 +5,14 @@ Debug Win32 + + ReleaseTest + Win32 + + + ReleaseTest + x64 + Release Win32 @@ -38,6 +46,13 @@ true Unicode + + Application + false + v143 + true + Unicode + Application true @@ -51,6 +66,13 @@ true Unicode + + Application + false + v143 + true + Unicode + @@ -66,6 +88,11 @@ + + + + + @@ -76,6 +103,11 @@ + + + + + @@ -112,6 +144,24 @@ ntdll.lib;%(AdditionalDependencies) + + + MaxSpeed + true + true + stdcpp17 + $(GTEST_PATH)\googletest\include;$(BOOST_PATH);%(AdditionalIncludeDirectories) + USVFS_BUILD_TESTS;UNITTEST;%(PreprocessorDefinitions) + pch.h + + + true + true + Console + ntdll.lib;%(AdditionalDependencies) + %(AdditionalLibraryDirectories);$(GTEST_LIBDIR);$(GTEST_PATH)\build$(PLATFORM_32)\lib + + MaxSpeed @@ -126,6 +176,24 @@ ntdll.lib;%(AdditionalDependencies) + + + MaxSpeed + true + true + stdcpp17 + USVFS_BUILD_TESTS;UNITTEST;%(PreprocessorDefinitions) + $(GTEST_PATH)\googletest\include;$(BOOST_PATH);%(AdditionalIncludeDirectories) + pch.h + + + true + true + Console + ntdll.lib;%(AdditionalDependencies) + %(AdditionalLibraryDirectories);$(GTEST_LIBDIR);$(GTEST_PATH)\build$(PLATFORM_32)\lib + + @@ -133,6 +201,9 @@ + + {e75f344a-1373-4e3f-97ea-bc80ca42e0f0} + {2bb3300b-f08a-4063-95c4-8a0fadae6c51} diff --git a/vsbuild/testinject_bin.vcxproj b/vsbuild/testinject_bin.vcxproj index 99191a55..7f8d3ca7 100644 --- a/vsbuild/testinject_bin.vcxproj +++ b/vsbuild/testinject_bin.vcxproj @@ -5,6 +5,14 @@ Debug Win32 + + ReleaseTest + Win32 + + + ReleaseTest + x64 + Release Win32 @@ -38,6 +46,13 @@ true Unicode + + Application + false + v143 + true + Unicode + Application true @@ -51,6 +66,13 @@ true Unicode + + Application + false + v143 + true + Unicode + @@ -66,6 +88,11 @@ + + + + + @@ -76,6 +103,11 @@ + + + + + @@ -109,6 +141,20 @@ Console + + + MaxSpeed + true + true + stdcpp17 + + + true + true + Console + %(AdditionalLibraryDirectories);$(GTEST_LIBDIR);$(GTEST_PATH)\build$(PLATFORM_32)\lib + + MaxSpeed @@ -122,6 +168,20 @@ Console + + + MaxSpeed + true + true + stdcpp17 + + + true + true + Console + %(AdditionalLibraryDirectories);$(GTEST_LIBDIR);$(GTEST_PATH)\build$(PLATFORM_32)\lib + + diff --git a/vsbuild/testinject_dll.vcxproj b/vsbuild/testinject_dll.vcxproj index 4afc7be1..18360b3c 100644 --- a/vsbuild/testinject_dll.vcxproj +++ b/vsbuild/testinject_dll.vcxproj @@ -5,6 +5,14 @@ Debug Win32 + + ReleaseTest + Win32 + + + ReleaseTest + x64 + Release Win32 @@ -38,6 +46,13 @@ true Unicode + + DynamicLibrary + false + v143 + true + Unicode + DynamicLibrary true @@ -51,6 +66,13 @@ true Unicode + + DynamicLibrary + false + v143 + true + Unicode + @@ -66,6 +88,11 @@ + + + + + @@ -76,6 +103,11 @@ + + + + + @@ -102,6 +134,19 @@ true + + + MaxSpeed + true + true + stdcpp17 + + + true + true + %(AdditionalLibraryDirectories);$(GTEST_LIBDIR);$(GTEST_PATH)\build$(PLATFORM_32)\lib + + MaxSpeed @@ -114,6 +159,19 @@ true + + + MaxSpeed + true + true + stdcpp17 + + + true + true + %(AdditionalLibraryDirectories);$(GTEST_LIBDIR);$(GTEST_PATH)\build$(PLATFORM_32)\lib + + diff --git a/vsbuild/thooklib.vcxproj b/vsbuild/thooklib.vcxproj index 3703a4ee..f139341b 100644 --- a/vsbuild/thooklib.vcxproj +++ b/vsbuild/thooklib.vcxproj @@ -5,6 +5,14 @@ Debug Win32 + + ReleaseTest + Win32 + + + ReleaseTest + x64 + Release Win32 @@ -38,6 +46,13 @@ true Unicode + + StaticLibrary + false + v143 + true + Unicode + StaticLibrary true @@ -51,6 +66,13 @@ true Unicode + + StaticLibrary + false + v143 + true + Unicode + @@ -66,6 +88,11 @@ + + + + + @@ -76,6 +103,11 @@ + + + + + @@ -113,6 +145,23 @@ true + + + MaxSpeed + true + Default + true + false + stdcpp17 + Use + pch.h + pch.h + + + true + true + + MaxSpeed @@ -130,6 +179,23 @@ true + + + MaxSpeed + true + Default + true + false + stdcpp17 + Use + pch.h + pch.h + + + true + true + + @@ -142,8 +208,10 @@ Create Create + Create Create Create + Create diff --git a/vsbuild/thooklib_test.vcxproj b/vsbuild/thooklib_test.vcxproj index 18789be5..41915459 100644 --- a/vsbuild/thooklib_test.vcxproj +++ b/vsbuild/thooklib_test.vcxproj @@ -5,6 +5,14 @@ Debug Win32 + + ReleaseTest + Win32 + + + ReleaseTest + x64 + Release Win32 @@ -38,6 +46,13 @@ true Unicode + + Application + false + v143 + true + Unicode + Application true @@ -51,6 +66,13 @@ true Unicode + + Application + false + v143 + true + Unicode + @@ -66,6 +88,11 @@ + + + + + @@ -76,6 +103,11 @@ + + + + + @@ -109,6 +141,21 @@ Console + + + MaxSpeed + true + true + stdcpp17 + $(GTEST_PATH)\googletest\include;$(BOOST_PATH);%(AdditionalIncludeDirectories) + + + true + true + Console + %(AdditionalLibraryDirectories);$(GTEST_LIBDIR);$(GTEST_PATH)\build$(PLATFORM_32)\lib + + MaxSpeed @@ -122,6 +169,20 @@ Console + + + MaxSpeed + true + true + stdcpp17 + + + true + true + Console + %(AdditionalLibraryDirectories);$(GTEST_LIBDIR);$(GTEST_PATH)\build$(PLATFORM_32)\lib + + diff --git a/vsbuild/tinjectlib.vcxproj b/vsbuild/tinjectlib.vcxproj index 2a820495..c6861d2c 100644 --- a/vsbuild/tinjectlib.vcxproj +++ b/vsbuild/tinjectlib.vcxproj @@ -5,6 +5,14 @@ Debug Win32 + + ReleaseTest + Win32 + + + ReleaseTest + x64 + Release Win32 @@ -38,6 +46,13 @@ true Unicode + + StaticLibrary + false + v143 + true + Unicode + StaticLibrary true @@ -51,6 +66,13 @@ true Unicode + + StaticLibrary + false + v143 + true + Unicode + @@ -66,6 +88,11 @@ + + + + + @@ -76,6 +103,11 @@ + + + + + @@ -104,6 +136,20 @@ true + + + MaxSpeed + true + Default + true + false + stdcpp17 + + + true + true + + MaxSpeed @@ -118,6 +164,20 @@ true + + + MaxSpeed + true + Default + true + false + stdcpp17 + + + true + true + + diff --git a/vsbuild/tinjectlib_test.vcxproj b/vsbuild/tinjectlib_test.vcxproj index aef124c3..602ba240 100644 --- a/vsbuild/tinjectlib_test.vcxproj +++ b/vsbuild/tinjectlib_test.vcxproj @@ -5,6 +5,14 @@ Debug Win32 + + ReleaseTest + Win32 + + + ReleaseTest + x64 + Release Win32 @@ -38,6 +46,13 @@ true Unicode + + Application + false + v143 + true + Unicode + Application true @@ -51,6 +66,13 @@ true Unicode + + Application + false + v143 + true + Unicode + @@ -66,6 +88,11 @@ + + + + + @@ -76,6 +103,11 @@ + + + + + @@ -107,6 +139,20 @@ Console + + + MaxSpeed + true + true + stdcpp17 + + + true + true + Console + %(AdditionalLibraryDirectories);$(GTEST_LIBDIR);$(GTEST_PATH)\build$(PLATFORM_32)\lib + + MaxSpeed @@ -120,6 +166,20 @@ Console + + + MaxSpeed + true + true + stdcpp17 + + + true + true + Console + %(AdditionalLibraryDirectories);$(GTEST_LIBDIR);$(GTEST_PATH)\build$(PLATFORM_32)\lib + + diff --git a/vsbuild/tvfs_test.vcxproj b/vsbuild/tvfs_test.vcxproj index c2ea6159..bb05db4b 100644 --- a/vsbuild/tvfs_test.vcxproj +++ b/vsbuild/tvfs_test.vcxproj @@ -5,6 +5,14 @@ Debug Win32 + + ReleaseTest + Win32 + + + ReleaseTest + x64 + Release Win32 @@ -38,6 +46,13 @@ true Unicode + + Application + false + v143 + true + Unicode + Application true @@ -51,6 +66,13 @@ true Unicode + + Application + false + v143 + true + Unicode + @@ -66,6 +88,11 @@ + + + + + @@ -76,6 +103,11 @@ + + + + + @@ -113,6 +145,24 @@ usvfs_$(PlatformShortName).dll + + + MaxSpeed + true + true + ..\src\usvfs_dll;$(GTEST_PATH)\googletest\include;$(BOOST_PATH);%(AdditionalIncludeDirectories) + stdcpp17 + USVFS_BUILD_TESTS;UNITTEST;%(PreprocessorDefinitions) + pch.h + + + true + true + Console + usvfs_$(PlatformShortName).dll + %(AdditionalLibraryDirectories);$(GTEST_LIBDIR);$(GTEST_PATH)\build$(PLATFORM_32)\lib + + MaxSpeed @@ -128,6 +178,24 @@ usvfs_$(PlatformShortName).dll + + + MaxSpeed + true + true + ..\src\usvfs_dll;$(GTEST_PATH)\googletest\include;$(BOOST_PATH);%(AdditionalIncludeDirectories) + stdcpp17 + USVFS_BUILD_TESTS;UNITTEST;%(PreprocessorDefinitions) + pch.h + + + true + true + Console + usvfs_$(PlatformShortName).dll + %(AdditionalLibraryDirectories);$(GTEST_LIBDIR);$(GTEST_PATH)\build$(PLATFORM_32)\lib + + diff --git a/vsbuild/udis86.vcxproj b/vsbuild/udis86.vcxproj index 1ccb2384..1c09403b 100644 --- a/vsbuild/udis86.vcxproj +++ b/vsbuild/udis86.vcxproj @@ -5,6 +5,14 @@ Debug Win32 + + ReleaseTest + Win32 + + + ReleaseTest + x64 + Release Win32 @@ -38,6 +46,13 @@ true Unicode + + StaticLibrary + false + v143 + true + Unicode + StaticLibrary true @@ -51,6 +66,13 @@ true Unicode + + StaticLibrary + false + v143 + true + Unicode + @@ -66,6 +88,11 @@ + + + + + @@ -76,6 +103,11 @@ + + + + + PrepareForBuild @@ -83,12 +115,18 @@ PrepareForBuild + + PrepareForBuild + PrepareForBuild PrepareForBuild + + PrepareForBuild + Disabled @@ -149,6 +187,30 @@ ..\udis86\docs\x86\optable.xml;..\udis86\scripts\ud_itab.py;..\udis86\scripts\ud_opcode.py + + + MaxSpeed + true + true + C:\Games\MO2\build\usvfs_clean\udis86\libudis86;%(AdditionalIncludeDirectories) + + + true + true + + + python ..\udis86\scripts\ud_itab.py ..\udis86\docs\x86\optable.xml ..\udis86\libudis86 + + + Building udis86 optable + + + ..\udis86\libudis86\itab.c;..\udis86\libudis86\itab.h + + + ..\udis86\docs\x86\optable.xml;..\udis86\scripts\ud_itab.py;..\udis86\scripts\ud_opcode.py + + MaxSpeed @@ -173,6 +235,30 @@ ..\udis86\docs\x86\optable.xml;..\udis86\scripts\ud_itab.py;..\udis86\scripts\ud_opcode.py + + + MaxSpeed + true + true + C:\Games\MO2\build\usvfs_clean\udis86\libudis86;%(AdditionalIncludeDirectories) + + + true + true + + + python ..\udis86\scripts\ud_itab.py ..\udis86\docs\x86\optable.xml ..\udis86\libudis86 + + + Building udis86 optable + + + ..\udis86\libudis86\itab.c;..\udis86\libudis86\itab.h + + + ..\udis86\docs\x86\optable.xml;..\udis86\scripts\ud_itab.py;..\udis86\scripts\ud_opcode.py + + diff --git a/vsbuild/usvfs.sln b/vsbuild/usvfs.sln index 1005382f..e5dad046 100644 --- a/vsbuild/usvfs.sln +++ b/vsbuild/usvfs.sln @@ -1,17 +1,18 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 16 -VisualStudioVersion = 16.0.30803.129 +# Visual Studio Version 17 +VisualStudioVersion = 17.10.34916.146 MinimumVisualStudioVersion = 10.0.40219.1 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "shared", "shared.vcxproj", "{2BB3300B-F08A-4063-95C4-8A0FADAE6C51}" ProjectSection(ProjectDependencies) = postProject - {E75F344A-1373-4E3F-97EA-BC80CA42E0F0} = {E75F344A-1373-4E3F-97EA-BC80CA42E0F0} {CDADDEC0-B72B-43B4-831F-72BA85B72805} = {CDADDEC0-B72B-43B4-831F-72BA85B72805} + {E75F344A-1373-4E3F-97EA-BC80CA42E0F0} = {E75F344A-1373-4E3F-97EA-BC80CA42E0F0} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "shared_test", "shared_test.vcxproj", "{26B28EFA-5EEB-45AC-AF8F-C20F478070F8}" ProjectSection(ProjectDependencies) = postProject {2BB3300B-F08A-4063-95C4-8A0FADAE6C51} = {2BB3300B-F08A-4063-95C4-8A0FADAE6C51} + {E75F344A-1373-4E3F-97EA-BC80CA42E0F0} = {E75F344A-1373-4E3F-97EA-BC80CA42E0F0} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testinject_bin", "testinject_bin.vcxproj", "{5705ABC8-8CF4-4A1C-AACF-22554B38E04A}" @@ -21,8 +22,8 @@ EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "thooklib", "thooklib.vcxproj", "{1CE90F86-126E-40AB-BD8B-08B25FD2E68E}" ProjectSection(ProjectDependencies) = postProject {2BB3300B-F08A-4063-95C4-8A0FADAE6C51} = {2BB3300B-F08A-4063-95C4-8A0FADAE6C51} - {5B0E078A-D196-4EBB-BD6E-DCFB48B15E90} = {5B0E078A-D196-4EBB-BD6E-DCFB48B15E90} {5338B9D6-C2A9-4DED-B7E8-31292B96CBF2} = {5338B9D6-C2A9-4DED-B7E8-31292B96CBF2} + {5B0E078A-D196-4EBB-BD6E-DCFB48B15E90} = {5B0E078A-D196-4EBB-BD6E-DCFB48B15E90} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "thooklib_test", "thooklib_test.vcxproj", "{931A68BE-AF5F-48C9-AFAE-C8DC08103E33}" @@ -39,17 +40,17 @@ EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tinjectlib_test", "tinjectlib_test.vcxproj", "{5F393577-7E8E-43A4-B476-BFCC78147D0D}" ProjectSection(ProjectDependencies) = postProject {2BB3300B-F08A-4063-95C4-8A0FADAE6C51} = {2BB3300B-F08A-4063-95C4-8A0FADAE6C51} + {5705ABC8-8CF4-4A1C-AACF-22554B38E04A} = {5705ABC8-8CF4-4A1C-AACF-22554B38E04A} {D18D0B1C-37B4-48A8-88C0-399DE2815C05} = {D18D0B1C-37B4-48A8-88C0-399DE2815C05} {D536BD2F-BA2D-4C70-A2F8-EF08580F8280} = {D536BD2F-BA2D-4C70-A2F8-EF08580F8280} - {5705ABC8-8CF4-4A1C-AACF-22554B38E04A} = {5705ABC8-8CF4-4A1C-AACF-22554B38E04A} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "usvfs_dll", "usvfs_dll.vcxproj", "{562B0058-4701-4284-8B40-D87648A3F64C}" ProjectSection(ProjectDependencies) = postProject - {2BB3300B-F08A-4063-95C4-8A0FADAE6C51} = {2BB3300B-F08A-4063-95C4-8A0FADAE6C51} - {D18D0B1C-37B4-48A8-88C0-399DE2815C05} = {D18D0B1C-37B4-48A8-88C0-399DE2815C05} {1CE90F86-126E-40AB-BD8B-08B25FD2E68E} = {1CE90F86-126E-40AB-BD8B-08B25FD2E68E} + {2BB3300B-F08A-4063-95C4-8A0FADAE6C51} = {2BB3300B-F08A-4063-95C4-8A0FADAE6C51} {BA5B2CAC-8B75-4C6B-83C7-FFB963E872B6} = {BA5B2CAC-8B75-4C6B-83C7-FFB963E872B6} + {D18D0B1C-37B4-48A8-88C0-399DE2815C05} = {D18D0B1C-37B4-48A8-88C0-399DE2815C05} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "usvfs_proxy", "usvfs_proxy.vcxproj", "{50AC03C1-BB24-4033-90E6-ABE65BCC13DC}" @@ -94,6 +95,8 @@ Global Debug|x86 = Debug|x86 Release|x64 = Release|x64 Release|x86 = Release|x86 + ReleaseTest|x64 = ReleaseTest|x64 + ReleaseTest|x86 = ReleaseTest|x86 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution {2BB3300B-F08A-4063-95C4-8A0FADAE6C51}.Debug|x64.ActiveCfg = Debug|x64 @@ -104,24 +107,40 @@ Global {2BB3300B-F08A-4063-95C4-8A0FADAE6C51}.Release|x64.Build.0 = Release|x64 {2BB3300B-F08A-4063-95C4-8A0FADAE6C51}.Release|x86.ActiveCfg = Release|Win32 {2BB3300B-F08A-4063-95C4-8A0FADAE6C51}.Release|x86.Build.0 = Release|Win32 + {2BB3300B-F08A-4063-95C4-8A0FADAE6C51}.ReleaseTest|x64.ActiveCfg = ReleaseTest|x64 + {2BB3300B-F08A-4063-95C4-8A0FADAE6C51}.ReleaseTest|x64.Build.0 = ReleaseTest|x64 + {2BB3300B-F08A-4063-95C4-8A0FADAE6C51}.ReleaseTest|x86.ActiveCfg = ReleaseTest|Win32 + {2BB3300B-F08A-4063-95C4-8A0FADAE6C51}.ReleaseTest|x86.Build.0 = ReleaseTest|Win32 {26B28EFA-5EEB-45AC-AF8F-C20F478070F8}.Debug|x64.ActiveCfg = Debug|x64 {26B28EFA-5EEB-45AC-AF8F-C20F478070F8}.Debug|x64.Build.0 = Debug|x64 {26B28EFA-5EEB-45AC-AF8F-C20F478070F8}.Debug|x86.ActiveCfg = Debug|Win32 {26B28EFA-5EEB-45AC-AF8F-C20F478070F8}.Debug|x86.Build.0 = Debug|Win32 {26B28EFA-5EEB-45AC-AF8F-C20F478070F8}.Release|x64.ActiveCfg = Release|x64 {26B28EFA-5EEB-45AC-AF8F-C20F478070F8}.Release|x86.ActiveCfg = Release|Win32 + {26B28EFA-5EEB-45AC-AF8F-C20F478070F8}.ReleaseTest|x64.ActiveCfg = ReleaseTest|x64 + {26B28EFA-5EEB-45AC-AF8F-C20F478070F8}.ReleaseTest|x64.Build.0 = ReleaseTest|x64 + {26B28EFA-5EEB-45AC-AF8F-C20F478070F8}.ReleaseTest|x86.ActiveCfg = ReleaseTest|Win32 + {26B28EFA-5EEB-45AC-AF8F-C20F478070F8}.ReleaseTest|x86.Build.0 = ReleaseTest|Win32 {5705ABC8-8CF4-4A1C-AACF-22554B38E04A}.Debug|x64.ActiveCfg = Debug|x64 {5705ABC8-8CF4-4A1C-AACF-22554B38E04A}.Debug|x64.Build.0 = Debug|x64 {5705ABC8-8CF4-4A1C-AACF-22554B38E04A}.Debug|x86.ActiveCfg = Debug|Win32 {5705ABC8-8CF4-4A1C-AACF-22554B38E04A}.Debug|x86.Build.0 = Debug|Win32 {5705ABC8-8CF4-4A1C-AACF-22554B38E04A}.Release|x64.ActiveCfg = Release|x64 {5705ABC8-8CF4-4A1C-AACF-22554B38E04A}.Release|x86.ActiveCfg = Release|Win32 + {5705ABC8-8CF4-4A1C-AACF-22554B38E04A}.ReleaseTest|x64.ActiveCfg = ReleaseTest|x64 + {5705ABC8-8CF4-4A1C-AACF-22554B38E04A}.ReleaseTest|x64.Build.0 = ReleaseTest|x64 + {5705ABC8-8CF4-4A1C-AACF-22554B38E04A}.ReleaseTest|x86.ActiveCfg = ReleaseTest|Win32 + {5705ABC8-8CF4-4A1C-AACF-22554B38E04A}.ReleaseTest|x86.Build.0 = ReleaseTest|Win32 {D536BD2F-BA2D-4C70-A2F8-EF08580F8280}.Debug|x64.ActiveCfg = Debug|x64 {D536BD2F-BA2D-4C70-A2F8-EF08580F8280}.Debug|x64.Build.0 = Debug|x64 {D536BD2F-BA2D-4C70-A2F8-EF08580F8280}.Debug|x86.ActiveCfg = Debug|Win32 {D536BD2F-BA2D-4C70-A2F8-EF08580F8280}.Debug|x86.Build.0 = Debug|Win32 {D536BD2F-BA2D-4C70-A2F8-EF08580F8280}.Release|x64.ActiveCfg = Release|x64 {D536BD2F-BA2D-4C70-A2F8-EF08580F8280}.Release|x86.ActiveCfg = Release|Win32 + {D536BD2F-BA2D-4C70-A2F8-EF08580F8280}.ReleaseTest|x64.ActiveCfg = ReleaseTest|x64 + {D536BD2F-BA2D-4C70-A2F8-EF08580F8280}.ReleaseTest|x64.Build.0 = ReleaseTest|x64 + {D536BD2F-BA2D-4C70-A2F8-EF08580F8280}.ReleaseTest|x86.ActiveCfg = ReleaseTest|Win32 + {D536BD2F-BA2D-4C70-A2F8-EF08580F8280}.ReleaseTest|x86.Build.0 = ReleaseTest|Win32 {1CE90F86-126E-40AB-BD8B-08B25FD2E68E}.Debug|x64.ActiveCfg = Debug|x64 {1CE90F86-126E-40AB-BD8B-08B25FD2E68E}.Debug|x64.Build.0 = Debug|x64 {1CE90F86-126E-40AB-BD8B-08B25FD2E68E}.Debug|x86.ActiveCfg = Debug|Win32 @@ -130,12 +149,20 @@ Global {1CE90F86-126E-40AB-BD8B-08B25FD2E68E}.Release|x64.Build.0 = Release|x64 {1CE90F86-126E-40AB-BD8B-08B25FD2E68E}.Release|x86.ActiveCfg = Release|Win32 {1CE90F86-126E-40AB-BD8B-08B25FD2E68E}.Release|x86.Build.0 = Release|Win32 + {1CE90F86-126E-40AB-BD8B-08B25FD2E68E}.ReleaseTest|x64.ActiveCfg = ReleaseTest|x64 + {1CE90F86-126E-40AB-BD8B-08B25FD2E68E}.ReleaseTest|x64.Build.0 = ReleaseTest|x64 + {1CE90F86-126E-40AB-BD8B-08B25FD2E68E}.ReleaseTest|x86.ActiveCfg = ReleaseTest|Win32 + {1CE90F86-126E-40AB-BD8B-08B25FD2E68E}.ReleaseTest|x86.Build.0 = ReleaseTest|Win32 {931A68BE-AF5F-48C9-AFAE-C8DC08103E33}.Debug|x64.ActiveCfg = Debug|x64 {931A68BE-AF5F-48C9-AFAE-C8DC08103E33}.Debug|x64.Build.0 = Debug|x64 {931A68BE-AF5F-48C9-AFAE-C8DC08103E33}.Debug|x86.ActiveCfg = Debug|Win32 {931A68BE-AF5F-48C9-AFAE-C8DC08103E33}.Debug|x86.Build.0 = Debug|Win32 {931A68BE-AF5F-48C9-AFAE-C8DC08103E33}.Release|x64.ActiveCfg = Release|x64 {931A68BE-AF5F-48C9-AFAE-C8DC08103E33}.Release|x86.ActiveCfg = Release|Win32 + {931A68BE-AF5F-48C9-AFAE-C8DC08103E33}.ReleaseTest|x64.ActiveCfg = ReleaseTest|x64 + {931A68BE-AF5F-48C9-AFAE-C8DC08103E33}.ReleaseTest|x64.Build.0 = ReleaseTest|x64 + {931A68BE-AF5F-48C9-AFAE-C8DC08103E33}.ReleaseTest|x86.ActiveCfg = ReleaseTest|Win32 + {931A68BE-AF5F-48C9-AFAE-C8DC08103E33}.ReleaseTest|x86.Build.0 = ReleaseTest|Win32 {D18D0B1C-37B4-48A8-88C0-399DE2815C05}.Debug|x64.ActiveCfg = Debug|x64 {D18D0B1C-37B4-48A8-88C0-399DE2815C05}.Debug|x64.Build.0 = Debug|x64 {D18D0B1C-37B4-48A8-88C0-399DE2815C05}.Debug|x86.ActiveCfg = Debug|Win32 @@ -144,12 +171,20 @@ Global {D18D0B1C-37B4-48A8-88C0-399DE2815C05}.Release|x64.Build.0 = Release|x64 {D18D0B1C-37B4-48A8-88C0-399DE2815C05}.Release|x86.ActiveCfg = Release|Win32 {D18D0B1C-37B4-48A8-88C0-399DE2815C05}.Release|x86.Build.0 = Release|Win32 + {D18D0B1C-37B4-48A8-88C0-399DE2815C05}.ReleaseTest|x64.ActiveCfg = ReleaseTest|x64 + {D18D0B1C-37B4-48A8-88C0-399DE2815C05}.ReleaseTest|x64.Build.0 = ReleaseTest|x64 + {D18D0B1C-37B4-48A8-88C0-399DE2815C05}.ReleaseTest|x86.ActiveCfg = ReleaseTest|Win32 + {D18D0B1C-37B4-48A8-88C0-399DE2815C05}.ReleaseTest|x86.Build.0 = ReleaseTest|Win32 {5F393577-7E8E-43A4-B476-BFCC78147D0D}.Debug|x64.ActiveCfg = Debug|x64 {5F393577-7E8E-43A4-B476-BFCC78147D0D}.Debug|x64.Build.0 = Debug|x64 {5F393577-7E8E-43A4-B476-BFCC78147D0D}.Debug|x86.ActiveCfg = Debug|Win32 {5F393577-7E8E-43A4-B476-BFCC78147D0D}.Debug|x86.Build.0 = Debug|Win32 {5F393577-7E8E-43A4-B476-BFCC78147D0D}.Release|x64.ActiveCfg = Release|x64 {5F393577-7E8E-43A4-B476-BFCC78147D0D}.Release|x86.ActiveCfg = Release|Win32 + {5F393577-7E8E-43A4-B476-BFCC78147D0D}.ReleaseTest|x64.ActiveCfg = ReleaseTest|x64 + {5F393577-7E8E-43A4-B476-BFCC78147D0D}.ReleaseTest|x64.Build.0 = ReleaseTest|x64 + {5F393577-7E8E-43A4-B476-BFCC78147D0D}.ReleaseTest|x86.ActiveCfg = ReleaseTest|Win32 + {5F393577-7E8E-43A4-B476-BFCC78147D0D}.ReleaseTest|x86.Build.0 = ReleaseTest|Win32 {562B0058-4701-4284-8B40-D87648A3F64C}.Debug|x64.ActiveCfg = Debug|x64 {562B0058-4701-4284-8B40-D87648A3F64C}.Debug|x64.Build.0 = Debug|x64 {562B0058-4701-4284-8B40-D87648A3F64C}.Debug|x86.ActiveCfg = Debug|Win32 @@ -158,6 +193,10 @@ Global {562B0058-4701-4284-8B40-D87648A3F64C}.Release|x64.Build.0 = Release|x64 {562B0058-4701-4284-8B40-D87648A3F64C}.Release|x86.ActiveCfg = Release|Win32 {562B0058-4701-4284-8B40-D87648A3F64C}.Release|x86.Build.0 = Release|Win32 + {562B0058-4701-4284-8B40-D87648A3F64C}.ReleaseTest|x64.ActiveCfg = ReleaseTest|x64 + {562B0058-4701-4284-8B40-D87648A3F64C}.ReleaseTest|x64.Build.0 = ReleaseTest|x64 + {562B0058-4701-4284-8B40-D87648A3F64C}.ReleaseTest|x86.ActiveCfg = ReleaseTest|Win32 + {562B0058-4701-4284-8B40-D87648A3F64C}.ReleaseTest|x86.Build.0 = ReleaseTest|Win32 {50AC03C1-BB24-4033-90E6-ABE65BCC13DC}.Debug|x64.ActiveCfg = Debug|x64 {50AC03C1-BB24-4033-90E6-ABE65BCC13DC}.Debug|x64.Build.0 = Debug|x64 {50AC03C1-BB24-4033-90E6-ABE65BCC13DC}.Debug|x86.ActiveCfg = Debug|Win32 @@ -166,6 +205,10 @@ Global {50AC03C1-BB24-4033-90E6-ABE65BCC13DC}.Release|x64.Build.0 = Release|x64 {50AC03C1-BB24-4033-90E6-ABE65BCC13DC}.Release|x86.ActiveCfg = Release|Win32 {50AC03C1-BB24-4033-90E6-ABE65BCC13DC}.Release|x86.Build.0 = Release|Win32 + {50AC03C1-BB24-4033-90E6-ABE65BCC13DC}.ReleaseTest|x64.ActiveCfg = ReleaseTest|x64 + {50AC03C1-BB24-4033-90E6-ABE65BCC13DC}.ReleaseTest|x64.Build.0 = ReleaseTest|x64 + {50AC03C1-BB24-4033-90E6-ABE65BCC13DC}.ReleaseTest|x86.ActiveCfg = ReleaseTest|Win32 + {50AC03C1-BB24-4033-90E6-ABE65BCC13DC}.ReleaseTest|x86.Build.0 = ReleaseTest|Win32 {BA5B2CAC-8B75-4C6B-83C7-FFB963E872B6}.Debug|x64.ActiveCfg = Debug|x64 {BA5B2CAC-8B75-4C6B-83C7-FFB963E872B6}.Debug|x64.Build.0 = Debug|x64 {BA5B2CAC-8B75-4C6B-83C7-FFB963E872B6}.Debug|x86.ActiveCfg = Debug|Win32 @@ -174,12 +217,20 @@ Global {BA5B2CAC-8B75-4C6B-83C7-FFB963E872B6}.Release|x64.Build.0 = Release|x64 {BA5B2CAC-8B75-4C6B-83C7-FFB963E872B6}.Release|x86.ActiveCfg = Release|Win32 {BA5B2CAC-8B75-4C6B-83C7-FFB963E872B6}.Release|x86.Build.0 = Release|Win32 + {BA5B2CAC-8B75-4C6B-83C7-FFB963E872B6}.ReleaseTest|x64.ActiveCfg = ReleaseTest|x64 + {BA5B2CAC-8B75-4C6B-83C7-FFB963E872B6}.ReleaseTest|x64.Build.0 = ReleaseTest|x64 + {BA5B2CAC-8B75-4C6B-83C7-FFB963E872B6}.ReleaseTest|x86.ActiveCfg = ReleaseTest|Win32 + {BA5B2CAC-8B75-4C6B-83C7-FFB963E872B6}.ReleaseTest|x86.Build.0 = ReleaseTest|Win32 {1DDD14EC-2274-4793-803E-B64D278AFD7A}.Debug|x64.ActiveCfg = Debug|x64 {1DDD14EC-2274-4793-803E-B64D278AFD7A}.Debug|x64.Build.0 = Debug|x64 {1DDD14EC-2274-4793-803E-B64D278AFD7A}.Debug|x86.ActiveCfg = Debug|Win32 {1DDD14EC-2274-4793-803E-B64D278AFD7A}.Debug|x86.Build.0 = Debug|Win32 {1DDD14EC-2274-4793-803E-B64D278AFD7A}.Release|x64.ActiveCfg = Release|x64 {1DDD14EC-2274-4793-803E-B64D278AFD7A}.Release|x86.ActiveCfg = Release|Win32 + {1DDD14EC-2274-4793-803E-B64D278AFD7A}.ReleaseTest|x64.ActiveCfg = ReleaseTest|x64 + {1DDD14EC-2274-4793-803E-B64D278AFD7A}.ReleaseTest|x64.Build.0 = ReleaseTest|x64 + {1DDD14EC-2274-4793-803E-B64D278AFD7A}.ReleaseTest|x86.ActiveCfg = ReleaseTest|Win32 + {1DDD14EC-2274-4793-803E-B64D278AFD7A}.ReleaseTest|x86.Build.0 = ReleaseTest|Win32 {5338B9D6-C2A9-4DED-B7E8-31292B96CBF2}.Debug|x64.ActiveCfg = Debug|x64 {5338B9D6-C2A9-4DED-B7E8-31292B96CBF2}.Debug|x64.Build.0 = Debug|x64 {5338B9D6-C2A9-4DED-B7E8-31292B96CBF2}.Debug|x86.ActiveCfg = Debug|Win32 @@ -188,6 +239,10 @@ Global {5338B9D6-C2A9-4DED-B7E8-31292B96CBF2}.Release|x64.Build.0 = Release|x64 {5338B9D6-C2A9-4DED-B7E8-31292B96CBF2}.Release|x86.ActiveCfg = Release|Win32 {5338B9D6-C2A9-4DED-B7E8-31292B96CBF2}.Release|x86.Build.0 = Release|Win32 + {5338B9D6-C2A9-4DED-B7E8-31292B96CBF2}.ReleaseTest|x64.ActiveCfg = ReleaseTest|x64 + {5338B9D6-C2A9-4DED-B7E8-31292B96CBF2}.ReleaseTest|x64.Build.0 = ReleaseTest|x64 + {5338B9D6-C2A9-4DED-B7E8-31292B96CBF2}.ReleaseTest|x86.ActiveCfg = ReleaseTest|Win32 + {5338B9D6-C2A9-4DED-B7E8-31292B96CBF2}.ReleaseTest|x86.Build.0 = ReleaseTest|Win32 {E75F344A-1373-4E3F-97EA-BC80CA42E0F0}.Debug|x64.ActiveCfg = Debug|x64 {E75F344A-1373-4E3F-97EA-BC80CA42E0F0}.Debug|x64.Build.0 = Debug|x64 {E75F344A-1373-4E3F-97EA-BC80CA42E0F0}.Debug|x86.ActiveCfg = Debug|Win32 @@ -196,6 +251,10 @@ Global {E75F344A-1373-4E3F-97EA-BC80CA42E0F0}.Release|x64.Build.0 = Release|x64 {E75F344A-1373-4E3F-97EA-BC80CA42E0F0}.Release|x86.ActiveCfg = Release|Win32 {E75F344A-1373-4E3F-97EA-BC80CA42E0F0}.Release|x86.Build.0 = Release|Win32 + {E75F344A-1373-4E3F-97EA-BC80CA42E0F0}.ReleaseTest|x64.ActiveCfg = ReleaseTest|x64 + {E75F344A-1373-4E3F-97EA-BC80CA42E0F0}.ReleaseTest|x64.Build.0 = ReleaseTest|x64 + {E75F344A-1373-4E3F-97EA-BC80CA42E0F0}.ReleaseTest|x86.ActiveCfg = ReleaseTest|Win32 + {E75F344A-1373-4E3F-97EA-BC80CA42E0F0}.ReleaseTest|x86.Build.0 = ReleaseTest|Win32 {5B0E078A-D196-4EBB-BD6E-DCFB48B15E90}.Debug|x64.ActiveCfg = Debug|x64 {5B0E078A-D196-4EBB-BD6E-DCFB48B15E90}.Debug|x64.Build.0 = Debug|x64 {5B0E078A-D196-4EBB-BD6E-DCFB48B15E90}.Debug|x86.ActiveCfg = Debug|Win32 @@ -204,6 +263,10 @@ Global {5B0E078A-D196-4EBB-BD6E-DCFB48B15E90}.Release|x64.Build.0 = Release|x64 {5B0E078A-D196-4EBB-BD6E-DCFB48B15E90}.Release|x86.ActiveCfg = Release|Win32 {5B0E078A-D196-4EBB-BD6E-DCFB48B15E90}.Release|x86.Build.0 = Release|Win32 + {5B0E078A-D196-4EBB-BD6E-DCFB48B15E90}.ReleaseTest|x64.ActiveCfg = ReleaseTest|x64 + {5B0E078A-D196-4EBB-BD6E-DCFB48B15E90}.ReleaseTest|x64.Build.0 = ReleaseTest|x64 + {5B0E078A-D196-4EBB-BD6E-DCFB48B15E90}.ReleaseTest|x86.ActiveCfg = ReleaseTest|Win32 + {5B0E078A-D196-4EBB-BD6E-DCFB48B15E90}.ReleaseTest|x86.Build.0 = ReleaseTest|Win32 {CDADDEC0-B72B-43B4-831F-72BA85B72805}.Debug|x64.ActiveCfg = Debug|x64 {CDADDEC0-B72B-43B4-831F-72BA85B72805}.Debug|x64.Build.0 = Debug|x64 {CDADDEC0-B72B-43B4-831F-72BA85B72805}.Debug|x86.ActiveCfg = Debug|Win32 @@ -212,24 +275,40 @@ Global {CDADDEC0-B72B-43B4-831F-72BA85B72805}.Release|x64.Build.0 = Release|x64 {CDADDEC0-B72B-43B4-831F-72BA85B72805}.Release|x86.ActiveCfg = Release|Win32 {CDADDEC0-B72B-43B4-831F-72BA85B72805}.Release|x86.Build.0 = Release|Win32 + {CDADDEC0-B72B-43B4-831F-72BA85B72805}.ReleaseTest|x64.ActiveCfg = ReleaseTest|x64 + {CDADDEC0-B72B-43B4-831F-72BA85B72805}.ReleaseTest|x64.Build.0 = ReleaseTest|x64 + {CDADDEC0-B72B-43B4-831F-72BA85B72805}.ReleaseTest|x86.ActiveCfg = ReleaseTest|Win32 + {CDADDEC0-B72B-43B4-831F-72BA85B72805}.ReleaseTest|x86.Build.0 = ReleaseTest|Win32 {0B2FF5AF-8580-458C-8EF4-10E6B6398D3A}.Debug|x64.ActiveCfg = Debug|x64 {0B2FF5AF-8580-458C-8EF4-10E6B6398D3A}.Debug|x64.Build.0 = Debug|x64 {0B2FF5AF-8580-458C-8EF4-10E6B6398D3A}.Debug|x86.ActiveCfg = Debug|Win32 {0B2FF5AF-8580-458C-8EF4-10E6B6398D3A}.Debug|x86.Build.0 = Debug|Win32 {0B2FF5AF-8580-458C-8EF4-10E6B6398D3A}.Release|x64.ActiveCfg = Release|x64 {0B2FF5AF-8580-458C-8EF4-10E6B6398D3A}.Release|x86.ActiveCfg = Release|Win32 + {0B2FF5AF-8580-458C-8EF4-10E6B6398D3A}.ReleaseTest|x64.ActiveCfg = ReleaseTest|x64 + {0B2FF5AF-8580-458C-8EF4-10E6B6398D3A}.ReleaseTest|x64.Build.0 = ReleaseTest|x64 + {0B2FF5AF-8580-458C-8EF4-10E6B6398D3A}.ReleaseTest|x86.ActiveCfg = ReleaseTest|Win32 + {0B2FF5AF-8580-458C-8EF4-10E6B6398D3A}.ReleaseTest|x86.Build.0 = ReleaseTest|Win32 {CEAF96EC-0BAA-4C02-B91B-5C4C49B5455B}.Debug|x64.ActiveCfg = Debug|x64 {CEAF96EC-0BAA-4C02-B91B-5C4C49B5455B}.Debug|x64.Build.0 = Debug|x64 {CEAF96EC-0BAA-4C02-B91B-5C4C49B5455B}.Debug|x86.ActiveCfg = Debug|Win32 {CEAF96EC-0BAA-4C02-B91B-5C4C49B5455B}.Debug|x86.Build.0 = Debug|Win32 {CEAF96EC-0BAA-4C02-B91B-5C4C49B5455B}.Release|x64.ActiveCfg = Release|x64 {CEAF96EC-0BAA-4C02-B91B-5C4C49B5455B}.Release|x86.ActiveCfg = Release|Win32 + {CEAF96EC-0BAA-4C02-B91B-5C4C49B5455B}.ReleaseTest|x64.ActiveCfg = ReleaseTest|x64 + {CEAF96EC-0BAA-4C02-B91B-5C4C49B5455B}.ReleaseTest|x64.Build.0 = ReleaseTest|x64 + {CEAF96EC-0BAA-4C02-B91B-5C4C49B5455B}.ReleaseTest|x86.ActiveCfg = ReleaseTest|Win32 + {CEAF96EC-0BAA-4C02-B91B-5C4C49B5455B}.ReleaseTest|x86.Build.0 = ReleaseTest|Win32 {0452CB4D-A906-4717-94AC-7A450E479BE1}.Debug|x64.ActiveCfg = Debug|x64 {0452CB4D-A906-4717-94AC-7A450E479BE1}.Debug|x64.Build.0 = Debug|x64 {0452CB4D-A906-4717-94AC-7A450E479BE1}.Debug|x86.ActiveCfg = Debug|Win32 {0452CB4D-A906-4717-94AC-7A450E479BE1}.Debug|x86.Build.0 = Debug|Win32 {0452CB4D-A906-4717-94AC-7A450E479BE1}.Release|x64.ActiveCfg = Release|x64 {0452CB4D-A906-4717-94AC-7A450E479BE1}.Release|x86.ActiveCfg = Release|Win32 + {0452CB4D-A906-4717-94AC-7A450E479BE1}.ReleaseTest|x64.ActiveCfg = ReleaseTest|x64 + {0452CB4D-A906-4717-94AC-7A450E479BE1}.ReleaseTest|x64.Build.0 = ReleaseTest|x64 + {0452CB4D-A906-4717-94AC-7A450E479BE1}.ReleaseTest|x86.ActiveCfg = ReleaseTest|Win32 + {0452CB4D-A906-4717-94AC-7A450E479BE1}.ReleaseTest|x86.Build.0 = ReleaseTest|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/vsbuild/usvfs_dll.vcxproj b/vsbuild/usvfs_dll.vcxproj index 23f8aac4..f822dda6 100644 --- a/vsbuild/usvfs_dll.vcxproj +++ b/vsbuild/usvfs_dll.vcxproj @@ -5,6 +5,14 @@ Debug Win32 + + ReleaseTest + Win32 + + + ReleaseTest + x64 + Release Win32 @@ -38,6 +46,13 @@ true Unicode + + DynamicLibrary + false + v143 + true + Unicode + DynamicLibrary true @@ -51,6 +66,13 @@ true Unicode + + DynamicLibrary + false + v143 + true + Unicode + @@ -68,6 +90,12 @@ + + + + + + @@ -80,6 +108,12 @@ + + + + + + ..\lib\ @@ -92,6 +126,12 @@ Build false + + ..\lib\ + usvfs_$(PlatformShortName) + Build + false + ..\lib\ usvfs_$(PlatformShortName) @@ -103,6 +143,12 @@ Build false + + ..\lib\ + usvfs_$(PlatformShortName) + Build + false + Disabled @@ -182,6 +228,37 @@ $(TargetPath) + + + MaxSpeed + true + BUILDING_USVFS_DLL;%(PreprocessorDefinitions) + Default + true + false + stdcpp17 + Use + pch.h + pch.h + + + true + true + Shlwapi.lib;Version.lib;%(AdditionalDependencies) + + + stage_helper.cmd "$(TargetName)" "$(TargetPath)" "$(STAGING_DLL)\$(TargetFileName)" "$(TargetDir)$(TargetName).lib" "$(STAGING_LIB)\$(TargetName).lib" "$(TargetDir)$(TargetName).pdb" "$(STAGING_PDB)\$(TargetName).pdb" + + + Staging + + + $(STAGING_DLL)\$(TargetFileName) + + + $(TargetPath) + + MaxSpeed @@ -213,6 +290,37 @@ $(TargetPath) + + + MaxSpeed + true + BUILDING_USVFS_DLL;%(PreprocessorDefinitions) + Default + true + false + stdcpp17 + Use + pch.h + pch.h + + + true + true + Shlwapi.lib;Version.lib;%(AdditionalDependencies) + + + stage_helper.cmd "$(TargetName)" "$(TargetPath)" "$(STAGING_DLL)\$(TargetFileName)" "$(TargetDir)$(TargetName).lib" "$(STAGING_LIB)\$(TargetName).lib" "$(TargetDir)$(TargetName).pdb" "$(STAGING_PDB)\$(TargetName).pdb" + + + Staging + + + $(STAGING_DLL)\$(TargetFileName) + + + $(TargetPath) + + @@ -226,11 +334,15 @@ Create pch.h Create + Create pch.h + pch.h Create pch.h Create + Create pch.h + pch.h diff --git a/vsbuild/usvfs_helper.vcxproj b/vsbuild/usvfs_helper.vcxproj index 84d8d704..91603899 100644 --- a/vsbuild/usvfs_helper.vcxproj +++ b/vsbuild/usvfs_helper.vcxproj @@ -5,6 +5,14 @@ Debug Win32 + + ReleaseTest + Win32 + + + ReleaseTest + x64 + Release Win32 @@ -38,6 +46,13 @@ true Unicode + + StaticLibrary + false + v143 + true + Unicode + StaticLibrary true @@ -51,6 +66,13 @@ true Unicode + + StaticLibrary + false + v143 + true + Unicode + @@ -66,6 +88,11 @@ + + + + + @@ -76,6 +103,11 @@ + + + + + @@ -105,6 +137,21 @@ true + + + MaxSpeed + true + BUILDING_USVFS_DLL;%(PreprocessorDefinitions) + Default + true + false + stdcpp17 + + + true + true + + MaxSpeed @@ -120,6 +167,21 @@ true + + + MaxSpeed + true + BUILDING_USVFS_DLL;%(PreprocessorDefinitions) + Default + true + false + stdcpp17 + + + true + true + + diff --git a/vsbuild/usvfs_proxy.vcxproj b/vsbuild/usvfs_proxy.vcxproj index 4c327ef3..27c8ef0c 100644 --- a/vsbuild/usvfs_proxy.vcxproj +++ b/vsbuild/usvfs_proxy.vcxproj @@ -5,6 +5,14 @@ Debug Win32 + + ReleaseTest + Win32 + + + ReleaseTest + x64 + Release Win32 @@ -38,6 +46,13 @@ true Unicode + + Application + false + v143 + true + Unicode + Application true @@ -51,6 +66,13 @@ true Unicode + + Application + false + v143 + true + Unicode + @@ -68,6 +90,12 @@ + + + + + + @@ -80,6 +108,12 @@ + + + + + + ..\bin\ @@ -92,6 +126,12 @@ Build false + + ..\bin\ + $(ProjectName)_$(PlatformShortName) + Build + false + ..\bin\ $(ProjectName)_$(PlatformShortName) @@ -102,6 +142,12 @@ false Build + + ..\bin\ + $(ProjectName)_$(PlatformShortName) + false + Build + Disabled @@ -138,6 +184,26 @@ $(TargetPath) + + + MaxSpeed + true + Default + true + false + stdcpp17 + + + true + true + + + Staging + stage_helper.cmd "$(TargetName)" "$(TargetPath)" "$(STAGING_EXE)\$(TargetFileName)" "$(TargetDir)$(TargetName).pdb" "$(STAGING_PDB)\$(TargetName).pdb" + $(STAGING_EXE)\$(TargetFileName) + $(TargetPath) + + MaxSpeed @@ -158,6 +224,26 @@ stage_helper.cmd "$(TargetName)" "$(TargetPath)" "$(STAGING_EXE)\$(TargetFileName)" "$(TargetDir)$(TargetName).pdb" "$(STAGING_PDB)\$(TargetName).pdb" + + + MaxSpeed + true + Default + true + false + stdcpp17 + + + true + true + + + Staging + $(TargetPath) + $(STAGING_EXE)\$(TargetFileName) + stage_helper.cmd "$(TargetName)" "$(TargetPath)" "$(STAGING_EXE)\$(TargetFileName)" "$(TargetDir)$(TargetName).pdb" "$(STAGING_PDB)\$(TargetName).pdb" + + diff --git a/vsbuild/usvfs_test.vcxproj b/vsbuild/usvfs_test.vcxproj index b6077925..55fafc65 100644 --- a/vsbuild/usvfs_test.vcxproj +++ b/vsbuild/usvfs_test.vcxproj @@ -5,6 +5,14 @@ Debug Win32 + + ReleaseTest + Win32 + + + ReleaseTest + x64 + Release Win32 @@ -38,6 +46,13 @@ true Unicode + + Application + false + v143 + true + Unicode + Application true @@ -51,6 +66,13 @@ true Unicode + + Application + false + v143 + true + Unicode + @@ -66,6 +88,11 @@ + + + + + @@ -76,6 +103,11 @@ + + + + + @@ -113,6 +145,25 @@ usvfs_$(PlatformShortName).dll + + + MaxSpeed + true + true + ..\src\usvfs_dll;%(AdditionalIncludeDirectories) + stdcpp17 + NotUsing + USVFS_BUILD_TESTS;UNITTEST;%(PreprocessorDefinitions) + pch.h + + + true + true + Console + usvfs_$(PlatformShortName).dll + %(AdditionalLibraryDirectories);$(GTEST_LIBDIR);$(GTEST_PATH)\build$(PLATFORM_32)\lib + + MaxSpeed @@ -128,12 +179,33 @@ usvfs_$(PlatformShortName).dll + + + MaxSpeed + true + true + ..\src\usvfs_dll;%(AdditionalIncludeDirectories) + stdcpp17 + USVFS_BUILD_TESTS;UNITTEST;%(PreprocessorDefinitions) + pch.h + + + true + true + Console + usvfs_$(PlatformShortName).dll + %(AdditionalLibraryDirectories);$(GTEST_LIBDIR);$(GTEST_PATH)\build$(PLATFORM_32)\lib + + + + {e75f344a-1373-4e3f-97ea-bc80ca42e0f0} + {2bb3300b-f08a-4063-95c4-8a0fadae6c51} diff --git a/vsbuild/usvfs_test_runner.vcxproj b/vsbuild/usvfs_test_runner.vcxproj index 2840bd3c..e12dd44e 100644 --- a/vsbuild/usvfs_test_runner.vcxproj +++ b/vsbuild/usvfs_test_runner.vcxproj @@ -5,6 +5,14 @@ Debug Win32 + + ReleaseTest + Win32 + + + ReleaseTest + x64 + Release Win32 @@ -38,6 +46,13 @@ true Unicode + + Application + false + v143 + true + Unicode + Application true @@ -51,6 +66,13 @@ true Unicode + + Application + false + v143 + true + Unicode + @@ -66,6 +88,11 @@ + + + + + @@ -76,6 +103,11 @@ + + + + + @@ -107,6 +139,23 @@ Console + + + MaxSpeed + true + true + stdcpp17 + $(GTEST_PATH)\googletest\include;$(BOOST_PATH);%(AdditionalIncludeDirectories) + USVFS_BUILD_TESTS;UNITTEST;%(PreprocessorDefinitions) + pch.h + + + true + true + Console + %(AdditionalLibraryDirectories);$(GTEST_LIBDIR);$(GTEST_PATH)\build$(PLATFORM_32)\lib + + MaxSpeed @@ -120,7 +169,26 @@ Console + + + MaxSpeed + true + true + stdcpp17 + USVFS_BUILD_TESTS;UNITTEST;%(PreprocessorDefinitions) + pch.h + + + true + true + Console + %(AdditionalLibraryDirectories);$(GTEST_LIBDIR);$(GTEST_PATH)\build$(PLATFORM_32)\lib + + + + {e75f344a-1373-4e3f-97ea-bc80ca42e0f0} + {2bb3300b-f08a-4063-95c4-8a0fadae6c51}