From 6ac88060b277c95c5dc31338caab188d02ae3ffe Mon Sep 17 00:00:00 2001 From: Andrew Gresyk Date: Tue, 26 Dec 2023 16:33:28 +0200 Subject: [PATCH] 2.4.0 * Added `destroy<>()` * switched msbuild workflow to the premake solution --- .github/workflows/msbuild.yml | 6 +- .gitignore | 2 + .../detail/features/logger_interface.hpp | 10 +- development/ffsm2/detail/shared/utility.hpp | 37 +- development/ffsm2/machine_dev.hpp | 6 +- examples/basic_audio_player/main.cpp | 2 +- examples/basic_traffic_light/main.cpp | 3 +- examples/debug_logger_interface/main.cpp | 4 +- include/ffsm2/machine.hpp | 50 ++- premake.lua | 25 +- .../premake/basic_audio_player-14.vcxproj | 88 ++-- .../premake/basic_audio_player-15.vcxproj | 88 ++-- .../premake/basic_audio_player-16.vcxproj | 80 ++-- .../premake/basic_audio_player-17.vcxproj | 80 ++-- .../premake/basic_audio_player-clang.vcxproj | 80 ++-- .../premake/basic_traffic_light-14.vcxproj | 88 ++-- .../premake/basic_traffic_light-15.vcxproj | 88 ++-- .../premake/basic_traffic_light-16.vcxproj | 80 ++-- .../premake/basic_traffic_light-17.vcxproj | 80 ++-- .../premake/basic_traffic_light-clang.vcxproj | 80 ++-- .../premake/debug_logger_interface-14.vcxproj | 88 ++-- .../premake/debug_logger_interface-15.vcxproj | 88 ++-- .../premake/debug_logger_interface-16.vcxproj | 80 ++-- .../premake/debug_logger_interface-17.vcxproj | 80 ++-- .../debug_logger_interface-clang.vcxproj | 80 ++-- projects/premake/ffsm2-all.sln | 408 +++++++++--------- projects/premake/ffsm2-lite.sln | 75 ++-- projects/premake/ffsm2-vs.sln | 151 +++++++ projects/premake/temp-14.vcxproj | 155 ++----- projects/premake/temp-15.vcxproj | 155 ++----- projects/premake/temp-16.vcxproj | 147 ++----- projects/premake/temp-17.vcxproj | 147 ++----- projects/premake/temp-clang.vcxproj | 147 ++----- projects/premake/test-14.vcxproj | 88 ++-- projects/premake/test-15.vcxproj | 88 ++-- projects/premake/test-16.vcxproj | 80 ++-- projects/premake/test-17.vcxproj | 80 ++-- projects/premake/test-clang.vcxproj | 80 ++-- test/test_access.cpp | 2 +- test/test_ancestors.cpp | 6 +- test/test_replication.cpp | 2 +- test/tools.hpp | 16 +- test/tools.inl | 12 +- test/wiki_class_member.cpp | 51 ++- test/wiki_class_member.hpp | 17 +- 45 files changed, 1409 insertions(+), 1891 deletions(-) create mode 100644 projects/premake/ffsm2-vs.sln diff --git a/.github/workflows/msbuild.yml b/.github/workflows/msbuild.yml index 4f86319..969aedc 100644 --- a/.github/workflows/msbuild.yml +++ b/.github/workflows/msbuild.yml @@ -7,7 +7,7 @@ on: branches: [ master ] env: - SOLUTION_FILE_PATH: projects\visual-studio\ffsm2-vs.sln + SOLUTION_FILE_PATH: projects\premake\ffsm2-vs.sln jobs: build: @@ -16,7 +16,7 @@ jobs: strategy: matrix: BUILD_CONFIG: [ Release, Debug ] - BUILD_PLATFORM: [ x86, x64 ] + BUILD_PLATFORM: [ 32, 64 ] steps: - uses: actions/checkout@v4 @@ -31,4 +31,4 @@ jobs: - name: Test working-directory: ${{env.GITHUB_WORKSPACE}} - run: binaries-${{matrix.BUILD_PLATFORM}}\test-17-${{matrix.BUILD_CONFIG}}-${{matrix.BUILD_PLATFORM}}.exe + run: "binaries/test-17-${{matrix.BUILD_CONFIG}}-${{matrix.BUILD_PLATFORM}}.exe" diff --git a/.gitignore b/.gitignore index 273b15d..02f3330 100644 --- a/.gitignore +++ b/.gitignore @@ -18,3 +18,5 @@ cmake-* /projects/code-lite/test/test.mk /projects/visual-studio/.opencppcov /projects/visual-studio/*.log +/pull.cmd +/push.cmd diff --git a/development/ffsm2/detail/features/logger_interface.hpp b/development/ffsm2/detail/features/logger_interface.hpp index ce20492..95c7663 100644 --- a/development/ffsm2/detail/features/logger_interface.hpp +++ b/development/ffsm2/detail/features/logger_interface.hpp @@ -27,7 +27,7 @@ struct LoggerInterfaceT { void recordMethod(const Context& FFSM2_UNUSED(context), const StateID FFSM2_UNUSED(origin), - const Method FFSM2_UNUSED(method)) noexcept + const Method FFSM2_UNUSED(method)) {} FFSM2_CONSTEXPR(NO) @@ -35,7 +35,7 @@ struct LoggerInterfaceT { void recordTransition(const Context& FFSM2_UNUSED(context), const StateID FFSM2_UNUSED(origin), - const StateID FFSM2_UNUSED(target)) noexcept + const StateID FFSM2_UNUSED(target)) {} #if FFSM2_PLANS_AVAILABLE() @@ -45,14 +45,14 @@ struct LoggerInterfaceT { void recordTaskStatus(const Context& FFSM2_UNUSED(context), const StateID FFSM2_UNUSED(origin), - const StatusEvent FFSM2_UNUSED(event)) noexcept + const StatusEvent FFSM2_UNUSED(event)) {} FFSM2_CONSTEXPR(NO) virtual void recordPlanStatus(const Context& FFSM2_UNUSED(context), - const StatusEvent FFSM2_UNUSED(event)) noexcept + const StatusEvent FFSM2_UNUSED(event)) {} #endif @@ -61,7 +61,7 @@ struct LoggerInterfaceT { virtual void recordCancelledPending(const Context& FFSM2_UNUSED(context), - const StateID FFSM2_UNUSED(origin)) noexcept + const StateID FFSM2_UNUSED(origin)) {} }; diff --git a/development/ffsm2/detail/shared/utility.hpp b/development/ffsm2/detail/shared/utility.hpp index f6bbb83..4c57cd5 100644 --- a/development/ffsm2/detail/shared/utility.hpp +++ b/development/ffsm2/detail/shared/utility.hpp @@ -204,8 +204,10 @@ move(T&& t) noexcept { //////////////////////////////////////////////////////////////////////////////// -template +template < + typename T0 + , typename T1 +> FFSM2_CONSTEXPR(11) T0 min(const T0 t0, @@ -217,8 +219,10 @@ min(const T0 t0, // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -template +template < + typename T0 + , typename T1 +> FFSM2_CONSTEXPR(11) T0 max(const T0 t0, @@ -230,19 +234,23 @@ max(const T0 t0, //------------------------------------------------------------------------------ -template +template < + typename TIndex + , typename TElement + , TIndex NCount +> FFSM2_CONSTEXPR(11) TIndex -count(const TElement(&)[NCount]) noexcept { +count(const TElement (&)[NCount]) noexcept { return NCount; } //------------------------------------------------------------------------------ -template +template < + typename T + , typename TT +> FFSM2_CONSTEXPR(11) T contain(const T x, @@ -251,7 +259,6 @@ contain(const T x, return (x + static_cast(to) - 1) / static_cast(to); } -//------------------------------------------------------------------------------ //////////////////////////////////////////////////////////////////////////////// template @@ -262,6 +269,14 @@ fill(T& a, const char value) noexcept { } //------------------------------------------------------------------------------ +//------------------------------------------------------------------------------ + +template +FFSM2_CONSTEXPR(14) +void destroy(T& t) noexcept { + t.~T(); +} + //////////////////////////////////////////////////////////////////////////////// template diff --git a/development/ffsm2/machine_dev.hpp b/development/ffsm2/machine_dev.hpp index cd0b6fb..ae22dd9 100644 --- a/development/ffsm2/machine_dev.hpp +++ b/development/ffsm2/machine_dev.hpp @@ -1,5 +1,5 @@ // FFSM2 (flat state machine for games and interactive applications) -// 2.3.3 (2023-12-21) +// 2.4.0 (2023-12-25) // // Created by Andrew Gresyk // @@ -32,8 +32,8 @@ #pragma once #define FFSM2_VERSION_MAJOR 2 -#define FFSM2_VERSION_MINOR 3 -#define FFSM2_VERSION_PATCH 3 +#define FFSM2_VERSION_MINOR 4 +#define FFSM2_VERSION_PATCH 0 #define FFSM2_VERSION (10000 * FFSM2_VERSION_MAJOR + 100 * FFSM2_VERSION_MINOR + FFSM2_VERSION_PATCH) diff --git a/examples/basic_audio_player/main.cpp b/examples/basic_audio_player/main.cpp index 336d3f9..ae23d68 100644 --- a/examples/basic_audio_player/main.cpp +++ b/examples/basic_audio_player/main.cpp @@ -80,7 +80,7 @@ struct Logger void recordTransition(const Context& /*context*/, const StateID origin, - const StateID target) noexcept override + const StateID target) override { std::cout << stateName(origin) << " -> " << stateName(target) << "\n"; } diff --git a/examples/basic_traffic_light/main.cpp b/examples/basic_traffic_light/main.cpp index 51c3c00..f5c84a8 100644 --- a/examples/basic_traffic_light/main.cpp +++ b/examples/basic_traffic_light/main.cpp @@ -183,8 +183,7 @@ struct Off //////////////////////////////////////////////////////////////////////////////// -int -main() { +int main() { // shared data storage instance Context context; diff --git a/examples/debug_logger_interface/main.cpp b/examples/debug_logger_interface/main.cpp index 3bd48d6..eeef8a3 100644 --- a/examples/debug_logger_interface/main.cpp +++ b/examples/debug_logger_interface/main.cpp @@ -87,7 +87,7 @@ struct Logger { void recordMethod(const Context& /*context*/, const ffsm2::StateID /*origin*/, - const Method method) noexcept override + const Method method) override { std::cout //<< ffsm2::stateName(origin) << "::" << ffsm2::methodName(method) << "()\n"; @@ -95,7 +95,7 @@ struct Logger void recordTransition(const Context& /*context*/, const ffsm2::StateID /*origin*/, - const ffsm2::StateID /*target*/) noexcept override + const ffsm2::StateID /*target*/) override { std::cout //<< ffsm2::stateName(origin) << ": " << "changeTo<" diff --git a/include/ffsm2/machine.hpp b/include/ffsm2/machine.hpp index ba914cc..8cd136f 100644 --- a/include/ffsm2/machine.hpp +++ b/include/ffsm2/machine.hpp @@ -1,5 +1,5 @@ // FFSM2 (flat state machine for games and interactive applications) -// 2.3.3 (2023-12-21) +// 2.4.0 (2023-12-25) // // Created by Andrew Gresyk // @@ -32,8 +32,8 @@ #pragma once #define FFSM2_VERSION_MAJOR 2 -#define FFSM2_VERSION_MINOR 3 -#define FFSM2_VERSION_PATCH 3 +#define FFSM2_VERSION_MINOR 4 +#define FFSM2_VERSION_PATCH 0 #define FFSM2_VERSION (10000 * FFSM2_VERSION_MAJOR + 100 * FFSM2_VERSION_MINOR + FFSM2_VERSION_PATCH) @@ -491,8 +491,10 @@ move(T&& t) noexcept { return static_cast&&>(t); } -template +template < + typename T0 + , typename T1 +> FFSM2_CONSTEXPR(11) T0 min(const T0 t0, @@ -502,8 +504,10 @@ min(const T0 t0, t0 : static_cast(t1); } -template +template < + typename T0 + , typename T1 +> FFSM2_CONSTEXPR(11) T0 max(const T0 t0, @@ -513,17 +517,21 @@ max(const T0 t0, t0 : static_cast(t1); } -template +template < + typename TIndex + , typename TElement + , TIndex NCount +> FFSM2_CONSTEXPR(11) TIndex -count(const TElement(&)[NCount]) noexcept { +count(const TElement (&)[NCount]) noexcept { return NCount; } -template +template < + typename T + , typename TT +> FFSM2_CONSTEXPR(11) T contain(const T x, @@ -539,6 +547,12 @@ fill(T& a, const char value) noexcept { memset(&a, static_cast(value), sizeof(a)); } +template +FFSM2_CONSTEXPR(14) +void destroy(T& t) noexcept { + t.~T(); +} + template struct StaticPrintConstT; @@ -1598,7 +1612,7 @@ struct LoggerInterfaceT { void recordMethod(const Context& FFSM2_UNUSED(context), const StateID FFSM2_UNUSED(origin), - const Method FFSM2_UNUSED(method)) noexcept + const Method FFSM2_UNUSED(method)) {} FFSM2_CONSTEXPR(NO) @@ -1606,7 +1620,7 @@ struct LoggerInterfaceT { void recordTransition(const Context& FFSM2_UNUSED(context), const StateID FFSM2_UNUSED(origin), - const StateID FFSM2_UNUSED(target)) noexcept + const StateID FFSM2_UNUSED(target)) {} #if FFSM2_PLANS_AVAILABLE() @@ -1616,14 +1630,14 @@ struct LoggerInterfaceT { void recordTaskStatus(const Context& FFSM2_UNUSED(context), const StateID FFSM2_UNUSED(origin), - const StatusEvent FFSM2_UNUSED(event)) noexcept + const StatusEvent FFSM2_UNUSED(event)) {} FFSM2_CONSTEXPR(NO) virtual void recordPlanStatus(const Context& FFSM2_UNUSED(context), - const StatusEvent FFSM2_UNUSED(event)) noexcept + const StatusEvent FFSM2_UNUSED(event)) {} #endif @@ -1632,7 +1646,7 @@ struct LoggerInterfaceT { virtual void recordCancelledPending(const Context& FFSM2_UNUSED(context), - const StateID FFSM2_UNUSED(origin)) noexcept + const StateID FFSM2_UNUSED(origin)) {} }; diff --git a/premake.lua b/premake.lua index 1f21402..3f847ea 100644 --- a/premake.lua +++ b/premake.lua @@ -1,7 +1,7 @@ workspace "ffsm2" configurations { - "debug", - "release" + "Debug", + "Release" } conformancemode "On" debugdir "." @@ -23,15 +23,15 @@ workspace "ffsm2" location "projects/premake" objdir "$(BUILD_ROOT)/$(SolutionName)-$(PlatformArchitecture)/$(ProjectName)-$(Configuration)/" platforms { - "32", - "64", + "x86", + "x64", } system "windows" systemversion "latest" --systemversion "$([Microsoft.Build.Utilities.ToolLocationHelper]::GetLatestSDKTargetPlatformVersion('Windows', '10.0'))" - targetdir "binaries-$(PlatformArchitecture)/" + targetdir "binaries/" targetname "$(ProjectName)-$(Configuration)-$(PlatformArchitecture)" warnings "High" @@ -203,8 +203,7 @@ project "debug_logger_interface-clang" project "temp-14" cppdialect "C++11" files { - "development/**.*", - "temp/**.*", + "examples/temp/**.*", } kind "ConsoleApp" toolset "msc-v140" @@ -212,8 +211,7 @@ project "temp-14" project "temp-15" cppdialect "C++14" files { - "development/**.*", - "temp/**.*", + "examples/temp/**.*", } kind "ConsoleApp" toolset "msc-v141" @@ -221,8 +219,7 @@ project "temp-15" project "temp-16" cppdialect "C++17" files { - "development/**.*", - "temp/**.*", + "examples/temp/**.*", } kind "ConsoleApp" toolset "msc-v142" @@ -230,8 +227,7 @@ project "temp-16" project "temp-17" cppdialect "C++20" files { - "development/**.*", - "temp/**.*", + "examples/temp/**.*", } kind "ConsoleApp" toolset "msc-v143" @@ -239,8 +235,7 @@ project "temp-17" project "temp-clang" cppdialect "C++20" files { - "development/**.*", - "temp/**.*", + "examples/temp/**.*", } kind "ConsoleApp" toolset "msc-ClangCL" diff --git a/projects/premake/basic_audio_player-14.vcxproj b/projects/premake/basic_audio_player-14.vcxproj index ac6baf2..3fcce28 100644 --- a/projects/premake/basic_audio_player-14.vcxproj +++ b/projects/premake/basic_audio_player-14.vcxproj @@ -1,36 +1,20 @@  - - debug 32 + + Debug Win32 - - debug 32 + + Debug x64 - - debug 64 + + Release Win32 - - debug 64 - x64 - - - release 32 - Win32 - - - release 32 - x64 - - - release 64 - Win32 - - - release 64 + + Release x64 @@ -41,39 +25,39 @@ basic_audio_player-14 10.0 - + 10.0.22621.0 - + 10.0.22621.0 - + 10.0.22621.0 - + 10.0.22621.0 - + Application true Unicode v140 - + Application true Unicode v140 - + Application false Unicode v140 true - + Application false Unicode @@ -83,48 +67,48 @@ - + - + - + - + - + true - ..\..\binaries-$(PlatformArchitecture)\ - $(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\32\debug\basic_audio_player-14\ + ..\..\binaries\ + $(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\x86\Debug\basic_audio_player-14\ $(ProjectName)-$(Configuration)-$(PlatformArchitecture) .exe - + true - ..\..\binaries-$(PlatformArchitecture)\ - $(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\64\debug\basic_audio_player-14\ + ..\..\binaries\ + $(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\x64\Debug\basic_audio_player-14\ $(ProjectName)-$(Configuration)-$(PlatformArchitecture) .exe - + false - ..\..\binaries-$(PlatformArchitecture)\ - $(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\32\release\basic_audio_player-14\ + ..\..\binaries\ + $(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\x86\Release\basic_audio_player-14\ $(ProjectName)-$(Configuration)-$(PlatformArchitecture) .exe - + false - ..\..\binaries-$(PlatformArchitecture)\ - $(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\64\release\basic_audio_player-14\ + ..\..\binaries\ + $(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\x64\Release\basic_audio_player-14\ $(ProjectName)-$(Configuration)-$(PlatformArchitecture) .exe - + NotUsing Level4 @@ -141,7 +125,7 @@ true - + NotUsing Level4 @@ -158,7 +142,7 @@ true - + NotUsing Level4 @@ -179,7 +163,7 @@ true - + NotUsing Level4 diff --git a/projects/premake/basic_audio_player-15.vcxproj b/projects/premake/basic_audio_player-15.vcxproj index f16e8a7..8dacfd1 100644 --- a/projects/premake/basic_audio_player-15.vcxproj +++ b/projects/premake/basic_audio_player-15.vcxproj @@ -1,36 +1,20 @@  - - debug 32 + + Debug Win32 - - debug 32 + + Debug x64 - - debug 64 + + Release Win32 - - debug 64 - x64 - - - release 32 - Win32 - - - release 32 - x64 - - - release 64 - Win32 - - - release 64 + + Release x64 @@ -41,39 +25,39 @@ basic_audio_player-15 10.0 - + 10.0.22621.0 - + 10.0.22621.0 - + 10.0.22621.0 - + 10.0.22621.0 - + Application true Unicode v141 - + Application true Unicode v141 - + Application false Unicode v141 true - + Application false Unicode @@ -83,48 +67,48 @@ - + - + - + - + - + true - ..\..\binaries-$(PlatformArchitecture)\ - $(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\32\debug\basic_audio_player-15\ + ..\..\binaries\ + $(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\x86\Debug\basic_audio_player-15\ $(ProjectName)-$(Configuration)-$(PlatformArchitecture) .exe - + true - ..\..\binaries-$(PlatformArchitecture)\ - $(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\64\debug\basic_audio_player-15\ + ..\..\binaries\ + $(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\x64\Debug\basic_audio_player-15\ $(ProjectName)-$(Configuration)-$(PlatformArchitecture) .exe - + false - ..\..\binaries-$(PlatformArchitecture)\ - $(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\32\release\basic_audio_player-15\ + ..\..\binaries\ + $(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\x86\Release\basic_audio_player-15\ $(ProjectName)-$(Configuration)-$(PlatformArchitecture) .exe - + false - ..\..\binaries-$(PlatformArchitecture)\ - $(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\64\release\basic_audio_player-15\ + ..\..\binaries\ + $(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\x64\Release\basic_audio_player-15\ $(ProjectName)-$(Configuration)-$(PlatformArchitecture) .exe - + NotUsing Level4 @@ -142,7 +126,7 @@ true - + NotUsing Level4 @@ -160,7 +144,7 @@ true - + NotUsing Level4 @@ -182,7 +166,7 @@ true - + NotUsing Level4 diff --git a/projects/premake/basic_audio_player-16.vcxproj b/projects/premake/basic_audio_player-16.vcxproj index 5de340e..a96dccb 100644 --- a/projects/premake/basic_audio_player-16.vcxproj +++ b/projects/premake/basic_audio_player-16.vcxproj @@ -1,36 +1,20 @@  - - debug 32 + + Debug Win32 - - debug 32 + + Debug x64 - - debug 64 + + Release Win32 - - debug 64 - x64 - - - release 32 - Win32 - - - release 32 - x64 - - - release 64 - Win32 - - - release 64 + + Release x64 @@ -42,26 +26,26 @@ 10.0 - + Application true Unicode v142 - + Application true Unicode v142 - + Application false Unicode v142 true - + Application false Unicode @@ -71,48 +55,48 @@ - + - + - + - + - + true - ..\..\binaries-$(PlatformArchitecture)\ - $(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\32\debug\basic_audio_player-16\ + ..\..\binaries\ + $(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\x86\Debug\basic_audio_player-16\ $(ProjectName)-$(Configuration)-$(PlatformArchitecture) .exe - + true - ..\..\binaries-$(PlatformArchitecture)\ - $(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\64\debug\basic_audio_player-16\ + ..\..\binaries\ + $(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\x64\Debug\basic_audio_player-16\ $(ProjectName)-$(Configuration)-$(PlatformArchitecture) .exe - + false - ..\..\binaries-$(PlatformArchitecture)\ - $(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\32\release\basic_audio_player-16\ + ..\..\binaries\ + $(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\x86\Release\basic_audio_player-16\ $(ProjectName)-$(Configuration)-$(PlatformArchitecture) .exe - + false - ..\..\binaries-$(PlatformArchitecture)\ - $(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\64\release\basic_audio_player-16\ + ..\..\binaries\ + $(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\x64\Release\basic_audio_player-16\ $(ProjectName)-$(Configuration)-$(PlatformArchitecture) .exe - + NotUsing Level4 @@ -130,7 +114,7 @@ true - + NotUsing Level4 @@ -148,7 +132,7 @@ true - + NotUsing Level4 @@ -170,7 +154,7 @@ true - + NotUsing Level4 diff --git a/projects/premake/basic_audio_player-17.vcxproj b/projects/premake/basic_audio_player-17.vcxproj index ee0593f..0db964b 100644 --- a/projects/premake/basic_audio_player-17.vcxproj +++ b/projects/premake/basic_audio_player-17.vcxproj @@ -1,36 +1,20 @@  - - debug 32 + + Debug Win32 - - debug 32 + + Debug x64 - - debug 64 + + Release Win32 - - debug 64 - x64 - - - release 32 - Win32 - - - release 32 - x64 - - - release 64 - Win32 - - - release 64 + + Release x64 @@ -42,26 +26,26 @@ 10.0 - + Application true Unicode v143 - + Application true Unicode v143 - + Application false Unicode v143 true - + Application false Unicode @@ -71,48 +55,48 @@ - + - + - + - + - + true - ..\..\binaries-$(PlatformArchitecture)\ - $(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\32\debug\basic_audio_player-17\ + ..\..\binaries\ + $(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\x86\Debug\basic_audio_player-17\ $(ProjectName)-$(Configuration)-$(PlatformArchitecture) .exe - + true - ..\..\binaries-$(PlatformArchitecture)\ - $(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\64\debug\basic_audio_player-17\ + ..\..\binaries\ + $(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\x64\Debug\basic_audio_player-17\ $(ProjectName)-$(Configuration)-$(PlatformArchitecture) .exe - + false - ..\..\binaries-$(PlatformArchitecture)\ - $(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\32\release\basic_audio_player-17\ + ..\..\binaries\ + $(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\x86\Release\basic_audio_player-17\ $(ProjectName)-$(Configuration)-$(PlatformArchitecture) .exe - + false - ..\..\binaries-$(PlatformArchitecture)\ - $(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\64\release\basic_audio_player-17\ + ..\..\binaries\ + $(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\x64\Release\basic_audio_player-17\ $(ProjectName)-$(Configuration)-$(PlatformArchitecture) .exe - + NotUsing Level4 @@ -131,7 +115,7 @@ true - + NotUsing Level4 @@ -150,7 +134,7 @@ true - + NotUsing Level4 @@ -173,7 +157,7 @@ true - + NotUsing Level4 diff --git a/projects/premake/basic_audio_player-clang.vcxproj b/projects/premake/basic_audio_player-clang.vcxproj index 87f111b..8dbab04 100644 --- a/projects/premake/basic_audio_player-clang.vcxproj +++ b/projects/premake/basic_audio_player-clang.vcxproj @@ -1,36 +1,20 @@  - - debug 32 + + Debug Win32 - - debug 32 + + Debug x64 - - debug 64 + + Release Win32 - - debug 64 - x64 - - - release 32 - Win32 - - - release 32 - x64 - - - release 64 - Win32 - - - release 64 + + Release x64 @@ -42,26 +26,26 @@ 10.0 - + Application true Unicode clangcl - + Application true Unicode clangcl - + Application false Unicode clangcl true - + Application false Unicode @@ -71,48 +55,48 @@ - + - + - + - + - + true - ..\..\binaries-$(PlatformArchitecture)\ - $(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\32\debug\basic_audio_player-clang\ + ..\..\binaries\ + $(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\x86\Debug\basic_audio_player-clang\ $(ProjectName)-$(Configuration)-$(PlatformArchitecture) .exe - + true - ..\..\binaries-$(PlatformArchitecture)\ - $(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\64\debug\basic_audio_player-clang\ + ..\..\binaries\ + $(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\x64\Debug\basic_audio_player-clang\ $(ProjectName)-$(Configuration)-$(PlatformArchitecture) .exe - + false - ..\..\binaries-$(PlatformArchitecture)\ - $(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\32\release\basic_audio_player-clang\ + ..\..\binaries\ + $(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\x86\Release\basic_audio_player-clang\ $(ProjectName)-$(Configuration)-$(PlatformArchitecture) .exe - + false - ..\..\binaries-$(PlatformArchitecture)\ - $(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\64\release\basic_audio_player-clang\ + ..\..\binaries\ + $(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\x64\Release\basic_audio_player-clang\ $(ProjectName)-$(Configuration)-$(PlatformArchitecture) .exe - + NotUsing Level4 @@ -132,7 +116,7 @@ /INCREMENTAL:NO %(AdditionalOptions) - + NotUsing Level4 @@ -152,7 +136,7 @@ /INCREMENTAL:NO %(AdditionalOptions) - + NotUsing Level4 @@ -176,7 +160,7 @@ /INCREMENTAL:NO %(AdditionalOptions) - + NotUsing Level4 diff --git a/projects/premake/basic_traffic_light-14.vcxproj b/projects/premake/basic_traffic_light-14.vcxproj index 9a89755..3431435 100644 --- a/projects/premake/basic_traffic_light-14.vcxproj +++ b/projects/premake/basic_traffic_light-14.vcxproj @@ -1,36 +1,20 @@  - - debug 32 + + Debug Win32 - - debug 32 + + Debug x64 - - debug 64 + + Release Win32 - - debug 64 - x64 - - - release 32 - Win32 - - - release 32 - x64 - - - release 64 - Win32 - - - release 64 + + Release x64 @@ -41,39 +25,39 @@ basic_traffic_light-14 10.0 - + 10.0.22621.0 - + 10.0.22621.0 - + 10.0.22621.0 - + 10.0.22621.0 - + Application true Unicode v140 - + Application true Unicode v140 - + Application false Unicode v140 true - + Application false Unicode @@ -83,48 +67,48 @@ - + - + - + - + - + true - ..\..\binaries-$(PlatformArchitecture)\ - $(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\32\debug\basic_traffic_light-14\ + ..\..\binaries\ + $(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\x86\Debug\basic_traffic_light-14\ $(ProjectName)-$(Configuration)-$(PlatformArchitecture) .exe - + true - ..\..\binaries-$(PlatformArchitecture)\ - $(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\64\debug\basic_traffic_light-14\ + ..\..\binaries\ + $(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\x64\Debug\basic_traffic_light-14\ $(ProjectName)-$(Configuration)-$(PlatformArchitecture) .exe - + false - ..\..\binaries-$(PlatformArchitecture)\ - $(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\32\release\basic_traffic_light-14\ + ..\..\binaries\ + $(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\x86\Release\basic_traffic_light-14\ $(ProjectName)-$(Configuration)-$(PlatformArchitecture) .exe - + false - ..\..\binaries-$(PlatformArchitecture)\ - $(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\64\release\basic_traffic_light-14\ + ..\..\binaries\ + $(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\x64\Release\basic_traffic_light-14\ $(ProjectName)-$(Configuration)-$(PlatformArchitecture) .exe - + NotUsing Level4 @@ -141,7 +125,7 @@ true - + NotUsing Level4 @@ -158,7 +142,7 @@ true - + NotUsing Level4 @@ -179,7 +163,7 @@ true - + NotUsing Level4 diff --git a/projects/premake/basic_traffic_light-15.vcxproj b/projects/premake/basic_traffic_light-15.vcxproj index a9a9c56..4486fc7 100644 --- a/projects/premake/basic_traffic_light-15.vcxproj +++ b/projects/premake/basic_traffic_light-15.vcxproj @@ -1,36 +1,20 @@  - - debug 32 + + Debug Win32 - - debug 32 + + Debug x64 - - debug 64 + + Release Win32 - - debug 64 - x64 - - - release 32 - Win32 - - - release 32 - x64 - - - release 64 - Win32 - - - release 64 + + Release x64 @@ -41,39 +25,39 @@ basic_traffic_light-15 10.0 - + 10.0.22621.0 - + 10.0.22621.0 - + 10.0.22621.0 - + 10.0.22621.0 - + Application true Unicode v141 - + Application true Unicode v141 - + Application false Unicode v141 true - + Application false Unicode @@ -83,48 +67,48 @@ - + - + - + - + - + true - ..\..\binaries-$(PlatformArchitecture)\ - $(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\32\debug\basic_traffic_light-15\ + ..\..\binaries\ + $(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\x86\Debug\basic_traffic_light-15\ $(ProjectName)-$(Configuration)-$(PlatformArchitecture) .exe - + true - ..\..\binaries-$(PlatformArchitecture)\ - $(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\64\debug\basic_traffic_light-15\ + ..\..\binaries\ + $(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\x64\Debug\basic_traffic_light-15\ $(ProjectName)-$(Configuration)-$(PlatformArchitecture) .exe - + false - ..\..\binaries-$(PlatformArchitecture)\ - $(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\32\release\basic_traffic_light-15\ + ..\..\binaries\ + $(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\x86\Release\basic_traffic_light-15\ $(ProjectName)-$(Configuration)-$(PlatformArchitecture) .exe - + false - ..\..\binaries-$(PlatformArchitecture)\ - $(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\64\release\basic_traffic_light-15\ + ..\..\binaries\ + $(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\x64\Release\basic_traffic_light-15\ $(ProjectName)-$(Configuration)-$(PlatformArchitecture) .exe - + NotUsing Level4 @@ -142,7 +126,7 @@ true - + NotUsing Level4 @@ -160,7 +144,7 @@ true - + NotUsing Level4 @@ -182,7 +166,7 @@ true - + NotUsing Level4 diff --git a/projects/premake/basic_traffic_light-16.vcxproj b/projects/premake/basic_traffic_light-16.vcxproj index 4e6b92b..74d2fc4 100644 --- a/projects/premake/basic_traffic_light-16.vcxproj +++ b/projects/premake/basic_traffic_light-16.vcxproj @@ -1,36 +1,20 @@  - - debug 32 + + Debug Win32 - - debug 32 + + Debug x64 - - debug 64 + + Release Win32 - - debug 64 - x64 - - - release 32 - Win32 - - - release 32 - x64 - - - release 64 - Win32 - - - release 64 + + Release x64 @@ -42,26 +26,26 @@ 10.0 - + Application true Unicode v142 - + Application true Unicode v142 - + Application false Unicode v142 true - + Application false Unicode @@ -71,48 +55,48 @@ - + - + - + - + - + true - ..\..\binaries-$(PlatformArchitecture)\ - $(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\32\debug\basic_traffic_light-16\ + ..\..\binaries\ + $(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\x86\Debug\basic_traffic_light-16\ $(ProjectName)-$(Configuration)-$(PlatformArchitecture) .exe - + true - ..\..\binaries-$(PlatformArchitecture)\ - $(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\64\debug\basic_traffic_light-16\ + ..\..\binaries\ + $(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\x64\Debug\basic_traffic_light-16\ $(ProjectName)-$(Configuration)-$(PlatformArchitecture) .exe - + false - ..\..\binaries-$(PlatformArchitecture)\ - $(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\32\release\basic_traffic_light-16\ + ..\..\binaries\ + $(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\x86\Release\basic_traffic_light-16\ $(ProjectName)-$(Configuration)-$(PlatformArchitecture) .exe - + false - ..\..\binaries-$(PlatformArchitecture)\ - $(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\64\release\basic_traffic_light-16\ + ..\..\binaries\ + $(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\x64\Release\basic_traffic_light-16\ $(ProjectName)-$(Configuration)-$(PlatformArchitecture) .exe - + NotUsing Level4 @@ -130,7 +114,7 @@ true - + NotUsing Level4 @@ -148,7 +132,7 @@ true - + NotUsing Level4 @@ -170,7 +154,7 @@ true - + NotUsing Level4 diff --git a/projects/premake/basic_traffic_light-17.vcxproj b/projects/premake/basic_traffic_light-17.vcxproj index 8f12f4e..0814f7e 100644 --- a/projects/premake/basic_traffic_light-17.vcxproj +++ b/projects/premake/basic_traffic_light-17.vcxproj @@ -1,36 +1,20 @@  - - debug 32 + + Debug Win32 - - debug 32 + + Debug x64 - - debug 64 + + Release Win32 - - debug 64 - x64 - - - release 32 - Win32 - - - release 32 - x64 - - - release 64 - Win32 - - - release 64 + + Release x64 @@ -42,26 +26,26 @@ 10.0 - + Application true Unicode v143 - + Application true Unicode v143 - + Application false Unicode v143 true - + Application false Unicode @@ -71,48 +55,48 @@ - + - + - + - + - + true - ..\..\binaries-$(PlatformArchitecture)\ - $(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\32\debug\basic_traffic_light-17\ + ..\..\binaries\ + $(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\x86\Debug\basic_traffic_light-17\ $(ProjectName)-$(Configuration)-$(PlatformArchitecture) .exe - + true - ..\..\binaries-$(PlatformArchitecture)\ - $(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\64\debug\basic_traffic_light-17\ + ..\..\binaries\ + $(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\x64\Debug\basic_traffic_light-17\ $(ProjectName)-$(Configuration)-$(PlatformArchitecture) .exe - + false - ..\..\binaries-$(PlatformArchitecture)\ - $(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\32\release\basic_traffic_light-17\ + ..\..\binaries\ + $(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\x86\Release\basic_traffic_light-17\ $(ProjectName)-$(Configuration)-$(PlatformArchitecture) .exe - + false - ..\..\binaries-$(PlatformArchitecture)\ - $(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\64\release\basic_traffic_light-17\ + ..\..\binaries\ + $(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\x64\Release\basic_traffic_light-17\ $(ProjectName)-$(Configuration)-$(PlatformArchitecture) .exe - + NotUsing Level4 @@ -131,7 +115,7 @@ true - + NotUsing Level4 @@ -150,7 +134,7 @@ true - + NotUsing Level4 @@ -173,7 +157,7 @@ true - + NotUsing Level4 diff --git a/projects/premake/basic_traffic_light-clang.vcxproj b/projects/premake/basic_traffic_light-clang.vcxproj index c9840a3..8b0de91 100644 --- a/projects/premake/basic_traffic_light-clang.vcxproj +++ b/projects/premake/basic_traffic_light-clang.vcxproj @@ -1,36 +1,20 @@  - - debug 32 + + Debug Win32 - - debug 32 + + Debug x64 - - debug 64 + + Release Win32 - - debug 64 - x64 - - - release 32 - Win32 - - - release 32 - x64 - - - release 64 - Win32 - - - release 64 + + Release x64 @@ -42,26 +26,26 @@ 10.0 - + Application true Unicode clangcl - + Application true Unicode clangcl - + Application false Unicode clangcl true - + Application false Unicode @@ -71,48 +55,48 @@ - + - + - + - + - + true - ..\..\binaries-$(PlatformArchitecture)\ - $(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\32\debug\basic_traffic_light-clang\ + ..\..\binaries\ + $(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\x86\Debug\basic_traffic_light-clang\ $(ProjectName)-$(Configuration)-$(PlatformArchitecture) .exe - + true - ..\..\binaries-$(PlatformArchitecture)\ - $(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\64\debug\basic_traffic_light-clang\ + ..\..\binaries\ + $(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\x64\Debug\basic_traffic_light-clang\ $(ProjectName)-$(Configuration)-$(PlatformArchitecture) .exe - + false - ..\..\binaries-$(PlatformArchitecture)\ - $(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\32\release\basic_traffic_light-clang\ + ..\..\binaries\ + $(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\x86\Release\basic_traffic_light-clang\ $(ProjectName)-$(Configuration)-$(PlatformArchitecture) .exe - + false - ..\..\binaries-$(PlatformArchitecture)\ - $(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\64\release\basic_traffic_light-clang\ + ..\..\binaries\ + $(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\x64\Release\basic_traffic_light-clang\ $(ProjectName)-$(Configuration)-$(PlatformArchitecture) .exe - + NotUsing Level4 @@ -132,7 +116,7 @@ /INCREMENTAL:NO %(AdditionalOptions) - + NotUsing Level4 @@ -152,7 +136,7 @@ /INCREMENTAL:NO %(AdditionalOptions) - + NotUsing Level4 @@ -176,7 +160,7 @@ /INCREMENTAL:NO %(AdditionalOptions) - + NotUsing Level4 diff --git a/projects/premake/debug_logger_interface-14.vcxproj b/projects/premake/debug_logger_interface-14.vcxproj index 7ee9473..f14edc0 100644 --- a/projects/premake/debug_logger_interface-14.vcxproj +++ b/projects/premake/debug_logger_interface-14.vcxproj @@ -1,36 +1,20 @@  - - debug 32 + + Debug Win32 - - debug 32 + + Debug x64 - - debug 64 + + Release Win32 - - debug 64 - x64 - - - release 32 - Win32 - - - release 32 - x64 - - - release 64 - Win32 - - - release 64 + + Release x64 @@ -41,39 +25,39 @@ debug_logger_interface-14 10.0 - + 10.0.22621.0 - + 10.0.22621.0 - + 10.0.22621.0 - + 10.0.22621.0 - + Application true Unicode v140 - + Application true Unicode v140 - + Application false Unicode v140 true - + Application false Unicode @@ -83,48 +67,48 @@ - + - + - + - + - + true - ..\..\binaries-$(PlatformArchitecture)\ - $(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\32\debug\debug_logger_interface-14\ + ..\..\binaries\ + $(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\x86\Debug\debug_logger_interface-14\ $(ProjectName)-$(Configuration)-$(PlatformArchitecture) .exe - + true - ..\..\binaries-$(PlatformArchitecture)\ - $(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\64\debug\debug_logger_interface-14\ + ..\..\binaries\ + $(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\x64\Debug\debug_logger_interface-14\ $(ProjectName)-$(Configuration)-$(PlatformArchitecture) .exe - + false - ..\..\binaries-$(PlatformArchitecture)\ - $(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\32\release\debug_logger_interface-14\ + ..\..\binaries\ + $(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\x86\Release\debug_logger_interface-14\ $(ProjectName)-$(Configuration)-$(PlatformArchitecture) .exe - + false - ..\..\binaries-$(PlatformArchitecture)\ - $(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\64\release\debug_logger_interface-14\ + ..\..\binaries\ + $(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\x64\Release\debug_logger_interface-14\ $(ProjectName)-$(Configuration)-$(PlatformArchitecture) .exe - + NotUsing Level4 @@ -141,7 +125,7 @@ true - + NotUsing Level4 @@ -158,7 +142,7 @@ true - + NotUsing Level4 @@ -179,7 +163,7 @@ true - + NotUsing Level4 diff --git a/projects/premake/debug_logger_interface-15.vcxproj b/projects/premake/debug_logger_interface-15.vcxproj index d1af47f..c8ceccf 100644 --- a/projects/premake/debug_logger_interface-15.vcxproj +++ b/projects/premake/debug_logger_interface-15.vcxproj @@ -1,36 +1,20 @@  - - debug 32 + + Debug Win32 - - debug 32 + + Debug x64 - - debug 64 + + Release Win32 - - debug 64 - x64 - - - release 32 - Win32 - - - release 32 - x64 - - - release 64 - Win32 - - - release 64 + + Release x64 @@ -41,39 +25,39 @@ debug_logger_interface-15 10.0 - + 10.0.22621.0 - + 10.0.22621.0 - + 10.0.22621.0 - + 10.0.22621.0 - + Application true Unicode v141 - + Application true Unicode v141 - + Application false Unicode v141 true - + Application false Unicode @@ -83,48 +67,48 @@ - + - + - + - + - + true - ..\..\binaries-$(PlatformArchitecture)\ - $(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\32\debug\debug_logger_interface-15\ + ..\..\binaries\ + $(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\x86\Debug\debug_logger_interface-15\ $(ProjectName)-$(Configuration)-$(PlatformArchitecture) .exe - + true - ..\..\binaries-$(PlatformArchitecture)\ - $(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\64\debug\debug_logger_interface-15\ + ..\..\binaries\ + $(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\x64\Debug\debug_logger_interface-15\ $(ProjectName)-$(Configuration)-$(PlatformArchitecture) .exe - + false - ..\..\binaries-$(PlatformArchitecture)\ - $(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\32\release\debug_logger_interface-15\ + ..\..\binaries\ + $(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\x86\Release\debug_logger_interface-15\ $(ProjectName)-$(Configuration)-$(PlatformArchitecture) .exe - + false - ..\..\binaries-$(PlatformArchitecture)\ - $(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\64\release\debug_logger_interface-15\ + ..\..\binaries\ + $(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\x64\Release\debug_logger_interface-15\ $(ProjectName)-$(Configuration)-$(PlatformArchitecture) .exe - + NotUsing Level4 @@ -142,7 +126,7 @@ true - + NotUsing Level4 @@ -160,7 +144,7 @@ true - + NotUsing Level4 @@ -182,7 +166,7 @@ true - + NotUsing Level4 diff --git a/projects/premake/debug_logger_interface-16.vcxproj b/projects/premake/debug_logger_interface-16.vcxproj index 0a4004b..1400da5 100644 --- a/projects/premake/debug_logger_interface-16.vcxproj +++ b/projects/premake/debug_logger_interface-16.vcxproj @@ -1,36 +1,20 @@  - - debug 32 + + Debug Win32 - - debug 32 + + Debug x64 - - debug 64 + + Release Win32 - - debug 64 - x64 - - - release 32 - Win32 - - - release 32 - x64 - - - release 64 - Win32 - - - release 64 + + Release x64 @@ -42,26 +26,26 @@ 10.0 - + Application true Unicode v142 - + Application true Unicode v142 - + Application false Unicode v142 true - + Application false Unicode @@ -71,48 +55,48 @@ - + - + - + - + - + true - ..\..\binaries-$(PlatformArchitecture)\ - $(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\32\debug\debug_logger_interface-16\ + ..\..\binaries\ + $(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\x86\Debug\debug_logger_interface-16\ $(ProjectName)-$(Configuration)-$(PlatformArchitecture) .exe - + true - ..\..\binaries-$(PlatformArchitecture)\ - $(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\64\debug\debug_logger_interface-16\ + ..\..\binaries\ + $(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\x64\Debug\debug_logger_interface-16\ $(ProjectName)-$(Configuration)-$(PlatformArchitecture) .exe - + false - ..\..\binaries-$(PlatformArchitecture)\ - $(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\32\release\debug_logger_interface-16\ + ..\..\binaries\ + $(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\x86\Release\debug_logger_interface-16\ $(ProjectName)-$(Configuration)-$(PlatformArchitecture) .exe - + false - ..\..\binaries-$(PlatformArchitecture)\ - $(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\64\release\debug_logger_interface-16\ + ..\..\binaries\ + $(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\x64\Release\debug_logger_interface-16\ $(ProjectName)-$(Configuration)-$(PlatformArchitecture) .exe - + NotUsing Level4 @@ -130,7 +114,7 @@ true - + NotUsing Level4 @@ -148,7 +132,7 @@ true - + NotUsing Level4 @@ -170,7 +154,7 @@ true - + NotUsing Level4 diff --git a/projects/premake/debug_logger_interface-17.vcxproj b/projects/premake/debug_logger_interface-17.vcxproj index 944d697..1ffcdc3 100644 --- a/projects/premake/debug_logger_interface-17.vcxproj +++ b/projects/premake/debug_logger_interface-17.vcxproj @@ -1,36 +1,20 @@  - - debug 32 + + Debug Win32 - - debug 32 + + Debug x64 - - debug 64 + + Release Win32 - - debug 64 - x64 - - - release 32 - Win32 - - - release 32 - x64 - - - release 64 - Win32 - - - release 64 + + Release x64 @@ -42,26 +26,26 @@ 10.0 - + Application true Unicode v143 - + Application true Unicode v143 - + Application false Unicode v143 true - + Application false Unicode @@ -71,48 +55,48 @@ - + - + - + - + - + true - ..\..\binaries-$(PlatformArchitecture)\ - $(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\32\debug\debug_logger_interface-17\ + ..\..\binaries\ + $(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\x86\Debug\debug_logger_interface-17\ $(ProjectName)-$(Configuration)-$(PlatformArchitecture) .exe - + true - ..\..\binaries-$(PlatformArchitecture)\ - $(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\64\debug\debug_logger_interface-17\ + ..\..\binaries\ + $(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\x64\Debug\debug_logger_interface-17\ $(ProjectName)-$(Configuration)-$(PlatformArchitecture) .exe - + false - ..\..\binaries-$(PlatformArchitecture)\ - $(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\32\release\debug_logger_interface-17\ + ..\..\binaries\ + $(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\x86\Release\debug_logger_interface-17\ $(ProjectName)-$(Configuration)-$(PlatformArchitecture) .exe - + false - ..\..\binaries-$(PlatformArchitecture)\ - $(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\64\release\debug_logger_interface-17\ + ..\..\binaries\ + $(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\x64\Release\debug_logger_interface-17\ $(ProjectName)-$(Configuration)-$(PlatformArchitecture) .exe - + NotUsing Level4 @@ -131,7 +115,7 @@ true - + NotUsing Level4 @@ -150,7 +134,7 @@ true - + NotUsing Level4 @@ -173,7 +157,7 @@ true - + NotUsing Level4 diff --git a/projects/premake/debug_logger_interface-clang.vcxproj b/projects/premake/debug_logger_interface-clang.vcxproj index 1d9b5cf..385cb0a 100644 --- a/projects/premake/debug_logger_interface-clang.vcxproj +++ b/projects/premake/debug_logger_interface-clang.vcxproj @@ -1,36 +1,20 @@  - - debug 32 + + Debug Win32 - - debug 32 + + Debug x64 - - debug 64 + + Release Win32 - - debug 64 - x64 - - - release 32 - Win32 - - - release 32 - x64 - - - release 64 - Win32 - - - release 64 + + Release x64 @@ -42,26 +26,26 @@ 10.0 - + Application true Unicode clangcl - + Application true Unicode clangcl - + Application false Unicode clangcl true - + Application false Unicode @@ -71,48 +55,48 @@ - + - + - + - + - + true - ..\..\binaries-$(PlatformArchitecture)\ - $(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\32\debug\debug_logger_interface-clang\ + ..\..\binaries\ + $(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\x86\Debug\debug_logger_interface-clang\ $(ProjectName)-$(Configuration)-$(PlatformArchitecture) .exe - + true - ..\..\binaries-$(PlatformArchitecture)\ - $(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\64\debug\debug_logger_interface-clang\ + ..\..\binaries\ + $(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\x64\Debug\debug_logger_interface-clang\ $(ProjectName)-$(Configuration)-$(PlatformArchitecture) .exe - + false - ..\..\binaries-$(PlatformArchitecture)\ - $(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\32\release\debug_logger_interface-clang\ + ..\..\binaries\ + $(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\x86\Release\debug_logger_interface-clang\ $(ProjectName)-$(Configuration)-$(PlatformArchitecture) .exe - + false - ..\..\binaries-$(PlatformArchitecture)\ - $(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\64\release\debug_logger_interface-clang\ + ..\..\binaries\ + $(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\x64\Release\debug_logger_interface-clang\ $(ProjectName)-$(Configuration)-$(PlatformArchitecture) .exe - + NotUsing Level4 @@ -132,7 +116,7 @@ /INCREMENTAL:NO %(AdditionalOptions) - + NotUsing Level4 @@ -152,7 +136,7 @@ /INCREMENTAL:NO %(AdditionalOptions) - + NotUsing Level4 @@ -176,7 +160,7 @@ /INCREMENTAL:NO %(AdditionalOptions) - + NotUsing Level4 diff --git a/projects/premake/ffsm2-all.sln b/projects/premake/ffsm2-all.sln index a4f644d..e2b9531 100644 --- a/projects/premake/ffsm2-all.sln +++ b/projects/premake/ffsm2-all.sln @@ -53,212 +53,212 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test-clang", "test-clang.vc EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution - debug|32 = debug|32 - debug|64 = debug|64 - release|32 = release|32 - release|64 = release|64 + Debug|Win32 = Debug|Win32 + Debug|x64 = Debug|x64 + Release|Win32 = Release|Win32 + Release|x64 = Release|x64 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {D6549E75-42C1-5970-0BB5-F1CD77E07BD8}.debug|32.ActiveCfg = debug 32|Win32 - {D6549E75-42C1-5970-0BB5-F1CD77E07BD8}.debug|32.Build.0 = debug 32|Win32 - {D6549E75-42C1-5970-0BB5-F1CD77E07BD8}.debug|64.ActiveCfg = debug 64|x64 - {D6549E75-42C1-5970-0BB5-F1CD77E07BD8}.debug|64.Build.0 = debug 64|x64 - {D6549E75-42C1-5970-0BB5-F1CD77E07BD8}.release|32.ActiveCfg = release 32|Win32 - {D6549E75-42C1-5970-0BB5-F1CD77E07BD8}.release|32.Build.0 = release 32|Win32 - {D6549E75-42C1-5970-0BB5-F1CD77E07BD8}.release|64.ActiveCfg = release 64|x64 - {D6549E75-42C1-5970-0BB5-F1CD77E07BD8}.release|64.Build.0 = release 64|x64 - {D7549E75-43C1-5970-0CB5-F1CD78E07BD8}.debug|32.ActiveCfg = debug 32|Win32 - {D7549E75-43C1-5970-0CB5-F1CD78E07BD8}.debug|32.Build.0 = debug 32|Win32 - {D7549E75-43C1-5970-0CB5-F1CD78E07BD8}.debug|64.ActiveCfg = debug 64|x64 - {D7549E75-43C1-5970-0CB5-F1CD78E07BD8}.debug|64.Build.0 = debug 64|x64 - {D7549E75-43C1-5970-0CB5-F1CD78E07BD8}.release|32.ActiveCfg = release 32|Win32 - {D7549E75-43C1-5970-0CB5-F1CD78E07BD8}.release|32.Build.0 = release 32|Win32 - {D7549E75-43C1-5970-0CB5-F1CD78E07BD8}.release|64.ActiveCfg = release 64|x64 - {D7549E75-43C1-5970-0CB5-F1CD78E07BD8}.release|64.Build.0 = release 64|x64 - {D8549E75-44C1-5970-0DB5-F1CD79E07BD8}.debug|32.ActiveCfg = debug 32|Win32 - {D8549E75-44C1-5970-0DB5-F1CD79E07BD8}.debug|32.Build.0 = debug 32|Win32 - {D8549E75-44C1-5970-0DB5-F1CD79E07BD8}.debug|64.ActiveCfg = debug 64|x64 - {D8549E75-44C1-5970-0DB5-F1CD79E07BD8}.debug|64.Build.0 = debug 64|x64 - {D8549E75-44C1-5970-0DB5-F1CD79E07BD8}.release|32.ActiveCfg = release 32|Win32 - {D8549E75-44C1-5970-0DB5-F1CD79E07BD8}.release|32.Build.0 = release 32|Win32 - {D8549E75-44C1-5970-0DB5-F1CD79E07BD8}.release|64.ActiveCfg = release 64|x64 - {D8549E75-44C1-5970-0DB5-F1CD79E07BD8}.release|64.Build.0 = release 64|x64 - {D9549E75-45C1-5970-0EB5-F1CD7AE07BD8}.debug|32.ActiveCfg = debug 32|Win32 - {D9549E75-45C1-5970-0EB5-F1CD7AE07BD8}.debug|32.Build.0 = debug 32|Win32 - {D9549E75-45C1-5970-0EB5-F1CD7AE07BD8}.debug|64.ActiveCfg = debug 64|x64 - {D9549E75-45C1-5970-0EB5-F1CD7AE07BD8}.debug|64.Build.0 = debug 64|x64 - {D9549E75-45C1-5970-0EB5-F1CD7AE07BD8}.release|32.ActiveCfg = release 32|Win32 - {D9549E75-45C1-5970-0EB5-F1CD7AE07BD8}.release|32.Build.0 = release 32|Win32 - {D9549E75-45C1-5970-0EB5-F1CD7AE07BD8}.release|64.ActiveCfg = release 64|x64 - {D9549E75-45C1-5970-0EB5-F1CD7AE07BD8}.release|64.Build.0 = release 64|x64 - {B6560C2B-A27B-5BAB-CBC6-403BB74A5AC9}.debug|32.ActiveCfg = debug 32|Win32 - {B6560C2B-A27B-5BAB-CBC6-403BB74A5AC9}.debug|32.Build.0 = debug 32|Win32 - {B6560C2B-A27B-5BAB-CBC6-403BB74A5AC9}.debug|64.ActiveCfg = debug 64|x64 - {B6560C2B-A27B-5BAB-CBC6-403BB74A5AC9}.debug|64.Build.0 = debug 64|x64 - {B6560C2B-A27B-5BAB-CBC6-403BB74A5AC9}.release|32.ActiveCfg = release 32|Win32 - {B6560C2B-A27B-5BAB-CBC6-403BB74A5AC9}.release|32.Build.0 = release 32|Win32 - {B6560C2B-A27B-5BAB-CBC6-403BB74A5AC9}.release|64.ActiveCfg = release 64|x64 - {B6560C2B-A27B-5BAB-CBC6-403BB74A5AC9}.release|64.Build.0 = release 64|x64 - {8EF02841-7AEA-5193-6357-E8A34FF0B7FF}.debug|32.ActiveCfg = debug 32|Win32 - {8EF02841-7AEA-5193-6357-E8A34FF0B7FF}.debug|32.Build.0 = debug 32|Win32 - {8EF02841-7AEA-5193-6357-E8A34FF0B7FF}.debug|64.ActiveCfg = debug 64|x64 - {8EF02841-7AEA-5193-6357-E8A34FF0B7FF}.debug|64.Build.0 = debug 64|x64 - {8EF02841-7AEA-5193-6357-E8A34FF0B7FF}.release|32.ActiveCfg = release 32|Win32 - {8EF02841-7AEA-5193-6357-E8A34FF0B7FF}.release|32.Build.0 = release 32|Win32 - {8EF02841-7AEA-5193-6357-E8A34FF0B7FF}.release|64.ActiveCfg = release 64|x64 - {8EF02841-7AEA-5193-6357-E8A34FF0B7FF}.release|64.Build.0 = release 64|x64 - {8FF02841-7BEA-5193-6457-E8A350F0B7FF}.debug|32.ActiveCfg = debug 32|Win32 - {8FF02841-7BEA-5193-6457-E8A350F0B7FF}.debug|32.Build.0 = debug 32|Win32 - {8FF02841-7BEA-5193-6457-E8A350F0B7FF}.debug|64.ActiveCfg = debug 64|x64 - {8FF02841-7BEA-5193-6457-E8A350F0B7FF}.debug|64.Build.0 = debug 64|x64 - {8FF02841-7BEA-5193-6457-E8A350F0B7FF}.release|32.ActiveCfg = release 32|Win32 - {8FF02841-7BEA-5193-6457-E8A350F0B7FF}.release|32.Build.0 = release 32|Win32 - {8FF02841-7BEA-5193-6457-E8A350F0B7FF}.release|64.ActiveCfg = release 64|x64 - {8FF02841-7BEA-5193-6457-E8A350F0B7FF}.release|64.Build.0 = release 64|x64 - {90F02841-7CEA-5193-6557-E8A351F0B7FF}.debug|32.ActiveCfg = debug 32|Win32 - {90F02841-7CEA-5193-6557-E8A351F0B7FF}.debug|32.Build.0 = debug 32|Win32 - {90F02841-7CEA-5193-6557-E8A351F0B7FF}.debug|64.ActiveCfg = debug 64|x64 - {90F02841-7CEA-5193-6557-E8A351F0B7FF}.debug|64.Build.0 = debug 64|x64 - {90F02841-7CEA-5193-6557-E8A351F0B7FF}.release|32.ActiveCfg = release 32|Win32 - {90F02841-7CEA-5193-6557-E8A351F0B7FF}.release|32.Build.0 = release 32|Win32 - {90F02841-7CEA-5193-6557-E8A351F0B7FF}.release|64.ActiveCfg = release 64|x64 - {90F02841-7CEA-5193-6557-E8A351F0B7FF}.release|64.Build.0 = release 64|x64 - {91F02841-7DEA-5193-6657-E8A352F0B7FF}.debug|32.ActiveCfg = debug 32|Win32 - {91F02841-7DEA-5193-6657-E8A352F0B7FF}.debug|32.Build.0 = debug 32|Win32 - {91F02841-7DEA-5193-6657-E8A352F0B7FF}.debug|64.ActiveCfg = debug 64|x64 - {91F02841-7DEA-5193-6657-E8A352F0B7FF}.debug|64.Build.0 = debug 64|x64 - {91F02841-7DEA-5193-6657-E8A352F0B7FF}.release|32.ActiveCfg = release 32|Win32 - {91F02841-7DEA-5193-6657-E8A352F0B7FF}.release|32.Build.0 = release 32|Win32 - {91F02841-7DEA-5193-6657-E8A352F0B7FF}.release|64.ActiveCfg = release 64|x64 - {91F02841-7DEA-5193-6657-E8A352F0B7FF}.release|64.Build.0 = release 64|x64 - {6EF7B917-DAB9-EDA1-236A-7C2E8F6BC67F}.debug|32.ActiveCfg = debug 32|Win32 - {6EF7B917-DAB9-EDA1-236A-7C2E8F6BC67F}.debug|32.Build.0 = debug 32|Win32 - {6EF7B917-DAB9-EDA1-236A-7C2E8F6BC67F}.debug|64.ActiveCfg = debug 64|x64 - {6EF7B917-DAB9-EDA1-236A-7C2E8F6BC67F}.debug|64.Build.0 = debug 64|x64 - {6EF7B917-DAB9-EDA1-236A-7C2E8F6BC67F}.release|32.ActiveCfg = release 32|Win32 - {6EF7B917-DAB9-EDA1-236A-7C2E8F6BC67F}.release|32.Build.0 = release 32|Win32 - {6EF7B917-DAB9-EDA1-236A-7C2E8F6BC67F}.release|64.ActiveCfg = release 64|x64 - {6EF7B917-DAB9-EDA1-236A-7C2E8F6BC67F}.release|64.Build.0 = release 64|x64 - {CD91E21A-3954-16A5-8204-A531EE05EF82}.debug|32.ActiveCfg = debug 32|Win32 - {CD91E21A-3954-16A5-8204-A531EE05EF82}.debug|32.Build.0 = debug 32|Win32 - {CD91E21A-3954-16A5-8204-A531EE05EF82}.debug|64.ActiveCfg = debug 64|x64 - {CD91E21A-3954-16A5-8204-A531EE05EF82}.debug|64.Build.0 = debug 64|x64 - {CD91E21A-3954-16A5-8204-A531EE05EF82}.release|32.ActiveCfg = release 32|Win32 - {CD91E21A-3954-16A5-8204-A531EE05EF82}.release|32.Build.0 = release 32|Win32 - {CD91E21A-3954-16A5-8204-A531EE05EF82}.release|64.ActiveCfg = release 64|x64 - {CD91E21A-3954-16A5-8204-A531EE05EF82}.release|64.Build.0 = release 64|x64 - {CE91E21A-3A54-16A5-8304-A531EF05EF82}.debug|32.ActiveCfg = debug 32|Win32 - {CE91E21A-3A54-16A5-8304-A531EF05EF82}.debug|32.Build.0 = debug 32|Win32 - {CE91E21A-3A54-16A5-8304-A531EF05EF82}.debug|64.ActiveCfg = debug 64|x64 - {CE91E21A-3A54-16A5-8304-A531EF05EF82}.debug|64.Build.0 = debug 64|x64 - {CE91E21A-3A54-16A5-8304-A531EF05EF82}.release|32.ActiveCfg = release 32|Win32 - {CE91E21A-3A54-16A5-8304-A531EF05EF82}.release|32.Build.0 = release 32|Win32 - {CE91E21A-3A54-16A5-8304-A531EF05EF82}.release|64.ActiveCfg = release 64|x64 - {CE91E21A-3A54-16A5-8304-A531EF05EF82}.release|64.Build.0 = release 64|x64 - {CF91E21A-3B54-16A5-8404-A531F005EF82}.debug|32.ActiveCfg = debug 32|Win32 - {CF91E21A-3B54-16A5-8404-A531F005EF82}.debug|32.Build.0 = debug 32|Win32 - {CF91E21A-3B54-16A5-8404-A531F005EF82}.debug|64.ActiveCfg = debug 64|x64 - {CF91E21A-3B54-16A5-8404-A531F005EF82}.debug|64.Build.0 = debug 64|x64 - {CF91E21A-3B54-16A5-8404-A531F005EF82}.release|32.ActiveCfg = release 32|Win32 - {CF91E21A-3B54-16A5-8404-A531F005EF82}.release|32.Build.0 = release 32|Win32 - {CF91E21A-3B54-16A5-8404-A531F005EF82}.release|64.ActiveCfg = release 64|x64 - {CF91E21A-3B54-16A5-8404-A531F005EF82}.release|64.Build.0 = release 64|x64 - {D091E21A-3C54-16A5-8504-A531F105EF82}.debug|32.ActiveCfg = debug 32|Win32 - {D091E21A-3C54-16A5-8504-A531F105EF82}.debug|32.Build.0 = debug 32|Win32 - {D091E21A-3C54-16A5-8504-A531F105EF82}.debug|64.ActiveCfg = debug 64|x64 - {D091E21A-3C54-16A5-8504-A531F105EF82}.debug|64.Build.0 = debug 64|x64 - {D091E21A-3C54-16A5-8504-A531F105EF82}.release|32.ActiveCfg = release 32|Win32 - {D091E21A-3C54-16A5-8504-A531F105EF82}.release|32.Build.0 = release 32|Win32 - {D091E21A-3C54-16A5-8504-A531F105EF82}.release|64.ActiveCfg = release 64|x64 - {D091E21A-3C54-16A5-8504-A531F105EF82}.release|64.Build.0 = release 64|x64 - {4D843E1B-393F-2EC7-E2F6-A611CE907857}.debug|32.ActiveCfg = debug 32|Win32 - {4D843E1B-393F-2EC7-E2F6-A611CE907857}.debug|32.Build.0 = debug 32|Win32 - {4D843E1B-393F-2EC7-E2F6-A611CE907857}.debug|64.ActiveCfg = debug 64|x64 - {4D843E1B-393F-2EC7-E2F6-A611CE907857}.debug|64.Build.0 = debug 64|x64 - {4D843E1B-393F-2EC7-E2F6-A611CE907857}.release|32.ActiveCfg = release 32|Win32 - {4D843E1B-393F-2EC7-E2F6-A611CE907857}.release|32.Build.0 = release 32|Win32 - {4D843E1B-393F-2EC7-E2F6-A611CE907857}.release|64.ActiveCfg = release 64|x64 - {4D843E1B-393F-2EC7-E2F6-A611CE907857}.release|64.Build.0 = release 64|x64 - {ADCBAED8-19AB-2D74-22C3-B84A8E2194D5}.debug|32.ActiveCfg = debug 32|Win32 - {ADCBAED8-19AB-2D74-22C3-B84A8E2194D5}.debug|32.Build.0 = debug 32|Win32 - {ADCBAED8-19AB-2D74-22C3-B84A8E2194D5}.debug|64.ActiveCfg = debug 64|x64 - {ADCBAED8-19AB-2D74-22C3-B84A8E2194D5}.debug|64.Build.0 = debug 64|x64 - {ADCBAED8-19AB-2D74-22C3-B84A8E2194D5}.release|32.ActiveCfg = release 32|Win32 - {ADCBAED8-19AB-2D74-22C3-B84A8E2194D5}.release|32.Build.0 = release 32|Win32 - {ADCBAED8-19AB-2D74-22C3-B84A8E2194D5}.release|64.ActiveCfg = release 64|x64 - {ADCBAED8-19AB-2D74-22C3-B84A8E2194D5}.release|64.Build.0 = release 64|x64 - {AECBAED8-1AAB-2D74-23C3-B84A8F2194D5}.debug|32.ActiveCfg = debug 32|Win32 - {AECBAED8-1AAB-2D74-23C3-B84A8F2194D5}.debug|32.Build.0 = debug 32|Win32 - {AECBAED8-1AAB-2D74-23C3-B84A8F2194D5}.debug|64.ActiveCfg = debug 64|x64 - {AECBAED8-1AAB-2D74-23C3-B84A8F2194D5}.debug|64.Build.0 = debug 64|x64 - {AECBAED8-1AAB-2D74-23C3-B84A8F2194D5}.release|32.ActiveCfg = release 32|Win32 - {AECBAED8-1AAB-2D74-23C3-B84A8F2194D5}.release|32.Build.0 = release 32|Win32 - {AECBAED8-1AAB-2D74-23C3-B84A8F2194D5}.release|64.ActiveCfg = release 64|x64 - {AECBAED8-1AAB-2D74-23C3-B84A8F2194D5}.release|64.Build.0 = release 64|x64 - {AFCBAED8-1BAB-2D74-24C3-B84A902194D5}.debug|32.ActiveCfg = debug 32|Win32 - {AFCBAED8-1BAB-2D74-24C3-B84A902194D5}.debug|32.Build.0 = debug 32|Win32 - {AFCBAED8-1BAB-2D74-24C3-B84A902194D5}.debug|64.ActiveCfg = debug 64|x64 - {AFCBAED8-1BAB-2D74-24C3-B84A902194D5}.debug|64.Build.0 = debug 64|x64 - {AFCBAED8-1BAB-2D74-24C3-B84A902194D5}.release|32.ActiveCfg = release 32|Win32 - {AFCBAED8-1BAB-2D74-24C3-B84A902194D5}.release|32.Build.0 = release 32|Win32 - {AFCBAED8-1BAB-2D74-24C3-B84A902194D5}.release|64.ActiveCfg = release 64|x64 - {AFCBAED8-1BAB-2D74-24C3-B84A902194D5}.release|64.Build.0 = release 64|x64 - {B0CBAED8-1CAB-2D74-25C3-B84A912194D5}.debug|32.ActiveCfg = debug 32|Win32 - {B0CBAED8-1CAB-2D74-25C3-B84A912194D5}.debug|32.Build.0 = debug 32|Win32 - {B0CBAED8-1CAB-2D74-25C3-B84A912194D5}.debug|64.ActiveCfg = debug 64|x64 - {B0CBAED8-1CAB-2D74-25C3-B84A912194D5}.debug|64.Build.0 = debug 64|x64 - {B0CBAED8-1CAB-2D74-25C3-B84A912194D5}.release|32.ActiveCfg = release 32|Win32 - {B0CBAED8-1CAB-2D74-25C3-B84A912194D5}.release|32.Build.0 = release 32|Win32 - {B0CBAED8-1CAB-2D74-25C3-B84A912194D5}.release|64.ActiveCfg = release 64|x64 - {B0CBAED8-1CAB-2D74-25C3-B84A912194D5}.release|64.Build.0 = release 64|x64 - {2DF246B5-19AA-8802-82B1-615E6E8823F3}.debug|32.ActiveCfg = debug 32|Win32 - {2DF246B5-19AA-8802-82B1-615E6E8823F3}.debug|32.Build.0 = debug 32|Win32 - {2DF246B5-19AA-8802-82B1-615E6E8823F3}.debug|64.ActiveCfg = debug 64|x64 - {2DF246B5-19AA-8802-82B1-615E6E8823F3}.debug|64.Build.0 = debug 64|x64 - {2DF246B5-19AA-8802-82B1-615E6E8823F3}.release|32.ActiveCfg = release 32|Win32 - {2DF246B5-19AA-8802-82B1-615E6E8823F3}.release|32.Build.0 = release 32|Win32 - {2DF246B5-19AA-8802-82B1-615E6E8823F3}.release|64.ActiveCfg = release 64|x64 - {2DF246B5-19AA-8802-82B1-615E6E8823F3}.release|64.Build.0 = release 64|x64 - {37901DD9-A36F-9C74-AC87-274B18E602D6}.debug|32.ActiveCfg = debug 32|Win32 - {37901DD9-A36F-9C74-AC87-274B18E602D6}.debug|32.Build.0 = debug 32|Win32 - {37901DD9-A36F-9C74-AC87-274B18E602D6}.debug|64.ActiveCfg = debug 64|x64 - {37901DD9-A36F-9C74-AC87-274B18E602D6}.debug|64.Build.0 = debug 64|x64 - {37901DD9-A36F-9C74-AC87-274B18E602D6}.release|32.ActiveCfg = release 32|Win32 - {37901DD9-A36F-9C74-AC87-274B18E602D6}.release|32.Build.0 = release 32|Win32 - {37901DD9-A36F-9C74-AC87-274B18E602D6}.release|64.ActiveCfg = release 64|x64 - {37901DD9-A36F-9C74-AC87-274B18E602D6}.release|64.Build.0 = release 64|x64 - {38901DD9-A46F-9C74-AD87-274B19E602D6}.debug|32.ActiveCfg = debug 32|Win32 - {38901DD9-A46F-9C74-AD87-274B19E602D6}.debug|32.Build.0 = debug 32|Win32 - {38901DD9-A46F-9C74-AD87-274B19E602D6}.debug|64.ActiveCfg = debug 64|x64 - {38901DD9-A46F-9C74-AD87-274B19E602D6}.debug|64.Build.0 = debug 64|x64 - {38901DD9-A46F-9C74-AD87-274B19E602D6}.release|32.ActiveCfg = release 32|Win32 - {38901DD9-A46F-9C74-AD87-274B19E602D6}.release|32.Build.0 = release 32|Win32 - {38901DD9-A46F-9C74-AD87-274B19E602D6}.release|64.ActiveCfg = release 64|x64 - {38901DD9-A46F-9C74-AD87-274B19E602D6}.release|64.Build.0 = release 64|x64 - {39901DD9-A56F-9C74-AE87-274B1AE602D6}.debug|32.ActiveCfg = debug 32|Win32 - {39901DD9-A56F-9C74-AE87-274B1AE602D6}.debug|32.Build.0 = debug 32|Win32 - {39901DD9-A56F-9C74-AE87-274B1AE602D6}.debug|64.ActiveCfg = debug 64|x64 - {39901DD9-A56F-9C74-AE87-274B1AE602D6}.debug|64.Build.0 = debug 64|x64 - {39901DD9-A56F-9C74-AE87-274B1AE602D6}.release|32.ActiveCfg = release 32|Win32 - {39901DD9-A56F-9C74-AE87-274B1AE602D6}.release|32.Build.0 = release 32|Win32 - {39901DD9-A56F-9C74-AE87-274B1AE602D6}.release|64.ActiveCfg = release 64|x64 - {39901DD9-A56F-9C74-AE87-274B1AE602D6}.release|64.Build.0 = release 64|x64 - {3A901DD9-A66F-9C74-AF87-274B1BE602D6}.debug|32.ActiveCfg = debug 32|Win32 - {3A901DD9-A66F-9C74-AF87-274B1BE602D6}.debug|32.Build.0 = debug 32|Win32 - {3A901DD9-A66F-9C74-AF87-274B1BE602D6}.debug|64.ActiveCfg = debug 64|x64 - {3A901DD9-A66F-9C74-AF87-274B1BE602D6}.debug|64.Build.0 = debug 64|x64 - {3A901DD9-A66F-9C74-AF87-274B1BE602D6}.release|32.ActiveCfg = release 32|Win32 - {3A901DD9-A66F-9C74-AF87-274B1BE602D6}.release|32.Build.0 = release 32|Win32 - {3A901DD9-A66F-9C74-AF87-274B1BE602D6}.release|64.ActiveCfg = release 64|x64 - {3A901DD9-A66F-9C74-AF87-274B1BE602D6}.release|64.Build.0 = release 64|x64 - {77E2BA72-639A-FCBF-CCA1-D51BB87897B0}.debug|32.ActiveCfg = debug 32|Win32 - {77E2BA72-639A-FCBF-CCA1-D51BB87897B0}.debug|32.Build.0 = debug 32|Win32 - {77E2BA72-639A-FCBF-CCA1-D51BB87897B0}.debug|64.ActiveCfg = debug 64|x64 - {77E2BA72-639A-FCBF-CCA1-D51BB87897B0}.debug|64.Build.0 = debug 64|x64 - {77E2BA72-639A-FCBF-CCA1-D51BB87897B0}.release|32.ActiveCfg = release 32|Win32 - {77E2BA72-639A-FCBF-CCA1-D51BB87897B0}.release|32.Build.0 = release 32|Win32 - {77E2BA72-639A-FCBF-CCA1-D51BB87897B0}.release|64.ActiveCfg = release 64|x64 - {77E2BA72-639A-FCBF-CCA1-D51BB87897B0}.release|64.Build.0 = release 64|x64 + {D6549E75-42C1-5970-0BB5-F1CD77E07BD8}.Debug|Win32.ActiveCfg = Debug|Win32 + {D6549E75-42C1-5970-0BB5-F1CD77E07BD8}.Debug|Win32.Build.0 = Debug|Win32 + {D6549E75-42C1-5970-0BB5-F1CD77E07BD8}.Debug|x64.ActiveCfg = Debug|x64 + {D6549E75-42C1-5970-0BB5-F1CD77E07BD8}.Debug|x64.Build.0 = Debug|x64 + {D6549E75-42C1-5970-0BB5-F1CD77E07BD8}.Release|Win32.ActiveCfg = Release|Win32 + {D6549E75-42C1-5970-0BB5-F1CD77E07BD8}.Release|Win32.Build.0 = Release|Win32 + {D6549E75-42C1-5970-0BB5-F1CD77E07BD8}.Release|x64.ActiveCfg = Release|x64 + {D6549E75-42C1-5970-0BB5-F1CD77E07BD8}.Release|x64.Build.0 = Release|x64 + {D7549E75-43C1-5970-0CB5-F1CD78E07BD8}.Debug|Win32.ActiveCfg = Debug|Win32 + {D7549E75-43C1-5970-0CB5-F1CD78E07BD8}.Debug|Win32.Build.0 = Debug|Win32 + {D7549E75-43C1-5970-0CB5-F1CD78E07BD8}.Debug|x64.ActiveCfg = Debug|x64 + {D7549E75-43C1-5970-0CB5-F1CD78E07BD8}.Debug|x64.Build.0 = Debug|x64 + {D7549E75-43C1-5970-0CB5-F1CD78E07BD8}.Release|Win32.ActiveCfg = Release|Win32 + {D7549E75-43C1-5970-0CB5-F1CD78E07BD8}.Release|Win32.Build.0 = Release|Win32 + {D7549E75-43C1-5970-0CB5-F1CD78E07BD8}.Release|x64.ActiveCfg = Release|x64 + {D7549E75-43C1-5970-0CB5-F1CD78E07BD8}.Release|x64.Build.0 = Release|x64 + {D8549E75-44C1-5970-0DB5-F1CD79E07BD8}.Debug|Win32.ActiveCfg = Debug|Win32 + {D8549E75-44C1-5970-0DB5-F1CD79E07BD8}.Debug|Win32.Build.0 = Debug|Win32 + {D8549E75-44C1-5970-0DB5-F1CD79E07BD8}.Debug|x64.ActiveCfg = Debug|x64 + {D8549E75-44C1-5970-0DB5-F1CD79E07BD8}.Debug|x64.Build.0 = Debug|x64 + {D8549E75-44C1-5970-0DB5-F1CD79E07BD8}.Release|Win32.ActiveCfg = Release|Win32 + {D8549E75-44C1-5970-0DB5-F1CD79E07BD8}.Release|Win32.Build.0 = Release|Win32 + {D8549E75-44C1-5970-0DB5-F1CD79E07BD8}.Release|x64.ActiveCfg = Release|x64 + {D8549E75-44C1-5970-0DB5-F1CD79E07BD8}.Release|x64.Build.0 = Release|x64 + {D9549E75-45C1-5970-0EB5-F1CD7AE07BD8}.Debug|Win32.ActiveCfg = Debug|Win32 + {D9549E75-45C1-5970-0EB5-F1CD7AE07BD8}.Debug|Win32.Build.0 = Debug|Win32 + {D9549E75-45C1-5970-0EB5-F1CD7AE07BD8}.Debug|x64.ActiveCfg = Debug|x64 + {D9549E75-45C1-5970-0EB5-F1CD7AE07BD8}.Debug|x64.Build.0 = Debug|x64 + {D9549E75-45C1-5970-0EB5-F1CD7AE07BD8}.Release|Win32.ActiveCfg = Release|Win32 + {D9549E75-45C1-5970-0EB5-F1CD7AE07BD8}.Release|Win32.Build.0 = Release|Win32 + {D9549E75-45C1-5970-0EB5-F1CD7AE07BD8}.Release|x64.ActiveCfg = Release|x64 + {D9549E75-45C1-5970-0EB5-F1CD7AE07BD8}.Release|x64.Build.0 = Release|x64 + {B6560C2B-A27B-5BAB-CBC6-403BB74A5AC9}.Debug|Win32.ActiveCfg = Debug|Win32 + {B6560C2B-A27B-5BAB-CBC6-403BB74A5AC9}.Debug|Win32.Build.0 = Debug|Win32 + {B6560C2B-A27B-5BAB-CBC6-403BB74A5AC9}.Debug|x64.ActiveCfg = Debug|x64 + {B6560C2B-A27B-5BAB-CBC6-403BB74A5AC9}.Debug|x64.Build.0 = Debug|x64 + {B6560C2B-A27B-5BAB-CBC6-403BB74A5AC9}.Release|Win32.ActiveCfg = Release|Win32 + {B6560C2B-A27B-5BAB-CBC6-403BB74A5AC9}.Release|Win32.Build.0 = Release|Win32 + {B6560C2B-A27B-5BAB-CBC6-403BB74A5AC9}.Release|x64.ActiveCfg = Release|x64 + {B6560C2B-A27B-5BAB-CBC6-403BB74A5AC9}.Release|x64.Build.0 = Release|x64 + {8EF02841-7AEA-5193-6357-E8A34FF0B7FF}.Debug|Win32.ActiveCfg = Debug|Win32 + {8EF02841-7AEA-5193-6357-E8A34FF0B7FF}.Debug|Win32.Build.0 = Debug|Win32 + {8EF02841-7AEA-5193-6357-E8A34FF0B7FF}.Debug|x64.ActiveCfg = Debug|x64 + {8EF02841-7AEA-5193-6357-E8A34FF0B7FF}.Debug|x64.Build.0 = Debug|x64 + {8EF02841-7AEA-5193-6357-E8A34FF0B7FF}.Release|Win32.ActiveCfg = Release|Win32 + {8EF02841-7AEA-5193-6357-E8A34FF0B7FF}.Release|Win32.Build.0 = Release|Win32 + {8EF02841-7AEA-5193-6357-E8A34FF0B7FF}.Release|x64.ActiveCfg = Release|x64 + {8EF02841-7AEA-5193-6357-E8A34FF0B7FF}.Release|x64.Build.0 = Release|x64 + {8FF02841-7BEA-5193-6457-E8A350F0B7FF}.Debug|Win32.ActiveCfg = Debug|Win32 + {8FF02841-7BEA-5193-6457-E8A350F0B7FF}.Debug|Win32.Build.0 = Debug|Win32 + {8FF02841-7BEA-5193-6457-E8A350F0B7FF}.Debug|x64.ActiveCfg = Debug|x64 + {8FF02841-7BEA-5193-6457-E8A350F0B7FF}.Debug|x64.Build.0 = Debug|x64 + {8FF02841-7BEA-5193-6457-E8A350F0B7FF}.Release|Win32.ActiveCfg = Release|Win32 + {8FF02841-7BEA-5193-6457-E8A350F0B7FF}.Release|Win32.Build.0 = Release|Win32 + {8FF02841-7BEA-5193-6457-E8A350F0B7FF}.Release|x64.ActiveCfg = Release|x64 + {8FF02841-7BEA-5193-6457-E8A350F0B7FF}.Release|x64.Build.0 = Release|x64 + {90F02841-7CEA-5193-6557-E8A351F0B7FF}.Debug|Win32.ActiveCfg = Debug|Win32 + {90F02841-7CEA-5193-6557-E8A351F0B7FF}.Debug|Win32.Build.0 = Debug|Win32 + {90F02841-7CEA-5193-6557-E8A351F0B7FF}.Debug|x64.ActiveCfg = Debug|x64 + {90F02841-7CEA-5193-6557-E8A351F0B7FF}.Debug|x64.Build.0 = Debug|x64 + {90F02841-7CEA-5193-6557-E8A351F0B7FF}.Release|Win32.ActiveCfg = Release|Win32 + {90F02841-7CEA-5193-6557-E8A351F0B7FF}.Release|Win32.Build.0 = Release|Win32 + {90F02841-7CEA-5193-6557-E8A351F0B7FF}.Release|x64.ActiveCfg = Release|x64 + {90F02841-7CEA-5193-6557-E8A351F0B7FF}.Release|x64.Build.0 = Release|x64 + {91F02841-7DEA-5193-6657-E8A352F0B7FF}.Debug|Win32.ActiveCfg = Debug|Win32 + {91F02841-7DEA-5193-6657-E8A352F0B7FF}.Debug|Win32.Build.0 = Debug|Win32 + {91F02841-7DEA-5193-6657-E8A352F0B7FF}.Debug|x64.ActiveCfg = Debug|x64 + {91F02841-7DEA-5193-6657-E8A352F0B7FF}.Debug|x64.Build.0 = Debug|x64 + {91F02841-7DEA-5193-6657-E8A352F0B7FF}.Release|Win32.ActiveCfg = Release|Win32 + {91F02841-7DEA-5193-6657-E8A352F0B7FF}.Release|Win32.Build.0 = Release|Win32 + {91F02841-7DEA-5193-6657-E8A352F0B7FF}.Release|x64.ActiveCfg = Release|x64 + {91F02841-7DEA-5193-6657-E8A352F0B7FF}.Release|x64.Build.0 = Release|x64 + {6EF7B917-DAB9-EDA1-236A-7C2E8F6BC67F}.Debug|Win32.ActiveCfg = Debug|Win32 + {6EF7B917-DAB9-EDA1-236A-7C2E8F6BC67F}.Debug|Win32.Build.0 = Debug|Win32 + {6EF7B917-DAB9-EDA1-236A-7C2E8F6BC67F}.Debug|x64.ActiveCfg = Debug|x64 + {6EF7B917-DAB9-EDA1-236A-7C2E8F6BC67F}.Debug|x64.Build.0 = Debug|x64 + {6EF7B917-DAB9-EDA1-236A-7C2E8F6BC67F}.Release|Win32.ActiveCfg = Release|Win32 + {6EF7B917-DAB9-EDA1-236A-7C2E8F6BC67F}.Release|Win32.Build.0 = Release|Win32 + {6EF7B917-DAB9-EDA1-236A-7C2E8F6BC67F}.Release|x64.ActiveCfg = Release|x64 + {6EF7B917-DAB9-EDA1-236A-7C2E8F6BC67F}.Release|x64.Build.0 = Release|x64 + {CD91E21A-3954-16A5-8204-A531EE05EF82}.Debug|Win32.ActiveCfg = Debug|Win32 + {CD91E21A-3954-16A5-8204-A531EE05EF82}.Debug|Win32.Build.0 = Debug|Win32 + {CD91E21A-3954-16A5-8204-A531EE05EF82}.Debug|x64.ActiveCfg = Debug|x64 + {CD91E21A-3954-16A5-8204-A531EE05EF82}.Debug|x64.Build.0 = Debug|x64 + {CD91E21A-3954-16A5-8204-A531EE05EF82}.Release|Win32.ActiveCfg = Release|Win32 + {CD91E21A-3954-16A5-8204-A531EE05EF82}.Release|Win32.Build.0 = Release|Win32 + {CD91E21A-3954-16A5-8204-A531EE05EF82}.Release|x64.ActiveCfg = Release|x64 + {CD91E21A-3954-16A5-8204-A531EE05EF82}.Release|x64.Build.0 = Release|x64 + {CE91E21A-3A54-16A5-8304-A531EF05EF82}.Debug|Win32.ActiveCfg = Debug|Win32 + {CE91E21A-3A54-16A5-8304-A531EF05EF82}.Debug|Win32.Build.0 = Debug|Win32 + {CE91E21A-3A54-16A5-8304-A531EF05EF82}.Debug|x64.ActiveCfg = Debug|x64 + {CE91E21A-3A54-16A5-8304-A531EF05EF82}.Debug|x64.Build.0 = Debug|x64 + {CE91E21A-3A54-16A5-8304-A531EF05EF82}.Release|Win32.ActiveCfg = Release|Win32 + {CE91E21A-3A54-16A5-8304-A531EF05EF82}.Release|Win32.Build.0 = Release|Win32 + {CE91E21A-3A54-16A5-8304-A531EF05EF82}.Release|x64.ActiveCfg = Release|x64 + {CE91E21A-3A54-16A5-8304-A531EF05EF82}.Release|x64.Build.0 = Release|x64 + {CF91E21A-3B54-16A5-8404-A531F005EF82}.Debug|Win32.ActiveCfg = Debug|Win32 + {CF91E21A-3B54-16A5-8404-A531F005EF82}.Debug|Win32.Build.0 = Debug|Win32 + {CF91E21A-3B54-16A5-8404-A531F005EF82}.Debug|x64.ActiveCfg = Debug|x64 + {CF91E21A-3B54-16A5-8404-A531F005EF82}.Debug|x64.Build.0 = Debug|x64 + {CF91E21A-3B54-16A5-8404-A531F005EF82}.Release|Win32.ActiveCfg = Release|Win32 + {CF91E21A-3B54-16A5-8404-A531F005EF82}.Release|Win32.Build.0 = Release|Win32 + {CF91E21A-3B54-16A5-8404-A531F005EF82}.Release|x64.ActiveCfg = Release|x64 + {CF91E21A-3B54-16A5-8404-A531F005EF82}.Release|x64.Build.0 = Release|x64 + {D091E21A-3C54-16A5-8504-A531F105EF82}.Debug|Win32.ActiveCfg = Debug|Win32 + {D091E21A-3C54-16A5-8504-A531F105EF82}.Debug|Win32.Build.0 = Debug|Win32 + {D091E21A-3C54-16A5-8504-A531F105EF82}.Debug|x64.ActiveCfg = Debug|x64 + {D091E21A-3C54-16A5-8504-A531F105EF82}.Debug|x64.Build.0 = Debug|x64 + {D091E21A-3C54-16A5-8504-A531F105EF82}.Release|Win32.ActiveCfg = Release|Win32 + {D091E21A-3C54-16A5-8504-A531F105EF82}.Release|Win32.Build.0 = Release|Win32 + {D091E21A-3C54-16A5-8504-A531F105EF82}.Release|x64.ActiveCfg = Release|x64 + {D091E21A-3C54-16A5-8504-A531F105EF82}.Release|x64.Build.0 = Release|x64 + {4D843E1B-393F-2EC7-E2F6-A611CE907857}.Debug|Win32.ActiveCfg = Debug|Win32 + {4D843E1B-393F-2EC7-E2F6-A611CE907857}.Debug|Win32.Build.0 = Debug|Win32 + {4D843E1B-393F-2EC7-E2F6-A611CE907857}.Debug|x64.ActiveCfg = Debug|x64 + {4D843E1B-393F-2EC7-E2F6-A611CE907857}.Debug|x64.Build.0 = Debug|x64 + {4D843E1B-393F-2EC7-E2F6-A611CE907857}.Release|Win32.ActiveCfg = Release|Win32 + {4D843E1B-393F-2EC7-E2F6-A611CE907857}.Release|Win32.Build.0 = Release|Win32 + {4D843E1B-393F-2EC7-E2F6-A611CE907857}.Release|x64.ActiveCfg = Release|x64 + {4D843E1B-393F-2EC7-E2F6-A611CE907857}.Release|x64.Build.0 = Release|x64 + {ADCBAED8-19AB-2D74-22C3-B84A8E2194D5}.Debug|Win32.ActiveCfg = Debug|Win32 + {ADCBAED8-19AB-2D74-22C3-B84A8E2194D5}.Debug|Win32.Build.0 = Debug|Win32 + {ADCBAED8-19AB-2D74-22C3-B84A8E2194D5}.Debug|x64.ActiveCfg = Debug|x64 + {ADCBAED8-19AB-2D74-22C3-B84A8E2194D5}.Debug|x64.Build.0 = Debug|x64 + {ADCBAED8-19AB-2D74-22C3-B84A8E2194D5}.Release|Win32.ActiveCfg = Release|Win32 + {ADCBAED8-19AB-2D74-22C3-B84A8E2194D5}.Release|Win32.Build.0 = Release|Win32 + {ADCBAED8-19AB-2D74-22C3-B84A8E2194D5}.Release|x64.ActiveCfg = Release|x64 + {ADCBAED8-19AB-2D74-22C3-B84A8E2194D5}.Release|x64.Build.0 = Release|x64 + {AECBAED8-1AAB-2D74-23C3-B84A8F2194D5}.Debug|Win32.ActiveCfg = Debug|Win32 + {AECBAED8-1AAB-2D74-23C3-B84A8F2194D5}.Debug|Win32.Build.0 = Debug|Win32 + {AECBAED8-1AAB-2D74-23C3-B84A8F2194D5}.Debug|x64.ActiveCfg = Debug|x64 + {AECBAED8-1AAB-2D74-23C3-B84A8F2194D5}.Debug|x64.Build.0 = Debug|x64 + {AECBAED8-1AAB-2D74-23C3-B84A8F2194D5}.Release|Win32.ActiveCfg = Release|Win32 + {AECBAED8-1AAB-2D74-23C3-B84A8F2194D5}.Release|Win32.Build.0 = Release|Win32 + {AECBAED8-1AAB-2D74-23C3-B84A8F2194D5}.Release|x64.ActiveCfg = Release|x64 + {AECBAED8-1AAB-2D74-23C3-B84A8F2194D5}.Release|x64.Build.0 = Release|x64 + {AFCBAED8-1BAB-2D74-24C3-B84A902194D5}.Debug|Win32.ActiveCfg = Debug|Win32 + {AFCBAED8-1BAB-2D74-24C3-B84A902194D5}.Debug|Win32.Build.0 = Debug|Win32 + {AFCBAED8-1BAB-2D74-24C3-B84A902194D5}.Debug|x64.ActiveCfg = Debug|x64 + {AFCBAED8-1BAB-2D74-24C3-B84A902194D5}.Debug|x64.Build.0 = Debug|x64 + {AFCBAED8-1BAB-2D74-24C3-B84A902194D5}.Release|Win32.ActiveCfg = Release|Win32 + {AFCBAED8-1BAB-2D74-24C3-B84A902194D5}.Release|Win32.Build.0 = Release|Win32 + {AFCBAED8-1BAB-2D74-24C3-B84A902194D5}.Release|x64.ActiveCfg = Release|x64 + {AFCBAED8-1BAB-2D74-24C3-B84A902194D5}.Release|x64.Build.0 = Release|x64 + {B0CBAED8-1CAB-2D74-25C3-B84A912194D5}.Debug|Win32.ActiveCfg = Debug|Win32 + {B0CBAED8-1CAB-2D74-25C3-B84A912194D5}.Debug|Win32.Build.0 = Debug|Win32 + {B0CBAED8-1CAB-2D74-25C3-B84A912194D5}.Debug|x64.ActiveCfg = Debug|x64 + {B0CBAED8-1CAB-2D74-25C3-B84A912194D5}.Debug|x64.Build.0 = Debug|x64 + {B0CBAED8-1CAB-2D74-25C3-B84A912194D5}.Release|Win32.ActiveCfg = Release|Win32 + {B0CBAED8-1CAB-2D74-25C3-B84A912194D5}.Release|Win32.Build.0 = Release|Win32 + {B0CBAED8-1CAB-2D74-25C3-B84A912194D5}.Release|x64.ActiveCfg = Release|x64 + {B0CBAED8-1CAB-2D74-25C3-B84A912194D5}.Release|x64.Build.0 = Release|x64 + {2DF246B5-19AA-8802-82B1-615E6E8823F3}.Debug|Win32.ActiveCfg = Debug|Win32 + {2DF246B5-19AA-8802-82B1-615E6E8823F3}.Debug|Win32.Build.0 = Debug|Win32 + {2DF246B5-19AA-8802-82B1-615E6E8823F3}.Debug|x64.ActiveCfg = Debug|x64 + {2DF246B5-19AA-8802-82B1-615E6E8823F3}.Debug|x64.Build.0 = Debug|x64 + {2DF246B5-19AA-8802-82B1-615E6E8823F3}.Release|Win32.ActiveCfg = Release|Win32 + {2DF246B5-19AA-8802-82B1-615E6E8823F3}.Release|Win32.Build.0 = Release|Win32 + {2DF246B5-19AA-8802-82B1-615E6E8823F3}.Release|x64.ActiveCfg = Release|x64 + {2DF246B5-19AA-8802-82B1-615E6E8823F3}.Release|x64.Build.0 = Release|x64 + {37901DD9-A36F-9C74-AC87-274B18E602D6}.Debug|Win32.ActiveCfg = Debug|Win32 + {37901DD9-A36F-9C74-AC87-274B18E602D6}.Debug|Win32.Build.0 = Debug|Win32 + {37901DD9-A36F-9C74-AC87-274B18E602D6}.Debug|x64.ActiveCfg = Debug|x64 + {37901DD9-A36F-9C74-AC87-274B18E602D6}.Debug|x64.Build.0 = Debug|x64 + {37901DD9-A36F-9C74-AC87-274B18E602D6}.Release|Win32.ActiveCfg = Release|Win32 + {37901DD9-A36F-9C74-AC87-274B18E602D6}.Release|Win32.Build.0 = Release|Win32 + {37901DD9-A36F-9C74-AC87-274B18E602D6}.Release|x64.ActiveCfg = Release|x64 + {37901DD9-A36F-9C74-AC87-274B18E602D6}.Release|x64.Build.0 = Release|x64 + {38901DD9-A46F-9C74-AD87-274B19E602D6}.Debug|Win32.ActiveCfg = Debug|Win32 + {38901DD9-A46F-9C74-AD87-274B19E602D6}.Debug|Win32.Build.0 = Debug|Win32 + {38901DD9-A46F-9C74-AD87-274B19E602D6}.Debug|x64.ActiveCfg = Debug|x64 + {38901DD9-A46F-9C74-AD87-274B19E602D6}.Debug|x64.Build.0 = Debug|x64 + {38901DD9-A46F-9C74-AD87-274B19E602D6}.Release|Win32.ActiveCfg = Release|Win32 + {38901DD9-A46F-9C74-AD87-274B19E602D6}.Release|Win32.Build.0 = Release|Win32 + {38901DD9-A46F-9C74-AD87-274B19E602D6}.Release|x64.ActiveCfg = Release|x64 + {38901DD9-A46F-9C74-AD87-274B19E602D6}.Release|x64.Build.0 = Release|x64 + {39901DD9-A56F-9C74-AE87-274B1AE602D6}.Debug|Win32.ActiveCfg = Debug|Win32 + {39901DD9-A56F-9C74-AE87-274B1AE602D6}.Debug|Win32.Build.0 = Debug|Win32 + {39901DD9-A56F-9C74-AE87-274B1AE602D6}.Debug|x64.ActiveCfg = Debug|x64 + {39901DD9-A56F-9C74-AE87-274B1AE602D6}.Debug|x64.Build.0 = Debug|x64 + {39901DD9-A56F-9C74-AE87-274B1AE602D6}.Release|Win32.ActiveCfg = Release|Win32 + {39901DD9-A56F-9C74-AE87-274B1AE602D6}.Release|Win32.Build.0 = Release|Win32 + {39901DD9-A56F-9C74-AE87-274B1AE602D6}.Release|x64.ActiveCfg = Release|x64 + {39901DD9-A56F-9C74-AE87-274B1AE602D6}.Release|x64.Build.0 = Release|x64 + {3A901DD9-A66F-9C74-AF87-274B1BE602D6}.Debug|Win32.ActiveCfg = Debug|Win32 + {3A901DD9-A66F-9C74-AF87-274B1BE602D6}.Debug|Win32.Build.0 = Debug|Win32 + {3A901DD9-A66F-9C74-AF87-274B1BE602D6}.Debug|x64.ActiveCfg = Debug|x64 + {3A901DD9-A66F-9C74-AF87-274B1BE602D6}.Debug|x64.Build.0 = Debug|x64 + {3A901DD9-A66F-9C74-AF87-274B1BE602D6}.Release|Win32.ActiveCfg = Release|Win32 + {3A901DD9-A66F-9C74-AF87-274B1BE602D6}.Release|Win32.Build.0 = Release|Win32 + {3A901DD9-A66F-9C74-AF87-274B1BE602D6}.Release|x64.ActiveCfg = Release|x64 + {3A901DD9-A66F-9C74-AF87-274B1BE602D6}.Release|x64.Build.0 = Release|x64 + {77E2BA72-639A-FCBF-CCA1-D51BB87897B0}.Debug|Win32.ActiveCfg = Debug|Win32 + {77E2BA72-639A-FCBF-CCA1-D51BB87897B0}.Debug|Win32.Build.0 = Debug|Win32 + {77E2BA72-639A-FCBF-CCA1-D51BB87897B0}.Debug|x64.ActiveCfg = Debug|x64 + {77E2BA72-639A-FCBF-CCA1-D51BB87897B0}.Debug|x64.Build.0 = Debug|x64 + {77E2BA72-639A-FCBF-CCA1-D51BB87897B0}.Release|Win32.ActiveCfg = Release|Win32 + {77E2BA72-639A-FCBF-CCA1-D51BB87897B0}.Release|Win32.Build.0 = Release|Win32 + {77E2BA72-639A-FCBF-CCA1-D51BB87897B0}.Release|x64.ActiveCfg = Release|x64 + {77E2BA72-639A-FCBF-CCA1-D51BB87897B0}.Release|x64.Build.0 = Release|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/projects/premake/ffsm2-lite.sln b/projects/premake/ffsm2-lite.sln index a6786b7..c5e5ffa 100644 --- a/projects/premake/ffsm2-lite.sln +++ b/projects/premake/ffsm2-lite.sln @@ -11,49 +11,46 @@ Project("{888888A0-9F3D-457C-B088-3A5042F75D52}") = "tools", "tools.pyproj", "{2 EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution - debug|32 = debug|32 - debug|64 = debug|64 - debug|Any CPU = debug|Any CPU - release|32 = release|32 - release|64 = release|64 - release|Any CPU = release|Any CPU + Debug|Any CPU = Debug|Any CPU + Debug|Win32 = Debug|Win32 + Debug|x64 = Debug|x64 + Release|Any CPU = Release|Any CPU + Release|Win32 = Release|Win32 + Release|x64 = Release|x64 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {37901DD9-A36F-9C74-AC87-274B18E602D6}.debug|32.ActiveCfg = debug 32|Win32 - {37901DD9-A36F-9C74-AC87-274B18E602D6}.debug|32.Build.0 = debug 32|Win32 - {37901DD9-A36F-9C74-AC87-274B18E602D6}.debug|64.ActiveCfg = debug 64|x64 - {37901DD9-A36F-9C74-AC87-274B18E602D6}.debug|64.Build.0 = debug 64|x64 - {37901DD9-A36F-9C74-AC87-274B18E602D6}.debug|Any CPU.ActiveCfg = debug 32|x64 - {37901DD9-A36F-9C74-AC87-274B18E602D6}.debug|Any CPU.Build.0 = debug 32|x64 - {37901DD9-A36F-9C74-AC87-274B18E602D6}.release|32.ActiveCfg = release 32|Win32 - {37901DD9-A36F-9C74-AC87-274B18E602D6}.release|32.Build.0 = release 32|Win32 - {37901DD9-A36F-9C74-AC87-274B18E602D6}.release|64.ActiveCfg = release 64|x64 - {37901DD9-A36F-9C74-AC87-274B18E602D6}.release|64.Build.0 = release 64|x64 - {37901DD9-A36F-9C74-AC87-274B18E602D6}.release|Any CPU.ActiveCfg = release 32|x64 - {37901DD9-A36F-9C74-AC87-274B18E602D6}.release|Any CPU.Build.0 = release 32|x64 - {77E2BA72-639A-FCBF-CCA1-D51BB87897B0}.debug|32.ActiveCfg = debug 32|Win32 - {77E2BA72-639A-FCBF-CCA1-D51BB87897B0}.debug|32.Build.0 = debug 32|Win32 - {77E2BA72-639A-FCBF-CCA1-D51BB87897B0}.debug|64.ActiveCfg = debug 64|x64 - {77E2BA72-639A-FCBF-CCA1-D51BB87897B0}.debug|64.Build.0 = debug 64|x64 - {77E2BA72-639A-FCBF-CCA1-D51BB87897B0}.debug|Any CPU.ActiveCfg = debug 32|x64 - {77E2BA72-639A-FCBF-CCA1-D51BB87897B0}.debug|Any CPU.Build.0 = debug 32|x64 - {77E2BA72-639A-FCBF-CCA1-D51BB87897B0}.release|32.ActiveCfg = release 32|Win32 - {77E2BA72-639A-FCBF-CCA1-D51BB87897B0}.release|32.Build.0 = release 32|Win32 - {77E2BA72-639A-FCBF-CCA1-D51BB87897B0}.release|64.ActiveCfg = release 64|x64 - {77E2BA72-639A-FCBF-CCA1-D51BB87897B0}.release|64.Build.0 = release 64|x64 - {77E2BA72-639A-FCBF-CCA1-D51BB87897B0}.release|Any CPU.ActiveCfg = release 32|x64 - {77E2BA72-639A-FCBF-CCA1-D51BB87897B0}.release|Any CPU.Build.0 = release 32|x64 - {2347027E-E5DE-43C4-8EF9-5F1411ADE33B}.debug|32.ActiveCfg = Debug|Any CPU - {2347027E-E5DE-43C4-8EF9-5F1411ADE33B}.debug|64.ActiveCfg = Debug|Any CPU - {2347027E-E5DE-43C4-8EF9-5F1411ADE33B}.debug|Any CPU.ActiveCfg = Debug|Any CPU - {2347027E-E5DE-43C4-8EF9-5F1411ADE33B}.release|32.ActiveCfg = Release|Any CPU - {2347027E-E5DE-43C4-8EF9-5F1411ADE33B}.release|64.ActiveCfg = Release|Any CPU - {2347027E-E5DE-43C4-8EF9-5F1411ADE33B}.release|Any CPU.ActiveCfg = Release|Any CPU + {37901DD9-A36F-9C74-AC87-274B18E602D6}.Debug|Any CPU.ActiveCfg = Debug|x64 + {37901DD9-A36F-9C74-AC87-274B18E602D6}.Debug|Any CPU.Build.0 = Debug|x64 + {37901DD9-A36F-9C74-AC87-274B18E602D6}.Debug|Win32.ActiveCfg = Debug|Win32 + {37901DD9-A36F-9C74-AC87-274B18E602D6}.Debug|Win32.Build.0 = Debug|Win32 + {37901DD9-A36F-9C74-AC87-274B18E602D6}.Debug|x64.ActiveCfg = Debug|x64 + {37901DD9-A36F-9C74-AC87-274B18E602D6}.Debug|x64.Build.0 = Debug|x64 + {37901DD9-A36F-9C74-AC87-274B18E602D6}.Release|Any CPU.ActiveCfg = Release|x64 + {37901DD9-A36F-9C74-AC87-274B18E602D6}.Release|Any CPU.Build.0 = Release|x64 + {37901DD9-A36F-9C74-AC87-274B18E602D6}.Release|Win32.ActiveCfg = Release|Win32 + {37901DD9-A36F-9C74-AC87-274B18E602D6}.Release|Win32.Build.0 = Release|Win32 + {37901DD9-A36F-9C74-AC87-274B18E602D6}.Release|x64.ActiveCfg = Release|x64 + {37901DD9-A36F-9C74-AC87-274B18E602D6}.Release|x64.Build.0 = Release|x64 + {77E2BA72-639A-FCBF-CCA1-D51BB87897B0}.Debug|Any CPU.ActiveCfg = Debug|x64 + {77E2BA72-639A-FCBF-CCA1-D51BB87897B0}.Debug|Any CPU.Build.0 = Debug|x64 + {77E2BA72-639A-FCBF-CCA1-D51BB87897B0}.Debug|Win32.ActiveCfg = Debug|Win32 + {77E2BA72-639A-FCBF-CCA1-D51BB87897B0}.Debug|Win32.Build.0 = Debug|Win32 + {77E2BA72-639A-FCBF-CCA1-D51BB87897B0}.Debug|x64.ActiveCfg = Debug|x64 + {77E2BA72-639A-FCBF-CCA1-D51BB87897B0}.Debug|x64.Build.0 = Debug|x64 + {77E2BA72-639A-FCBF-CCA1-D51BB87897B0}.Release|Any CPU.ActiveCfg = Release|x64 + {77E2BA72-639A-FCBF-CCA1-D51BB87897B0}.Release|Any CPU.Build.0 = Release|x64 + {77E2BA72-639A-FCBF-CCA1-D51BB87897B0}.Release|Win32.ActiveCfg = Release|Win32 + {77E2BA72-639A-FCBF-CCA1-D51BB87897B0}.Release|Win32.Build.0 = Release|Win32 + {77E2BA72-639A-FCBF-CCA1-D51BB87897B0}.Release|x64.ActiveCfg = Release|x64 + {77E2BA72-639A-FCBF-CCA1-D51BB87897B0}.Release|x64.Build.0 = Release|x64 + {2347027E-E5DE-43C4-8EF9-5F1411ADE33B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {2347027E-E5DE-43C4-8EF9-5F1411ADE33B}.Debug|Win32.ActiveCfg = Debug|Any CPU + {2347027E-E5DE-43C4-8EF9-5F1411ADE33B}.Debug|x64.ActiveCfg = Debug|Any CPU + {2347027E-E5DE-43C4-8EF9-5F1411ADE33B}.Release|Any CPU.ActiveCfg = Release|Any CPU + {2347027E-E5DE-43C4-8EF9-5F1411ADE33B}.Release|Win32.ActiveCfg = Release|Any CPU + {2347027E-E5DE-43C4-8EF9-5F1411ADE33B}.Release|x64.ActiveCfg = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection - GlobalSection(ExtensibilityGlobals) = postSolution - SolutionGuid = {718B8CBD-04FD-4F7D-AD45-199FF85332B1} - EndGlobalSection EndGlobal diff --git a/projects/premake/ffsm2-vs.sln b/projects/premake/ffsm2-vs.sln new file mode 100644 index 0000000..03ae148 --- /dev/null +++ b/projects/premake/ffsm2-vs.sln @@ -0,0 +1,151 @@ + +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio Version 17 +VisualStudioVersion = 17.8.34330.188 +MinimumVisualStudioVersion = 10.0.40219.1 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "basic_audio_player-15", "basic_audio_player-15.vcxproj", "{D7549E75-43C1-5970-0CB5-F1CD78E07BD8}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "basic_audio_player-16", "basic_audio_player-16.vcxproj", "{D8549E75-44C1-5970-0DB5-F1CD79E07BD8}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "basic_audio_player-17", "basic_audio_player-17.vcxproj", "{D9549E75-45C1-5970-0EB5-F1CD7AE07BD8}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "basic_traffic_light-15", "basic_traffic_light-15.vcxproj", "{8FF02841-7BEA-5193-6457-E8A350F0B7FF}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "basic_traffic_light-17", "basic_traffic_light-17.vcxproj", "{91F02841-7DEA-5193-6657-E8A352F0B7FF}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "debug_logger_interface-15", "debug_logger_interface-15.vcxproj", "{CE91E21A-3A54-16A5-8304-A531EF05EF82}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "debug_logger_interface-17", "debug_logger_interface-17.vcxproj", "{D091E21A-3C54-16A5-8504-A531F105EF82}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "temp-15", "temp-15.vcxproj", "{AECBAED8-1AAB-2D74-23C3-B84A8F2194D5}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "temp-16", "temp-16.vcxproj", "{AFCBAED8-1BAB-2D74-24C3-B84A902194D5}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "temp-17", "temp-17.vcxproj", "{B0CBAED8-1CAB-2D74-25C3-B84A912194D5}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test-15", "test-15.vcxproj", "{38901DD9-A46F-9C74-AD87-274B19E602D6}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test-16", "test-16.vcxproj", "{39901DD9-A56F-9C74-AE87-274B1AE602D6}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test-17", "test-17.vcxproj", "{3A901DD9-A66F-9C74-AF87-274B1BE602D6}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|32 = Debug|32 + Debug|64 = Debug|64 + Release|32 = Release|32 + Release|64 = Release|64 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {D7549E75-43C1-5970-0CB5-F1CD78E07BD8}.Debug|32.ActiveCfg = Debug|Win32 + {D7549E75-43C1-5970-0CB5-F1CD78E07BD8}.Debug|32.Build.0 = Debug|Win32 + {D7549E75-43C1-5970-0CB5-F1CD78E07BD8}.Debug|64.ActiveCfg = Debug|x64 + {D7549E75-43C1-5970-0CB5-F1CD78E07BD8}.Debug|64.Build.0 = Debug|x64 + {D7549E75-43C1-5970-0CB5-F1CD78E07BD8}.Release|32.ActiveCfg = Release|Win32 + {D7549E75-43C1-5970-0CB5-F1CD78E07BD8}.Release|32.Build.0 = Release|Win32 + {D7549E75-43C1-5970-0CB5-F1CD78E07BD8}.Release|64.ActiveCfg = Release|x64 + {D7549E75-43C1-5970-0CB5-F1CD78E07BD8}.Release|64.Build.0 = Release|x64 + {D8549E75-44C1-5970-0DB5-F1CD79E07BD8}.Debug|32.ActiveCfg = Debug|Win32 + {D8549E75-44C1-5970-0DB5-F1CD79E07BD8}.Debug|32.Build.0 = Debug|Win32 + {D8549E75-44C1-5970-0DB5-F1CD79E07BD8}.Debug|64.ActiveCfg = Debug|x64 + {D8549E75-44C1-5970-0DB5-F1CD79E07BD8}.Debug|64.Build.0 = Debug|x64 + {D8549E75-44C1-5970-0DB5-F1CD79E07BD8}.Release|32.ActiveCfg = Release|Win32 + {D8549E75-44C1-5970-0DB5-F1CD79E07BD8}.Release|32.Build.0 = Release|Win32 + {D8549E75-44C1-5970-0DB5-F1CD79E07BD8}.Release|64.ActiveCfg = Release|x64 + {D8549E75-44C1-5970-0DB5-F1CD79E07BD8}.Release|64.Build.0 = Release|x64 + {D9549E75-45C1-5970-0EB5-F1CD7AE07BD8}.Debug|32.ActiveCfg = Debug|Win32 + {D9549E75-45C1-5970-0EB5-F1CD7AE07BD8}.Debug|32.Build.0 = Debug|Win32 + {D9549E75-45C1-5970-0EB5-F1CD7AE07BD8}.Debug|64.ActiveCfg = Debug|x64 + {D9549E75-45C1-5970-0EB5-F1CD7AE07BD8}.Debug|64.Build.0 = Debug|x64 + {D9549E75-45C1-5970-0EB5-F1CD7AE07BD8}.Release|32.ActiveCfg = Release|Win32 + {D9549E75-45C1-5970-0EB5-F1CD7AE07BD8}.Release|32.Build.0 = Release|Win32 + {D9549E75-45C1-5970-0EB5-F1CD7AE07BD8}.Release|64.ActiveCfg = Release|x64 + {D9549E75-45C1-5970-0EB5-F1CD7AE07BD8}.Release|64.Build.0 = Release|x64 + {8FF02841-7BEA-5193-6457-E8A350F0B7FF}.Debug|32.ActiveCfg = Debug|Win32 + {8FF02841-7BEA-5193-6457-E8A350F0B7FF}.Debug|32.Build.0 = Debug|Win32 + {8FF02841-7BEA-5193-6457-E8A350F0B7FF}.Debug|64.ActiveCfg = Debug|x64 + {8FF02841-7BEA-5193-6457-E8A350F0B7FF}.Debug|64.Build.0 = Debug|x64 + {8FF02841-7BEA-5193-6457-E8A350F0B7FF}.Release|32.ActiveCfg = Release|Win32 + {8FF02841-7BEA-5193-6457-E8A350F0B7FF}.Release|32.Build.0 = Release|Win32 + {8FF02841-7BEA-5193-6457-E8A350F0B7FF}.Release|64.ActiveCfg = Release|x64 + {8FF02841-7BEA-5193-6457-E8A350F0B7FF}.Release|64.Build.0 = Release|x64 + {91F02841-7DEA-5193-6657-E8A352F0B7FF}.Debug|32.ActiveCfg = Debug|Win32 + {91F02841-7DEA-5193-6657-E8A352F0B7FF}.Debug|32.Build.0 = Debug|Win32 + {91F02841-7DEA-5193-6657-E8A352F0B7FF}.Debug|64.ActiveCfg = Debug|x64 + {91F02841-7DEA-5193-6657-E8A352F0B7FF}.Debug|64.Build.0 = Debug|x64 + {91F02841-7DEA-5193-6657-E8A352F0B7FF}.Release|32.ActiveCfg = Release|Win32 + {91F02841-7DEA-5193-6657-E8A352F0B7FF}.Release|32.Build.0 = Release|Win32 + {91F02841-7DEA-5193-6657-E8A352F0B7FF}.Release|64.ActiveCfg = Release|x64 + {91F02841-7DEA-5193-6657-E8A352F0B7FF}.Release|64.Build.0 = Release|x64 + {CE91E21A-3A54-16A5-8304-A531EF05EF82}.Debug|32.ActiveCfg = Debug|Win32 + {CE91E21A-3A54-16A5-8304-A531EF05EF82}.Debug|32.Build.0 = Debug|Win32 + {CE91E21A-3A54-16A5-8304-A531EF05EF82}.Debug|64.ActiveCfg = Debug|x64 + {CE91E21A-3A54-16A5-8304-A531EF05EF82}.Debug|64.Build.0 = Debug|x64 + {CE91E21A-3A54-16A5-8304-A531EF05EF82}.Release|32.ActiveCfg = Release|Win32 + {CE91E21A-3A54-16A5-8304-A531EF05EF82}.Release|32.Build.0 = Release|Win32 + {CE91E21A-3A54-16A5-8304-A531EF05EF82}.Release|64.ActiveCfg = Release|x64 + {CE91E21A-3A54-16A5-8304-A531EF05EF82}.Release|64.Build.0 = Release|x64 + {D091E21A-3C54-16A5-8504-A531F105EF82}.Debug|32.ActiveCfg = Debug|Win32 + {D091E21A-3C54-16A5-8504-A531F105EF82}.Debug|32.Build.0 = Debug|Win32 + {D091E21A-3C54-16A5-8504-A531F105EF82}.Debug|64.ActiveCfg = Debug|x64 + {D091E21A-3C54-16A5-8504-A531F105EF82}.Debug|64.Build.0 = Debug|x64 + {D091E21A-3C54-16A5-8504-A531F105EF82}.Release|32.ActiveCfg = Release|Win32 + {D091E21A-3C54-16A5-8504-A531F105EF82}.Release|32.Build.0 = Release|Win32 + {D091E21A-3C54-16A5-8504-A531F105EF82}.Release|64.ActiveCfg = Release|x64 + {D091E21A-3C54-16A5-8504-A531F105EF82}.Release|64.Build.0 = Release|x64 + {AECBAED8-1AAB-2D74-23C3-B84A8F2194D5}.Debug|32.ActiveCfg = Debug|Win32 + {AECBAED8-1AAB-2D74-23C3-B84A8F2194D5}.Debug|32.Build.0 = Debug|Win32 + {AECBAED8-1AAB-2D74-23C3-B84A8F2194D5}.Debug|64.ActiveCfg = Debug|x64 + {AECBAED8-1AAB-2D74-23C3-B84A8F2194D5}.Debug|64.Build.0 = Debug|x64 + {AECBAED8-1AAB-2D74-23C3-B84A8F2194D5}.Release|32.ActiveCfg = Release|Win32 + {AECBAED8-1AAB-2D74-23C3-B84A8F2194D5}.Release|32.Build.0 = Release|Win32 + {AECBAED8-1AAB-2D74-23C3-B84A8F2194D5}.Release|64.ActiveCfg = Release|x64 + {AECBAED8-1AAB-2D74-23C3-B84A8F2194D5}.Release|64.Build.0 = Release|x64 + {AFCBAED8-1BAB-2D74-24C3-B84A902194D5}.Debug|32.ActiveCfg = Debug|Win32 + {AFCBAED8-1BAB-2D74-24C3-B84A902194D5}.Debug|32.Build.0 = Debug|Win32 + {AFCBAED8-1BAB-2D74-24C3-B84A902194D5}.Debug|64.ActiveCfg = Debug|x64 + {AFCBAED8-1BAB-2D74-24C3-B84A902194D5}.Debug|64.Build.0 = Debug|x64 + {AFCBAED8-1BAB-2D74-24C3-B84A902194D5}.Release|32.ActiveCfg = Release|Win32 + {AFCBAED8-1BAB-2D74-24C3-B84A902194D5}.Release|32.Build.0 = Release|Win32 + {AFCBAED8-1BAB-2D74-24C3-B84A902194D5}.Release|64.ActiveCfg = Release|x64 + {AFCBAED8-1BAB-2D74-24C3-B84A902194D5}.Release|64.Build.0 = Release|x64 + {B0CBAED8-1CAB-2D74-25C3-B84A912194D5}.Debug|32.ActiveCfg = Debug|Win32 + {B0CBAED8-1CAB-2D74-25C3-B84A912194D5}.Debug|32.Build.0 = Debug|Win32 + {B0CBAED8-1CAB-2D74-25C3-B84A912194D5}.Debug|64.ActiveCfg = Debug|x64 + {B0CBAED8-1CAB-2D74-25C3-B84A912194D5}.Debug|64.Build.0 = Debug|x64 + {B0CBAED8-1CAB-2D74-25C3-B84A912194D5}.Release|32.ActiveCfg = Release|Win32 + {B0CBAED8-1CAB-2D74-25C3-B84A912194D5}.Release|32.Build.0 = Release|Win32 + {B0CBAED8-1CAB-2D74-25C3-B84A912194D5}.Release|64.ActiveCfg = Release|x64 + {B0CBAED8-1CAB-2D74-25C3-B84A912194D5}.Release|64.Build.0 = Release|x64 + {38901DD9-A46F-9C74-AD87-274B19E602D6}.Debug|32.ActiveCfg = Debug|Win32 + {38901DD9-A46F-9C74-AD87-274B19E602D6}.Debug|32.Build.0 = Debug|Win32 + {38901DD9-A46F-9C74-AD87-274B19E602D6}.Debug|64.ActiveCfg = Debug|x64 + {38901DD9-A46F-9C74-AD87-274B19E602D6}.Debug|64.Build.0 = Debug|x64 + {38901DD9-A46F-9C74-AD87-274B19E602D6}.Release|32.ActiveCfg = Release|Win32 + {38901DD9-A46F-9C74-AD87-274B19E602D6}.Release|32.Build.0 = Release|Win32 + {38901DD9-A46F-9C74-AD87-274B19E602D6}.Release|64.ActiveCfg = Release|x64 + {38901DD9-A46F-9C74-AD87-274B19E602D6}.Release|64.Build.0 = Release|x64 + {39901DD9-A56F-9C74-AE87-274B1AE602D6}.Debug|32.ActiveCfg = Debug|Win32 + {39901DD9-A56F-9C74-AE87-274B1AE602D6}.Debug|32.Build.0 = Debug|Win32 + {39901DD9-A56F-9C74-AE87-274B1AE602D6}.Debug|64.ActiveCfg = Debug|x64 + {39901DD9-A56F-9C74-AE87-274B1AE602D6}.Debug|64.Build.0 = Debug|x64 + {39901DD9-A56F-9C74-AE87-274B1AE602D6}.Release|32.ActiveCfg = Release|Win32 + {39901DD9-A56F-9C74-AE87-274B1AE602D6}.Release|32.Build.0 = Release|Win32 + {39901DD9-A56F-9C74-AE87-274B1AE602D6}.Release|64.ActiveCfg = Release|x64 + {39901DD9-A56F-9C74-AE87-274B1AE602D6}.Release|64.Build.0 = Release|x64 + {3A901DD9-A66F-9C74-AF87-274B1BE602D6}.Debug|32.ActiveCfg = Debug|Win32 + {3A901DD9-A66F-9C74-AF87-274B1BE602D6}.Debug|32.Build.0 = Debug|Win32 + {3A901DD9-A66F-9C74-AF87-274B1BE602D6}.Debug|64.ActiveCfg = Debug|x64 + {3A901DD9-A66F-9C74-AF87-274B1BE602D6}.Debug|64.Build.0 = Debug|x64 + {3A901DD9-A66F-9C74-AF87-274B1BE602D6}.Release|32.ActiveCfg = Release|Win32 + {3A901DD9-A66F-9C74-AF87-274B1BE602D6}.Release|32.Build.0 = Release|Win32 + {3A901DD9-A66F-9C74-AF87-274B1BE602D6}.Release|64.ActiveCfg = Release|x64 + {3A901DD9-A66F-9C74-AF87-274B1BE602D6}.Release|64.Build.0 = Release|x64 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {E6C5599B-2C02-4BF5-A50C-61DE2CFD7A3F} + EndGlobalSection +EndGlobal diff --git a/projects/premake/temp-14.vcxproj b/projects/premake/temp-14.vcxproj index 83049be..b6447fd 100644 --- a/projects/premake/temp-14.vcxproj +++ b/projects/premake/temp-14.vcxproj @@ -1,36 +1,20 @@  - - debug 32 + + Debug Win32 - - debug 32 + + Debug x64 - - debug 64 + + Release Win32 - - debug 64 - x64 - - - release 32 - Win32 - - - release 32 - x64 - - - release 64 - Win32 - - - release 64 + + Release x64 @@ -41,39 +25,39 @@ temp-14 10.0 - + 10.0.22621.0 - + 10.0.22621.0 - + 10.0.22621.0 - + 10.0.22621.0 - + Application true Unicode v140 - + Application true Unicode v140 - + Application false Unicode v140 true - + Application false Unicode @@ -83,48 +67,48 @@ - + - + - + - + - + true - ..\..\binaries-$(PlatformArchitecture)\ - $(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\32\debug\temp-14\ + ..\..\binaries\ + $(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\x86\Debug\temp-14\ $(ProjectName)-$(Configuration)-$(PlatformArchitecture) .exe - + true - ..\..\binaries-$(PlatformArchitecture)\ - $(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\64\debug\temp-14\ + ..\..\binaries\ + $(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\x64\Debug\temp-14\ $(ProjectName)-$(Configuration)-$(PlatformArchitecture) .exe - + false - ..\..\binaries-$(PlatformArchitecture)\ - $(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\32\release\temp-14\ + ..\..\binaries\ + $(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\x86\Release\temp-14\ $(ProjectName)-$(Configuration)-$(PlatformArchitecture) .exe - + false - ..\..\binaries-$(PlatformArchitecture)\ - $(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\64\release\temp-14\ + ..\..\binaries\ + $(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\x64\Release\temp-14\ $(ProjectName)-$(Configuration)-$(PlatformArchitecture) .exe - + NotUsing Level4 @@ -141,7 +125,7 @@ true - + NotUsing Level4 @@ -158,7 +142,7 @@ true - + NotUsing Level4 @@ -179,7 +163,7 @@ true - + NotUsing Level4 @@ -201,69 +185,10 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + diff --git a/projects/premake/temp-15.vcxproj b/projects/premake/temp-15.vcxproj index ef4c29f..0988d0a 100644 --- a/projects/premake/temp-15.vcxproj +++ b/projects/premake/temp-15.vcxproj @@ -1,36 +1,20 @@  - - debug 32 + + Debug Win32 - - debug 32 + + Debug x64 - - debug 64 + + Release Win32 - - debug 64 - x64 - - - release 32 - Win32 - - - release 32 - x64 - - - release 64 - Win32 - - - release 64 + + Release x64 @@ -41,39 +25,39 @@ temp-15 10.0 - + 10.0.22621.0 - + 10.0.22621.0 - + 10.0.22621.0 - + 10.0.22621.0 - + Application true Unicode v141 - + Application true Unicode v141 - + Application false Unicode v141 true - + Application false Unicode @@ -83,48 +67,48 @@ - + - + - + - + - + true - ..\..\binaries-$(PlatformArchitecture)\ - $(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\32\debug\temp-15\ + ..\..\binaries\ + $(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\x86\Debug\temp-15\ $(ProjectName)-$(Configuration)-$(PlatformArchitecture) .exe - + true - ..\..\binaries-$(PlatformArchitecture)\ - $(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\64\debug\temp-15\ + ..\..\binaries\ + $(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\x64\Debug\temp-15\ $(ProjectName)-$(Configuration)-$(PlatformArchitecture) .exe - + false - ..\..\binaries-$(PlatformArchitecture)\ - $(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\32\release\temp-15\ + ..\..\binaries\ + $(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\x86\Release\temp-15\ $(ProjectName)-$(Configuration)-$(PlatformArchitecture) .exe - + false - ..\..\binaries-$(PlatformArchitecture)\ - $(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\64\release\temp-15\ + ..\..\binaries\ + $(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\x64\Release\temp-15\ $(ProjectName)-$(Configuration)-$(PlatformArchitecture) .exe - + NotUsing Level4 @@ -142,7 +126,7 @@ true - + NotUsing Level4 @@ -160,7 +144,7 @@ true - + NotUsing Level4 @@ -182,7 +166,7 @@ true - + NotUsing Level4 @@ -205,69 +189,10 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + diff --git a/projects/premake/temp-16.vcxproj b/projects/premake/temp-16.vcxproj index d978221..05ec566 100644 --- a/projects/premake/temp-16.vcxproj +++ b/projects/premake/temp-16.vcxproj @@ -1,36 +1,20 @@  - - debug 32 + + Debug Win32 - - debug 32 + + Debug x64 - - debug 64 + + Release Win32 - - debug 64 - x64 - - - release 32 - Win32 - - - release 32 - x64 - - - release 64 - Win32 - - - release 64 + + Release x64 @@ -42,26 +26,26 @@ 10.0 - + Application true Unicode v142 - + Application true Unicode v142 - + Application false Unicode v142 true - + Application false Unicode @@ -71,48 +55,48 @@ - + - + - + - + - + true - ..\..\binaries-$(PlatformArchitecture)\ - $(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\32\debug\temp-16\ + ..\..\binaries\ + $(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\x86\Debug\temp-16\ $(ProjectName)-$(Configuration)-$(PlatformArchitecture) .exe - + true - ..\..\binaries-$(PlatformArchitecture)\ - $(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\64\debug\temp-16\ + ..\..\binaries\ + $(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\x64\Debug\temp-16\ $(ProjectName)-$(Configuration)-$(PlatformArchitecture) .exe - + false - ..\..\binaries-$(PlatformArchitecture)\ - $(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\32\release\temp-16\ + ..\..\binaries\ + $(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\x86\Release\temp-16\ $(ProjectName)-$(Configuration)-$(PlatformArchitecture) .exe - + false - ..\..\binaries-$(PlatformArchitecture)\ - $(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\64\release\temp-16\ + ..\..\binaries\ + $(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\x64\Release\temp-16\ $(ProjectName)-$(Configuration)-$(PlatformArchitecture) .exe - + NotUsing Level4 @@ -130,7 +114,7 @@ true - + NotUsing Level4 @@ -148,7 +132,7 @@ true - + NotUsing Level4 @@ -170,7 +154,7 @@ true - + NotUsing Level4 @@ -193,69 +177,10 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + diff --git a/projects/premake/temp-17.vcxproj b/projects/premake/temp-17.vcxproj index 892ba0d..1af8b96 100644 --- a/projects/premake/temp-17.vcxproj +++ b/projects/premake/temp-17.vcxproj @@ -1,36 +1,20 @@  - - debug 32 + + Debug Win32 - - debug 32 + + Debug x64 - - debug 64 + + Release Win32 - - debug 64 - x64 - - - release 32 - Win32 - - - release 32 - x64 - - - release 64 - Win32 - - - release 64 + + Release x64 @@ -42,26 +26,26 @@ 10.0 - + Application true Unicode v143 - + Application true Unicode v143 - + Application false Unicode v143 true - + Application false Unicode @@ -71,48 +55,48 @@ - + - + - + - + - + true - ..\..\binaries-$(PlatformArchitecture)\ - $(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\32\debug\temp-17\ + ..\..\binaries\ + $(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\x86\Debug\temp-17\ $(ProjectName)-$(Configuration)-$(PlatformArchitecture) .exe - + true - ..\..\binaries-$(PlatformArchitecture)\ - $(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\64\debug\temp-17\ + ..\..\binaries\ + $(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\x64\Debug\temp-17\ $(ProjectName)-$(Configuration)-$(PlatformArchitecture) .exe - + false - ..\..\binaries-$(PlatformArchitecture)\ - $(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\32\release\temp-17\ + ..\..\binaries\ + $(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\x86\Release\temp-17\ $(ProjectName)-$(Configuration)-$(PlatformArchitecture) .exe - + false - ..\..\binaries-$(PlatformArchitecture)\ - $(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\64\release\temp-17\ + ..\..\binaries\ + $(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\x64\Release\temp-17\ $(ProjectName)-$(Configuration)-$(PlatformArchitecture) .exe - + NotUsing Level4 @@ -131,7 +115,7 @@ true - + NotUsing Level4 @@ -150,7 +134,7 @@ true - + NotUsing Level4 @@ -173,7 +157,7 @@ true - + NotUsing Level4 @@ -197,69 +181,10 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + diff --git a/projects/premake/temp-clang.vcxproj b/projects/premake/temp-clang.vcxproj index a24e787..381cc95 100644 --- a/projects/premake/temp-clang.vcxproj +++ b/projects/premake/temp-clang.vcxproj @@ -1,36 +1,20 @@  - - debug 32 + + Debug Win32 - - debug 32 + + Debug x64 - - debug 64 + + Release Win32 - - debug 64 - x64 - - - release 32 - Win32 - - - release 32 - x64 - - - release 64 - Win32 - - - release 64 + + Release x64 @@ -42,26 +26,26 @@ 10.0 - + Application true Unicode clangcl - + Application true Unicode clangcl - + Application false Unicode clangcl true - + Application false Unicode @@ -71,48 +55,48 @@ - + - + - + - + - + true - ..\..\binaries-$(PlatformArchitecture)\ - $(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\32\debug\temp-clang\ + ..\..\binaries\ + $(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\x86\Debug\temp-clang\ $(ProjectName)-$(Configuration)-$(PlatformArchitecture) .exe - + true - ..\..\binaries-$(PlatformArchitecture)\ - $(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\64\debug\temp-clang\ + ..\..\binaries\ + $(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\x64\Debug\temp-clang\ $(ProjectName)-$(Configuration)-$(PlatformArchitecture) .exe - + false - ..\..\binaries-$(PlatformArchitecture)\ - $(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\32\release\temp-clang\ + ..\..\binaries\ + $(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\x86\Release\temp-clang\ $(ProjectName)-$(Configuration)-$(PlatformArchitecture) .exe - + false - ..\..\binaries-$(PlatformArchitecture)\ - $(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\64\release\temp-clang\ + ..\..\binaries\ + $(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\x64\Release\temp-clang\ $(ProjectName)-$(Configuration)-$(PlatformArchitecture) .exe - + NotUsing Level4 @@ -132,7 +116,7 @@ /INCREMENTAL:NO %(AdditionalOptions) - + NotUsing Level4 @@ -152,7 +136,7 @@ /INCREMENTAL:NO %(AdditionalOptions) - + NotUsing Level4 @@ -176,7 +160,7 @@ /INCREMENTAL:NO %(AdditionalOptions) - + NotUsing Level4 @@ -201,69 +185,10 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + diff --git a/projects/premake/test-14.vcxproj b/projects/premake/test-14.vcxproj index 735def2..86c8460 100644 --- a/projects/premake/test-14.vcxproj +++ b/projects/premake/test-14.vcxproj @@ -1,36 +1,20 @@  - - debug 32 + + Debug Win32 - - debug 32 + + Debug x64 - - debug 64 + + Release Win32 - - debug 64 - x64 - - - release 32 - Win32 - - - release 32 - x64 - - - release 64 - Win32 - - - release 64 + + Release x64 @@ -41,39 +25,39 @@ test-14 10.0 - + 10.0.22621.0 - + 10.0.22621.0 - + 10.0.22621.0 - + 10.0.22621.0 - + Application true Unicode v140 - + Application true Unicode v140 - + Application false Unicode v140 true - + Application false Unicode @@ -83,48 +67,48 @@ - + - + - + - + - + true - ..\..\binaries-$(PlatformArchitecture)\ - $(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\32\debug\test-14\ + ..\..\binaries\ + $(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\x86\Debug\test-14\ $(ProjectName)-$(Configuration)-$(PlatformArchitecture) .exe - + true - ..\..\binaries-$(PlatformArchitecture)\ - $(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\64\debug\test-14\ + ..\..\binaries\ + $(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\x64\Debug\test-14\ $(ProjectName)-$(Configuration)-$(PlatformArchitecture) .exe - + false - ..\..\binaries-$(PlatformArchitecture)\ - $(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\32\release\test-14\ + ..\..\binaries\ + $(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\x86\Release\test-14\ $(ProjectName)-$(Configuration)-$(PlatformArchitecture) .exe - + false - ..\..\binaries-$(PlatformArchitecture)\ - $(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\64\release\test-14\ + ..\..\binaries\ + $(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\x64\Release\test-14\ $(ProjectName)-$(Configuration)-$(PlatformArchitecture) .exe - + NotUsing Level4 @@ -141,7 +125,7 @@ true - + NotUsing Level4 @@ -158,7 +142,7 @@ true - + NotUsing Level4 @@ -179,7 +163,7 @@ true - + NotUsing Level4 diff --git a/projects/premake/test-15.vcxproj b/projects/premake/test-15.vcxproj index ea51789..f1223fc 100644 --- a/projects/premake/test-15.vcxproj +++ b/projects/premake/test-15.vcxproj @@ -1,36 +1,20 @@  - - debug 32 + + Debug Win32 - - debug 32 + + Debug x64 - - debug 64 + + Release Win32 - - debug 64 - x64 - - - release 32 - Win32 - - - release 32 - x64 - - - release 64 - Win32 - - - release 64 + + Release x64 @@ -41,39 +25,39 @@ test-15 10.0 - + 10.0.22621.0 - + 10.0.22621.0 - + 10.0.22621.0 - + 10.0.22621.0 - + Application true Unicode v141 - + Application true Unicode v141 - + Application false Unicode v141 true - + Application false Unicode @@ -83,48 +67,48 @@ - + - + - + - + - + true - ..\..\binaries-$(PlatformArchitecture)\ - $(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\32\debug\test-15\ + ..\..\binaries\ + $(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\x86\Debug\test-15\ $(ProjectName)-$(Configuration)-$(PlatformArchitecture) .exe - + true - ..\..\binaries-$(PlatformArchitecture)\ - $(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\64\debug\test-15\ + ..\..\binaries\ + $(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\x64\Debug\test-15\ $(ProjectName)-$(Configuration)-$(PlatformArchitecture) .exe - + false - ..\..\binaries-$(PlatformArchitecture)\ - $(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\32\release\test-15\ + ..\..\binaries\ + $(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\x86\Release\test-15\ $(ProjectName)-$(Configuration)-$(PlatformArchitecture) .exe - + false - ..\..\binaries-$(PlatformArchitecture)\ - $(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\64\release\test-15\ + ..\..\binaries\ + $(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\x64\Release\test-15\ $(ProjectName)-$(Configuration)-$(PlatformArchitecture) .exe - + NotUsing Level4 @@ -142,7 +126,7 @@ true - + NotUsing Level4 @@ -160,7 +144,7 @@ true - + NotUsing Level4 @@ -182,7 +166,7 @@ true - + NotUsing Level4 diff --git a/projects/premake/test-16.vcxproj b/projects/premake/test-16.vcxproj index 7e42ebd..cd50e0e 100644 --- a/projects/premake/test-16.vcxproj +++ b/projects/premake/test-16.vcxproj @@ -1,36 +1,20 @@  - - debug 32 + + Debug Win32 - - debug 32 + + Debug x64 - - debug 64 + + Release Win32 - - debug 64 - x64 - - - release 32 - Win32 - - - release 32 - x64 - - - release 64 - Win32 - - - release 64 + + Release x64 @@ -42,26 +26,26 @@ 10.0 - + Application true Unicode v142 - + Application true Unicode v142 - + Application false Unicode v142 true - + Application false Unicode @@ -71,48 +55,48 @@ - + - + - + - + - + true - ..\..\binaries-$(PlatformArchitecture)\ - $(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\32\debug\test-16\ + ..\..\binaries\ + $(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\x86\Debug\test-16\ $(ProjectName)-$(Configuration)-$(PlatformArchitecture) .exe - + true - ..\..\binaries-$(PlatformArchitecture)\ - $(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\64\debug\test-16\ + ..\..\binaries\ + $(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\x64\Debug\test-16\ $(ProjectName)-$(Configuration)-$(PlatformArchitecture) .exe - + false - ..\..\binaries-$(PlatformArchitecture)\ - $(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\32\release\test-16\ + ..\..\binaries\ + $(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\x86\Release\test-16\ $(ProjectName)-$(Configuration)-$(PlatformArchitecture) .exe - + false - ..\..\binaries-$(PlatformArchitecture)\ - $(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\64\release\test-16\ + ..\..\binaries\ + $(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\x64\Release\test-16\ $(ProjectName)-$(Configuration)-$(PlatformArchitecture) .exe - + NotUsing Level4 @@ -130,7 +114,7 @@ true - + NotUsing Level4 @@ -148,7 +132,7 @@ true - + NotUsing Level4 @@ -170,7 +154,7 @@ true - + NotUsing Level4 diff --git a/projects/premake/test-17.vcxproj b/projects/premake/test-17.vcxproj index 2d372ae..9b8427e 100644 --- a/projects/premake/test-17.vcxproj +++ b/projects/premake/test-17.vcxproj @@ -1,36 +1,20 @@  - - debug 32 + + Debug Win32 - - debug 32 + + Debug x64 - - debug 64 + + Release Win32 - - debug 64 - x64 - - - release 32 - Win32 - - - release 32 - x64 - - - release 64 - Win32 - - - release 64 + + Release x64 @@ -42,26 +26,26 @@ 10.0 - + Application true Unicode v143 - + Application true Unicode v143 - + Application false Unicode v143 true - + Application false Unicode @@ -71,48 +55,48 @@ - + - + - + - + - + true - ..\..\binaries-$(PlatformArchitecture)\ - $(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\32\debug\test-17\ + ..\..\binaries\ + $(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\x86\Debug\test-17\ $(ProjectName)-$(Configuration)-$(PlatformArchitecture) .exe - + true - ..\..\binaries-$(PlatformArchitecture)\ - $(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\64\debug\test-17\ + ..\..\binaries\ + $(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\x64\Debug\test-17\ $(ProjectName)-$(Configuration)-$(PlatformArchitecture) .exe - + false - ..\..\binaries-$(PlatformArchitecture)\ - $(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\32\release\test-17\ + ..\..\binaries\ + $(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\x86\Release\test-17\ $(ProjectName)-$(Configuration)-$(PlatformArchitecture) .exe - + false - ..\..\binaries-$(PlatformArchitecture)\ - $(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\64\release\test-17\ + ..\..\binaries\ + $(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\x64\Release\test-17\ $(ProjectName)-$(Configuration)-$(PlatformArchitecture) .exe - + NotUsing Level4 @@ -131,7 +115,7 @@ true - + NotUsing Level4 @@ -150,7 +134,7 @@ true - + NotUsing Level4 @@ -173,7 +157,7 @@ true - + NotUsing Level4 diff --git a/projects/premake/test-clang.vcxproj b/projects/premake/test-clang.vcxproj index 5802019..85eaa2c 100644 --- a/projects/premake/test-clang.vcxproj +++ b/projects/premake/test-clang.vcxproj @@ -1,36 +1,20 @@  - - debug 32 + + Debug Win32 - - debug 32 + + Debug x64 - - debug 64 + + Release Win32 - - debug 64 - x64 - - - release 32 - Win32 - - - release 32 - x64 - - - release 64 - Win32 - - - release 64 + + Release x64 @@ -42,26 +26,26 @@ 10.0 - + Application true Unicode clangcl - + Application true Unicode clangcl - + Application false Unicode clangcl true - + Application false Unicode @@ -71,48 +55,48 @@ - + - + - + - + - + true - ..\..\binaries-$(PlatformArchitecture)\ - $(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\32\debug\test-clang\ + ..\..\binaries\ + $(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\x86\Debug\test-clang\ $(ProjectName)-$(Configuration)-$(PlatformArchitecture) .exe - + true - ..\..\binaries-$(PlatformArchitecture)\ - $(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\64\debug\test-clang\ + ..\..\binaries\ + $(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\x64\Debug\test-clang\ $(ProjectName)-$(Configuration)-$(PlatformArchitecture) .exe - + false - ..\..\binaries-$(PlatformArchitecture)\ - $(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\32\release\test-clang\ + ..\..\binaries\ + $(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\x86\Release\test-clang\ $(ProjectName)-$(Configuration)-$(PlatformArchitecture) .exe - + false - ..\..\binaries-$(PlatformArchitecture)\ - $(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\64\release\test-clang\ + ..\..\binaries\ + $(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\x64\Release\test-clang\ $(ProjectName)-$(Configuration)-$(PlatformArchitecture) .exe - + NotUsing Level4 @@ -132,7 +116,7 @@ /INCREMENTAL:NO %(AdditionalOptions) - + NotUsing Level4 @@ -152,7 +136,7 @@ /INCREMENTAL:NO %(AdditionalOptions) - + NotUsing Level4 @@ -176,7 +160,7 @@ /INCREMENTAL:NO %(AdditionalOptions) - + NotUsing Level4 diff --git a/test/test_access.cpp b/test/test_access.cpp index 05d4149..1151cec 100644 --- a/test/test_access.cpp +++ b/test/test_access.cpp @@ -1,4 +1,4 @@ -// FFSM2 (hierarchical state machine for games and interactive applications) +// FFSM2 (flat state machine for games and interactive applications) // Created by Andrew Gresyk #define FFSM2_ENABLE_VERBOSE_DEBUG_LOG diff --git a/test/test_ancestors.cpp b/test/test_ancestors.cpp index 4755666..2b6cb2d 100644 --- a/test/test_ancestors.cpp +++ b/test/test_ancestors.cpp @@ -32,12 +32,12 @@ struct Event { }; Event(const ffsm2::StateID origin_, - const Type type_) noexcept + const Type type_) : origin{origin_} , type{type_} {} - Event(const Type type_ = Type::COUNT) noexcept + Event(const Type type_ = Type::COUNT) : type{type_} {} @@ -51,7 +51,7 @@ using Events = std::vector; void assertSequence(Events& history, - const Events& reference) noexcept + const Events& reference) { const auto count = std::max(history.size(), reference.size()); diff --git a/test/test_replication.cpp b/test/test_replication.cpp index 52d2b9f..2afa505 100644 --- a/test/test_replication.cpp +++ b/test/test_replication.cpp @@ -1,4 +1,4 @@ -// FFSM2 (hierarchical state machine for games and interactive applications) +// FFSM2 (flat state machine for games and interactive applications) // Created by Andrew Gresyk #define FFSM2_ENABLE_TRANSITION_HISTORY diff --git a/test/tools.hpp b/test/tools.hpp index 9364c1d..8f9c416 100644 --- a/test/tools.hpp +++ b/test/tools.hpp @@ -50,14 +50,14 @@ struct Event final { Event(const ffsm2::StateID origin_, const Type type_, - const ffsm2::StateID target_ = ffsm2::INVALID_STATE_ID) noexcept + const ffsm2::StateID target_ = ffsm2::INVALID_STATE_ID) : origin{origin_} , type{type_} , target{target_} {} Event(const Type type_, - const ffsm2::StateID target_) noexcept + const ffsm2::StateID target_) : origin{ffsm2::INVALID_STATE_ID} , type{type_} , target{target_} @@ -88,27 +88,27 @@ struct LoggerT final void recordMethod(const Context& context, const StateID origin, - const Method method) noexcept override; + const Method method) override; void recordTransition(const Context& context, const StateID origin, - const StateID target) noexcept override; + const StateID target) override; #if FFSM2_PLANS_AVAILABLE() void recordTaskStatus(const Context& context, const StateID origin, - const StatusEvent event) noexcept override; + const StatusEvent event) override; void recordPlanStatus(const Context& context, - const StatusEvent event) noexcept override; + const StatusEvent event) override; #endif void recordCancelledPending(const Context& context, - const StateID origin) noexcept override; + const StateID origin) override; - void assertSequence(const Events& reference) noexcept; + void assertSequence(const Events& reference); Events history; }; diff --git a/test/tools.inl b/test/tools.inl index 811c08e..8da2243 100644 --- a/test/tools.inl +++ b/test/tools.inl @@ -7,7 +7,7 @@ template void LoggerT::recordMethod(const Context& /*context*/, const StateID origin, - const Method method) noexcept + const Method method) { REQUIRE(ffsm2::methodName(method)); @@ -80,7 +80,7 @@ template void LoggerT::recordTransition(const Context& /*context*/, const StateID origin, - const StateID target) noexcept + const StateID target) { history.emplace_back(origin, Event::Type::CHANGE, target); } @@ -93,7 +93,7 @@ template void LoggerT::recordTaskStatus(const Context& /*context*/, const StateID origin, - const StatusEvent event) noexcept + const StatusEvent event) { switch (event) { case StatusEvent::SUCCEEDED: @@ -114,7 +114,7 @@ LoggerT::recordTaskStatus(const Context& /*context*/, template void LoggerT::recordPlanStatus(const Context& /*context*/, - const StatusEvent event) noexcept + const StatusEvent event) { switch (event) { case StatusEvent::SUCCEEDED: @@ -138,7 +138,7 @@ LoggerT::recordPlanStatus(const Context& /*context*/, template void LoggerT::recordCancelledPending(const Context& /*context*/, - const StateID origin) noexcept + const StateID origin) { history.emplace_back(origin, Event::Type::CANCEL_PENDING); } @@ -147,7 +147,7 @@ LoggerT::recordCancelledPending(const Context& /*context*/, template void -LoggerT::assertSequence(const Events& reference) noexcept { +LoggerT::assertSequence(const Events& reference) { const auto count = std::max(history.size(), reference.size()); for (unsigned i = 0; i < count; ++i) { diff --git a/test/wiki_class_member.cpp b/test/wiki_class_member.cpp index 616db7a..9d40f84 100644 --- a/test/wiki_class_member.cpp +++ b/test/wiki_class_member.cpp @@ -7,10 +7,13 @@ #include +//////////////////////////////////////////////////////////////////////////////// namespace actor_fsm { +//------------------------------------------------------------------------------ + using Config = ffsm2::Config - ::ContextT; + ::ContextT; using M = ffsm2::MachineT; @@ -21,23 +24,51 @@ using FSM = M::PeerRoot< >; #undef S -struct Off : FSM::State { /* .. */ }; -struct On : FSM::State { /* .. */ }; +struct Off : FSM::State {}; +struct On : FSM::State {}; FSM::Instance& -fsm(Actor::FsmHost& fsmHost) { - return *reinterpret_cast(&fsmHost); -} +fsm( Actor::FsmHost& fsmHost) { return *reinterpret_cast< FSM::Instance*>(&fsmHost); } + +const FSM::Instance& +fsm(const Actor::FsmHost& fsmHost) { return *reinterpret_cast(&fsmHost); } + +//------------------------------------------------------------------------------ } Actor::Actor() { - //ffsm2::StaticPrintConstT dummy; - static_assert(sizeof(actor_fsm::FSM::Instance) <= sizeof(FsmHost), ""); + //ffsm2::StaticPrintConstT alignment; + static_assert(alignof(actor_fsm::FSM::Instance) <= alignof(FsmHost), + "Uncomment the line above to find out the alignment of the `FsmHost` needed"); - new (&_fsmHost) actor_fsm::FSM::Instance{_context}; + //ffsm2::StaticPrintConstT size; + static_assert(sizeof(actor_fsm::FSM::Instance) <= sizeof(FsmHost), + "Uncomment the line above to find out the size of the `FsmHost` needed"); + + new (&_fsmHost) actor_fsm::FSM::Instance{*this}; } Actor::~Actor() { - actor_fsm::fsm(_fsmHost).~InstanceT(); + ffsm2::destroy(actor_fsm::fsm(_fsmHost)); +} + +void Actor::turnOn() { + actor_fsm::fsm(_fsmHost).immediateChangeTo(); } + +bool Actor::isOn() const { + return actor_fsm::fsm(_fsmHost).isActive(); +} + +//////////////////////////////////////////////////////////////////////////////// + +TEST_CASE("Wiki.Class Member") { + Actor actor; + REQUIRE(actor.isOn() == false); + + actor.turnOn(); + REQUIRE(actor.isOn() == true); +} + +//////////////////////////////////////////////////////////////////////////////// diff --git a/test/wiki_class_member.hpp b/test/wiki_class_member.hpp index 4378e71..9f48534 100644 --- a/test/wiki_class_member.hpp +++ b/test/wiki_class_member.hpp @@ -3,17 +3,26 @@ #pragma once +#include // max_align_t + +//////////////////////////////////////////////////////////////////////////////// + class Actor { public: - using FsmHost = char[32]; // the size is hand-adjusted - - struct Context { /* .. */ }; + struct alignas(std::max_align_t) FsmHost { + char buffer[104]; // the size is hand-adjusted + }; public: Actor(); ~Actor(); + void turnOn(); + + bool isOn() const; + private: - Context _context; FsmHost _fsmHost; }; + +////////////////////////////////////////////////////////////////////////////////