From 37fff897776d893af89d8904f3bc473e22b21419 Mon Sep 17 00:00:00 2001 From: Xavier Leclercq Date: Sat, 25 Oct 2025 20:57:03 +0100 Subject: [PATCH 1/3] Update build files --- .circleci/config.yml | 22 +-- .../bakefile/IshikoSynchronization.bkl | 6 +- build-files/gnumake/GNUmakefile | 2 +- build-files/vc14/IshikoSynchronization.sln | 28 --- .../vc14/IshikoSynchronization.vcxproj | 162 ----------------- .../IshikoSynchronization.vcxproj.filters | 32 ---- .../vc15/IshikoSynchronization.vcxproj | 4 + .../vc16/IshikoSynchronization.vcxproj | 4 + .../vc17/IshikoSynchronization.vcxproj | 4 + .../bakefile/IshikoSynchronizationTests.bkl | 10 +- tests/build-files/gnumake/GNUmakefile | 10 +- .../vc14/IshikoSynchronizationTests.sln | 28 --- .../vc14/IshikoSynchronizationTests.vcxproj | 164 ------------------ ...IshikoSynchronizationTests.vcxproj.filters | 24 --- .../vc15/IshikoSynchronizationTests.vcxproj | 20 ++- .../vc16/IshikoSynchronizationTests.vcxproj | 20 ++- .../vc17/IshikoSynchronizationTests.vcxproj | 20 ++- 17 files changed, 75 insertions(+), 485 deletions(-) delete mode 100644 build-files/vc14/IshikoSynchronization.sln delete mode 100644 build-files/vc14/IshikoSynchronization.vcxproj delete mode 100644 build-files/vc14/IshikoSynchronization.vcxproj.filters delete mode 100644 tests/build-files/vc14/IshikoSynchronizationTests.sln delete mode 100644 tests/build-files/vc14/IshikoSynchronizationTests.vcxproj delete mode 100644 tests/build-files/vc14/IshikoSynchronizationTests.vcxproj.filters diff --git a/.circleci/config.yml b/.circleci/config.yml index 8a3b0f8..9459d24 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -17,43 +17,43 @@ jobs: command: cd /workspace/projects/ishiko/cpp && git clone https://github.com/ishiko-cpp/base-platform.git && cd base-platform/build-files/gnumake && make - run: name: "Install test dependency: Ishiko/C++ Errors" - command: cd /workspace/projects/ishiko/cpp && git clone https://github.com/ishiko-cpp/errors.git && cd errors/build/gnumake && make + command: cd /workspace/projects/ishiko/cpp && git clone https://github.com/ishiko-cpp/errors.git && cd errors/build-files/gnumake && make - run: name: "Install test dependency: Ishiko/C++ Memory" - command: cd /workspace/projects/ishiko/cpp && git clone https://github.com/ishiko-cpp/memory.git && cd memory/build/gnumake && make + command: cd /workspace/projects/ishiko/cpp && git clone https://github.com/ishiko-cpp/memory.git && cd memory/build-files/gnumake && make - run: name: "Install test dependency: Ishiko/C++ Types" command: cd /workspace/projects/ishiko/cpp && git clone https://github.com/ishiko-cpp/types.git && cd types/build-files/gnumake && make - run: name: "Install test dependency: Ishiko/C++ Collections" - command: cd /workspace/projects/ishiko/cpp && git clone https://github.com/ishiko-cpp/collections.git && cd collections/build/gnumake && make + command: cd /workspace/projects/ishiko/cpp && git clone https://github.com/ishiko-cpp/collections.git && cd collections/build-files/gnumake && make - run: name: "Install test dependency: Ishiko/C++ Text" - command: cd /workspace/projects/ishiko/cpp && git clone https://github.com/ishiko-cpp/text.git && cd text/build/gnumake && make + command: cd /workspace/projects/ishiko/cpp && git clone https://github.com/ishiko-cpp/text.git && cd text/build-files/gnumake && make - run: name: "Install test dependency: Ishiko/C++ Time" - command: cd /workspace/projects/ishiko/cpp && git clone https://github.com/ishiko-cpp/time.git && cd time/build/gnumake && make + command: cd /workspace/projects/ishiko/cpp && git clone https://github.com/ishiko-cpp/time.git && cd time/build-files/gnumake && make - run: name: "Install test dependency: Ishiko/C++ Process" - command: cd /workspace/projects/ishiko/cpp && git clone https://github.com/ishiko-cpp/process.git && cd process/build/gnumake && make + command: cd /workspace/projects/ishiko/cpp && git clone https://github.com/ishiko-cpp/process.git && cd process/build-files/gnumake && make - run: name: "Install test dependency: Ishiko/C++ IO" - command: cd /workspace/projects/ishiko/cpp && git clone https://github.com/ishiko-cpp/io.git && cd io/build/gnumake && make + command: cd /workspace/projects/ishiko/cpp && git clone https://github.com/ishiko-cpp/io.git && cd io/build-files/gnumake && make - run: name: "Install test dependency: Ishiko/C++ FileSystem" - command: cd /workspace/projects/ishiko/cpp && git clone https://github.com/ishiko-cpp/filesystem.git && cd filesystem/build/gnumake && make + command: cd /workspace/projects/ishiko/cpp && git clone https://github.com/ishiko-cpp/filesystem.git && cd filesystem/build-files/gnumake && make - run: name: "Install test dependency: Ishiko/C++ XML" - command: cd /workspace/projects/ishiko/cpp && git clone https://github.com/ishiko-cpp/xml.git && cd xml/build/gnumake && make + command: cd /workspace/projects/ishiko/cpp && git clone https://github.com/ishiko-cpp/xml.git && cd xml/build-files/gnumake && make - run: name: "Install test dependency: Ishiko/C++ Diff" - command: cd /workspace/projects/ishiko/cpp && git clone https://github.com/ishiko-cpp/diff.git && cd diff/build/gnumake && make + command: cd /workspace/projects/ishiko/cpp && git clone https://github.com/ishiko-cpp/diff.git && cd diff/build-files/gnumake && make - run: name: "Install test dependency: Ishiko/C++ Configuration" command: cd /workspace/projects/ishiko/cpp && git clone https://github.com/ishiko-cpp/configuration.git && cd configuration/build-files/gnumake && make - run: name: "Install test dependency: Ishiko/C++ TestFramework/Core" - command: cd /workspace/projects/ishiko/cpp && git clone https://github.com/ishiko-cpp/test-framework.git && cd test-framework/core/build/gnumake && make + command: cd /workspace/projects/ishiko/cpp && git clone https://github.com/ishiko-cpp/test-framework.git && cd test-framework/core/build-files/gnumake && make - run: name: Test build command: cd /workspace/projects/ishiko/cpp/synchronization/tests/build-files/gnumake && make diff --git a/build-files/bakefile/IshikoSynchronization.bkl b/build-files/bakefile/IshikoSynchronization.bkl index 79ab2cd..73ccb3b 100644 --- a/build-files/bakefile/IshikoSynchronization.bkl +++ b/build-files/bakefile/IshikoSynchronization.bkl @@ -1,10 +1,9 @@ -toolsets = gnu vs2022 vs2019 vs2017 vs2015; +toolsets = gnu vs2022 vs2019 vs2017; gnu.makefile = ../gnumake/GNUmakefile; vs2022.solutionfile = ../vc17/IshikoSynchronization.sln; vs2019.solutionfile = ../vc16/IshikoSynchronization.sln; vs2017.solutionfile = ../vc15/IshikoSynchronization.sln; -vs2015.solutionfile = ../vc14/IshikoSynchronization.sln; library IshikoSynchronization { @@ -14,12 +13,13 @@ library IshikoSynchronization if ($(toolset) == gnu) { - cxx-compiler-options = "-std=c++11"; + cxx-compiler-options = "-std=c++14"; outputdir = ../../lib; } if ($(toolset) != gnu) { + cxx-compiler-options = "/utf-8"; outputdir = ../../lib/$(arch); } diff --git a/build-files/gnumake/GNUmakefile b/build-files/gnumake/GNUmakefile index 7991b04..2ede399 100644 --- a/build-files/gnumake/GNUmakefile +++ b/build-files/gnumake/GNUmakefile @@ -61,7 +61,7 @@ all: ../bakefile/../../lib/lib$(if $(call _equal,$(config),Debug),IshikoSynchron $(RANLIB) $@ $(_builddir)IshikoSynchronization_Spinlock.o: ../../src/Spinlock.cpp - $(CXX) -c -o $@ $(CPPFLAGS) $(CXXFLAGS) -MD -MP -fPIC -DPIC -pthread -I../../include/Ishiko/Synchronization -std=c++11 ../../src/Spinlock.cpp + $(CXX) -c -o $@ $(CPPFLAGS) $(CXXFLAGS) -MD -MP -fPIC -DPIC -pthread -I../../include/Ishiko/Synchronization -std=c++14 ../../src/Spinlock.cpp clean: rm -f $(_builddir)*.o diff --git a/build-files/vc14/IshikoSynchronization.sln b/build-files/vc14/IshikoSynchronization.sln deleted file mode 100644 index 04599c1..0000000 --- a/build-files/vc14/IshikoSynchronization.sln +++ /dev/null @@ -1,28 +0,0 @@ - -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 14 -VisualStudioVersion = 14.0.23107.0 -MinimumVisualStudioVersion = 10.0.40219.1 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "IshikoSynchronization", "IshikoSynchronization.vcxproj", "{2E7278C1-AD5F-5D0B-B377-976C22C47A3E}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Win32 = Debug|Win32 - Debug|x64 = Debug|x64 - Release|Win32 = Release|Win32 - Release|x64 = Release|x64 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {2E7278C1-AD5F-5D0B-B377-976C22C47A3E}.Debug|Win32.ActiveCfg = Debug|Win32 - {2E7278C1-AD5F-5D0B-B377-976C22C47A3E}.Debug|Win32.Build.0 = Debug|Win32 - {2E7278C1-AD5F-5D0B-B377-976C22C47A3E}.Debug|x64.ActiveCfg = Debug|x64 - {2E7278C1-AD5F-5D0B-B377-976C22C47A3E}.Debug|x64.Build.0 = Debug|x64 - {2E7278C1-AD5F-5D0B-B377-976C22C47A3E}.Release|Win32.ActiveCfg = Release|Win32 - {2E7278C1-AD5F-5D0B-B377-976C22C47A3E}.Release|Win32.Build.0 = Release|Win32 - {2E7278C1-AD5F-5D0B-B377-976C22C47A3E}.Release|x64.ActiveCfg = Release|x64 - {2E7278C1-AD5F-5D0B-B377-976C22C47A3E}.Release|x64.Build.0 = Release|x64 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection -EndGlobal diff --git a/build-files/vc14/IshikoSynchronization.vcxproj b/build-files/vc14/IshikoSynchronization.vcxproj deleted file mode 100644 index fada974..0000000 --- a/build-files/vc14/IshikoSynchronization.vcxproj +++ /dev/null @@ -1,162 +0,0 @@ - - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - {2E7278C1-AD5F-5D0B-B377-976C22C47A3E} - Win32Proj - IshikoSynchronization - IshikoSynchronization - - - - StaticLibrary - true - Unicode - v140 - - - StaticLibrary - true - Unicode - v140 - - - StaticLibrary - false - Unicode - v140 - - - StaticLibrary - false - Unicode - v140 - - - - - - - - - - - - - - - - - - - IshikoSynchronization-d - ..\bakefile\..\..\lib\$(Platform)\ - - - IshikoSynchronization-d - ..\bakefile\..\..\lib\$(Platform)\ - - - ..\bakefile\..\..\lib\$(Platform)\ - - - ..\bakefile\..\..\lib\$(Platform)\ - - - - Level3 - Disabled - WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) - true - false - ..\..\include\Ishiko\Synchronization;%(AdditionalIncludeDirectories) - MultiThreadedDebugDLL - - - Windows - true - - - - - Level3 - Disabled - WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) - true - false - ..\..\include\Ishiko\Synchronization;%(AdditionalIncludeDirectories) - MultiThreadedDebugDLL - - - Windows - true - - - - - Level3 - MaxSpeed - true - true - WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) - true - false - ..\..\include\Ishiko\Synchronization;%(AdditionalIncludeDirectories) - MultiThreadedDLL - - - Windows - true - true - true - - - - - Level3 - MaxSpeed - true - true - WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) - true - false - ..\..\include\Ishiko\Synchronization;%(AdditionalIncludeDirectories) - MultiThreadedDLL - - - Windows - true - true - true - - - - - - - - - - - - - diff --git a/build-files/vc14/IshikoSynchronization.vcxproj.filters b/build-files/vc14/IshikoSynchronization.vcxproj.filters deleted file mode 100644 index 74003ed..0000000 --- a/build-files/vc14/IshikoSynchronization.vcxproj.filters +++ /dev/null @@ -1,32 +0,0 @@ - - - - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hpp;hxx;hm;inl;inc;xsd - - - {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} - rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms - - - - - Header Files - - - Header Files - - - - - Source Files - - - diff --git a/build-files/vc15/IshikoSynchronization.vcxproj b/build-files/vc15/IshikoSynchronization.vcxproj index e0eb8d5..f0fe654 100644 --- a/build-files/vc15/IshikoSynchronization.vcxproj +++ b/build-files/vc15/IshikoSynchronization.vcxproj @@ -90,6 +90,7 @@ false ..\..\include\Ishiko\Synchronization;%(AdditionalIncludeDirectories) MultiThreadedDebugDLL + /utf-8 %(AdditionalOptions) Windows @@ -105,6 +106,7 @@ false ..\..\include\Ishiko\Synchronization;%(AdditionalIncludeDirectories) MultiThreadedDebugDLL + /utf-8 %(AdditionalOptions) Windows @@ -122,6 +124,7 @@ false ..\..\include\Ishiko\Synchronization;%(AdditionalIncludeDirectories) MultiThreadedDLL + /utf-8 %(AdditionalOptions) Windows @@ -141,6 +144,7 @@ false ..\..\include\Ishiko\Synchronization;%(AdditionalIncludeDirectories) MultiThreadedDLL + /utf-8 %(AdditionalOptions) Windows diff --git a/build-files/vc16/IshikoSynchronization.vcxproj b/build-files/vc16/IshikoSynchronization.vcxproj index 9b9ab3b..37f3d1c 100644 --- a/build-files/vc16/IshikoSynchronization.vcxproj +++ b/build-files/vc16/IshikoSynchronization.vcxproj @@ -90,6 +90,7 @@ false ..\..\include\Ishiko\Synchronization;%(AdditionalIncludeDirectories) MultiThreadedDebugDLL + /utf-8 %(AdditionalOptions) Windows @@ -105,6 +106,7 @@ false ..\..\include\Ishiko\Synchronization;%(AdditionalIncludeDirectories) MultiThreadedDebugDLL + /utf-8 %(AdditionalOptions) Windows @@ -122,6 +124,7 @@ false ..\..\include\Ishiko\Synchronization;%(AdditionalIncludeDirectories) MultiThreadedDLL + /utf-8 %(AdditionalOptions) Windows @@ -141,6 +144,7 @@ false ..\..\include\Ishiko\Synchronization;%(AdditionalIncludeDirectories) MultiThreadedDLL + /utf-8 %(AdditionalOptions) Windows diff --git a/build-files/vc17/IshikoSynchronization.vcxproj b/build-files/vc17/IshikoSynchronization.vcxproj index 5593798..1eba257 100644 --- a/build-files/vc17/IshikoSynchronization.vcxproj +++ b/build-files/vc17/IshikoSynchronization.vcxproj @@ -90,6 +90,7 @@ false ..\..\include\Ishiko\Synchronization;%(AdditionalIncludeDirectories) MultiThreadedDebugDLL + /utf-8 %(AdditionalOptions) Windows @@ -105,6 +106,7 @@ false ..\..\include\Ishiko\Synchronization;%(AdditionalIncludeDirectories) MultiThreadedDebugDLL + /utf-8 %(AdditionalOptions) Windows @@ -122,6 +124,7 @@ false ..\..\include\Ishiko\Synchronization;%(AdditionalIncludeDirectories) MultiThreadedDLL + /utf-8 %(AdditionalOptions) Windows @@ -141,6 +144,7 @@ false ..\..\include\Ishiko\Synchronization;%(AdditionalIncludeDirectories) MultiThreadedDLL + /utf-8 %(AdditionalOptions) Windows diff --git a/tests/build-files/bakefile/IshikoSynchronizationTests.bkl b/tests/build-files/bakefile/IshikoSynchronizationTests.bkl index 85481a7..f766e47 100644 --- a/tests/build-files/bakefile/IshikoSynchronizationTests.bkl +++ b/tests/build-files/bakefile/IshikoSynchronizationTests.bkl @@ -1,13 +1,12 @@ ishikopath = envvar("ISHIKO_CPP_ROOT"); import $(ishikopath)/test-framework/include/Ishiko/TestFramework/Core.bkl; -toolsets = gnu vs2022 vs2019 vs2017 vs2015; +toolsets = gnu vs2022 vs2019 vs2017; gnu.makefile = ../gnumake/GNUmakefile; vs2022.solutionfile = ../vc17/IshikoSynchronizationTests.sln; vs2019.solutionfile = ../vc16/IshikoSynchronizationTests.sln; vs2017.solutionfile = ../vc15/IshikoSynchronizationTests.sln; -vs2015.solutionfile = ../vc14/IshikoSynchronizationTests.sln; program IshikoSynchronizationTests : IshikoTestFrameworkCore { @@ -15,11 +14,16 @@ program IshikoSynchronizationTests : IshikoTestFrameworkCore if ($(toolset) == gnu) { - cxx-compiler-options = "-std=c++11"; + cxx-compiler-options = "-std=c++14"; libs += IshikoTestFrameworkCore IshikoConfiguration IshikoXML IshikoFileSystem IshikoIO IshikoProcess IshikoTime IshikoText IshikoErrors IshikoBasePlatform; libs += fmt boost_filesystem; } + if ($(toolset) != gnu) + { + cxx-compiler-options = "/utf-8"; + } + sources { ../../src/main.cpp diff --git a/tests/build-files/gnumake/GNUmakefile b/tests/build-files/gnumake/GNUmakefile index f071f5a..f5eb8f4 100644 --- a/tests/build-files/gnumake/GNUmakefile +++ b/tests/build-files/gnumake/GNUmakefile @@ -39,6 +39,7 @@ endif # # ISHIKO_CPP_BASEPLATFORM_ROOT Path to the Ishiko/C++ BasePlatform installation # ISHIKO_CPP_ERRORS_ROOT Path to the Ishiko/C++ Errors installation +# ISHIKO_CPP_FMT_ROOT Path to the fmt installation # ISHIKO_CPP_MEMORY_ROOT Path to the Ishiko/C++ Memory installation # ISHIKO_CPP_BOOST_ROOT Path to the Boost installation # ISHIKO_CPP_TEXT_ROOT Path to the Ishiko/C++ Text installation @@ -48,7 +49,6 @@ endif # ISHIKO_CPP_TYPES_ROOT Path to the Ishiko/C++ Types installation # ISHIKO_CPP_DIFF_ROOT Path to the Ishiko/C++ Diff installation # ISHIKO_CPP_PROCESS_ROOT Path to the Ishiko/C++ Process installation -# ISHIKO_CPP_FMT_ROOT Path to the fmt installation # ISHIKO_CPP_TIME_ROOT Path to the Ishiko/C++ Time installation # ISHIKO_CPP_PUGIXML_ROOT Path to the pugixml installation # ISHIKO_CPP_XML_ROOT Path to the Ishiko/C++ XML installation @@ -77,6 +77,8 @@ endif ISHIKO_CPP_BASEPLATFORM_ROOT ?= $(ISHIKO_CPP_ROOT)/base-platform # Path to the Ishiko/C++ Errors installation ISHIKO_CPP_ERRORS_ROOT ?= $(ISHIKO_CPP_ROOT)/errors +# Path to the fmt installation +ISHIKO_CPP_FMT_ROOT ?= $(FMT_ROOT) # Path to the Ishiko/C++ Memory installation ISHIKO_CPP_MEMORY_ROOT ?= $(ISHIKO_CPP_ROOT)/memory # Path to the Boost installation @@ -95,8 +97,6 @@ ISHIKO_CPP_TYPES_ROOT ?= $(ISHIKO_CPP_ROOT)/types ISHIKO_CPP_DIFF_ROOT ?= $(ISHIKO_CPP_ROOT)/diff # Path to the Ishiko/C++ Process installation ISHIKO_CPP_PROCESS_ROOT ?= $(ISHIKO_CPP_ROOT)/process -# Path to the fmt installation -ISHIKO_CPP_FMT_ROOT ?= $(FMT_ROOT) # Path to the Ishiko/C++ Time installation ISHIKO_CPP_TIME_ROOT ?= $(ISHIKO_CPP_ROOT)/time # Path to the pugixml installation @@ -111,10 +111,10 @@ ISHIKO_CPP_TESTFRAMEWORK_ROOT ?= $(ISHIKO_CPP_ROOT)/test-framework all: $(_builddir)IshikoSynchronizationTests $(_builddir)IshikoSynchronizationTests: $(_builddir)IshikoSynchronizationTests_main.o - $(CXX) -o $@ $(LDFLAGS) $(_builddir)IshikoSynchronizationTests_main.o -L$(ISHIKO_CPP_BASEPLATFORM_ROOT)/lib -L$(ISHIKO_CPP_ERRORS_ROOT)/lib -L$(ISHIKO_CPP_MEMORY_ROOT)/lib -L$(ISHIKO_CPP_BOOST_ROOT)/lib -L$(ISHIKO_CPP_TEXT_ROOT)/lib -L$(ISHIKO_CPP_CONFIGURATION_ROOT)/lib -L$(ISHIKO_CPP_IO_ROOT)/lib -L$(ISHIKO_CPP_FILESYSTEM_ROOT)/lib -L$(ISHIKO_CPP_TYPES_ROOT)/lib -L$(ISHIKO_CPP_DIFF_ROOT)/lib -L$(ISHIKO_CPP_XML_ROOT)/lib -L$(ISHIKO_CPP_PROCESS_ROOT)/lib -L$(ISHIKO_CPP_FMT_ROOT)/lib -L$(ISHIKO_CPP_TIME_ROOT)/lib -L$(ISHIKO_CPP_TESTFRAMEWORK_ROOT)/lib -lIshikoTestFrameworkCore -lIshikoConfiguration -lIshikoXML -lIshikoFileSystem -lIshikoIO -lIshikoProcess -lIshikoTime -lIshikoText -lIshikoErrors -lIshikoBasePlatform -lfmt -lboost_filesystem -pthread + $(CXX) -o $@ $(LDFLAGS) $(_builddir)IshikoSynchronizationTests_main.o -L$(ISHIKO_CPP_BASEPLATFORM_ROOT)/lib -L$(ISHIKO_CPP_ERRORS_ROOT)/lib -L$(ISHIKO_CPP_FMT_ROOT)/lib -L$(ISHIKO_CPP_MEMORY_ROOT)/lib -L$(ISHIKO_CPP_BOOST_ROOT)/lib -L$(ISHIKO_CPP_TEXT_ROOT)/lib -L$(ISHIKO_CPP_CONFIGURATION_ROOT)/lib -L$(ISHIKO_CPP_IO_ROOT)/lib -L$(ISHIKO_CPP_FILESYSTEM_ROOT)/lib -L$(ISHIKO_CPP_TYPES_ROOT)/lib -L$(ISHIKO_CPP_DIFF_ROOT)/lib -L$(ISHIKO_CPP_XML_ROOT)/lib -L$(ISHIKO_CPP_PROCESS_ROOT)/lib -L$(ISHIKO_CPP_TIME_ROOT)/lib -L$(ISHIKO_CPP_TESTFRAMEWORK_ROOT)/lib -lIshikoTestFrameworkCore -lIshikoConfiguration -lIshikoXML -lIshikoFileSystem -lIshikoIO -lIshikoProcess -lIshikoTime -lIshikoText -lIshikoErrors -lIshikoBasePlatform -lfmt -lboost_filesystem -pthread $(_builddir)IshikoSynchronizationTests_main.o: ../../src/main.cpp - $(CXX) -c -o $@ $(CPPFLAGS) $(CXXFLAGS) -MD -MP -pthread -DPUGIXML_HEADER_ONLY -I$(ISHIKO_CPP_BASEPLATFORM_ROOT)/include -I$(ISHIKO_CPP_ERRORS_ROOT)/include -I$(ISHIKO_CPP_MEMORY_ROOT)/include -I$(ISHIKO_CPP_BOOST_ROOT)/include -I$(ISHIKO_CPP_TEXT_ROOT)/include -I$(ISHIKO_CPP_CONFIGURATION_ROOT)/include -I$(ISHIKO_CPP_IO_ROOT)/include -I$(ISHIKO_CPP_FILESYSTEM_ROOT)/include -I$(ISHIKO_CPP_TYPES_ROOT)/include -I$(ISHIKO_CPP_DIFF_ROOT)/include -I$(ISHIKO_CPP_PUGIXML_ROOT)/src -I$(ISHIKO_CPP_XML_ROOT)/include -I$(ISHIKO_CPP_PROCESS_ROOT)/include -I$(ISHIKO_CPP_FMT_ROOT)/include -I$(ISHIKO_CPP_TIME_ROOT)/include -I$(ISHIKO_CPP_TESTFRAMEWORK_ROOT)/include -std=c++11 ../../src/main.cpp + $(CXX) -c -o $@ $(CPPFLAGS) $(CXXFLAGS) -MD -MP -pthread -DPUGIXML_HEADER_ONLY -I$(ISHIKO_CPP_BASEPLATFORM_ROOT)/include -I$(ISHIKO_CPP_ERRORS_ROOT)/include -I$(ISHIKO_CPP_FMT_ROOT)/include -I$(ISHIKO_CPP_MEMORY_ROOT)/include -I$(ISHIKO_CPP_BOOST_ROOT)/include -I$(ISHIKO_CPP_TEXT_ROOT)/include -I$(ISHIKO_CPP_CONFIGURATION_ROOT)/include -I$(ISHIKO_CPP_IO_ROOT)/include -I$(ISHIKO_CPP_FILESYSTEM_ROOT)/include -I$(ISHIKO_CPP_TYPES_ROOT)/include -I$(ISHIKO_CPP_DIFF_ROOT)/include -I$(ISHIKO_CPP_PUGIXML_ROOT)/src -I$(ISHIKO_CPP_XML_ROOT)/include -I$(ISHIKO_CPP_PROCESS_ROOT)/include -I$(ISHIKO_CPP_TIME_ROOT)/include -I$(ISHIKO_CPP_TESTFRAMEWORK_ROOT)/include -std=c++14 ../../src/main.cpp clean: rm -f $(_builddir)*.o diff --git a/tests/build-files/vc14/IshikoSynchronizationTests.sln b/tests/build-files/vc14/IshikoSynchronizationTests.sln deleted file mode 100644 index 5efbf56..0000000 --- a/tests/build-files/vc14/IshikoSynchronizationTests.sln +++ /dev/null @@ -1,28 +0,0 @@ - -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 14 -VisualStudioVersion = 14.0.23107.0 -MinimumVisualStudioVersion = 10.0.40219.1 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "IshikoSynchronizationTests", "IshikoSynchronizationTests.vcxproj", "{846B6043-02CE-53BF-BB95-80A7F1EA0A66}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Win32 = Debug|Win32 - Debug|x64 = Debug|x64 - Release|Win32 = Release|Win32 - Release|x64 = Release|x64 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {846B6043-02CE-53BF-BB95-80A7F1EA0A66}.Debug|Win32.ActiveCfg = Debug|Win32 - {846B6043-02CE-53BF-BB95-80A7F1EA0A66}.Debug|Win32.Build.0 = Debug|Win32 - {846B6043-02CE-53BF-BB95-80A7F1EA0A66}.Debug|x64.ActiveCfg = Debug|x64 - {846B6043-02CE-53BF-BB95-80A7F1EA0A66}.Debug|x64.Build.0 = Debug|x64 - {846B6043-02CE-53BF-BB95-80A7F1EA0A66}.Release|Win32.ActiveCfg = Release|Win32 - {846B6043-02CE-53BF-BB95-80A7F1EA0A66}.Release|Win32.Build.0 = Release|Win32 - {846B6043-02CE-53BF-BB95-80A7F1EA0A66}.Release|x64.ActiveCfg = Release|x64 - {846B6043-02CE-53BF-BB95-80A7F1EA0A66}.Release|x64.Build.0 = Release|x64 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection -EndGlobal diff --git a/tests/build-files/vc14/IshikoSynchronizationTests.vcxproj b/tests/build-files/vc14/IshikoSynchronizationTests.vcxproj deleted file mode 100644 index d7ed376..0000000 --- a/tests/build-files/vc14/IshikoSynchronizationTests.vcxproj +++ /dev/null @@ -1,164 +0,0 @@ - - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - {846B6043-02CE-53BF-BB95-80A7F1EA0A66} - Win32Proj - IshikoSynchronizationTests - IshikoSynchronizationTests - - - - Application - true - Unicode - v140 - - - Application - true - Unicode - v140 - - - Application - false - Unicode - v140 - - - Application - false - Unicode - v140 - - - - - - - - - - - - - - - - - - - true - - - true - - - false - - - false - - - - Level3 - Disabled - PUGIXML_HEADER_ONLY;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - true - false - $(ISHIKO_CPP_ROOT)/base-platform\include;$(ISHIKO_CPP_ROOT)/errors\include;$(ISHIKO_CPP_ROOT)/memory\include;$(BOOST_ROOT);$(ISHIKO_CPP_ROOT)/text\include;$(ISHIKO_CPP_ROOT)/configuration\include;$(ISHIKO_CPP_ROOT)/io\include;$(ISHIKO_CPP_ROOT)/filesystem\include;$(ISHIKO_CPP_ROOT)/types\include;$(ISHIKO_CPP_ROOT)/diff\include;$(PUGIXML_ROOT)\src;$(ISHIKO_CPP_ROOT)/xml\include;$(ISHIKO_CPP_ROOT)/process\include;$(FMT_ROOT)\include;$(ISHIKO_CPP_ROOT)/time\include;$(ISHIKO_CPP_ROOT)/test-framework\include;%(AdditionalIncludeDirectories) - MultiThreadedDebugDLL - - - Console - true - $(ISHIKO_CPP_ROOT)/base-platform\lib\$(Platform);$(ISHIKO_CPP_ROOT)/errors\lib\$(Platform);$(ISHIKO_CPP_ROOT)/memory\lib\$(Platform);$(BOOST_ROOT)\stage\lib;$(ISHIKO_CPP_ROOT)/text\lib\$(Platform);$(ISHIKO_CPP_ROOT)/configuration\lib\$(Platform);$(ISHIKO_CPP_ROOT)/io\lib\$(Platform);$(ISHIKO_CPP_ROOT)/filesystem\lib\$(Platform);$(ISHIKO_CPP_ROOT)/types\lib\$(Platform);$(ISHIKO_CPP_ROOT)/diff\lib\$(Platform);$(ISHIKO_CPP_ROOT)/xml\lib\$(Platform);$(ISHIKO_CPP_ROOT)/process\lib\$(Platform);$(FMT_ROOT)\lib;$(ISHIKO_CPP_ROOT)/time\lib\$(Platform);$(ISHIKO_CPP_ROOT)/test-framework\lib\$(Platform);%(AdditionalLibraryDirectories) - fmt-d-x64.lib;%(AdditionalDependencies) - - - - - Level3 - Disabled - PUGIXML_HEADER_ONLY;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - true - false - $(ISHIKO_CPP_ROOT)/base-platform\include;$(ISHIKO_CPP_ROOT)/errors\include;$(ISHIKO_CPP_ROOT)/memory\include;$(BOOST_ROOT);$(ISHIKO_CPP_ROOT)/text\include;$(ISHIKO_CPP_ROOT)/configuration\include;$(ISHIKO_CPP_ROOT)/io\include;$(ISHIKO_CPP_ROOT)/filesystem\include;$(ISHIKO_CPP_ROOT)/types\include;$(ISHIKO_CPP_ROOT)/diff\include;$(PUGIXML_ROOT)\src;$(ISHIKO_CPP_ROOT)/xml\include;$(ISHIKO_CPP_ROOT)/process\include;$(FMT_ROOT)\include;$(ISHIKO_CPP_ROOT)/time\include;$(ISHIKO_CPP_ROOT)/test-framework\include;%(AdditionalIncludeDirectories) - MultiThreadedDebugDLL - - - Console - true - $(ISHIKO_CPP_ROOT)/base-platform\lib\$(Platform);$(ISHIKO_CPP_ROOT)/errors\lib\$(Platform);$(ISHIKO_CPP_ROOT)/memory\lib\$(Platform);$(BOOST_ROOT)\stage\lib;$(ISHIKO_CPP_ROOT)/text\lib\$(Platform);$(ISHIKO_CPP_ROOT)/configuration\lib\$(Platform);$(ISHIKO_CPP_ROOT)/io\lib\$(Platform);$(ISHIKO_CPP_ROOT)/filesystem\lib\$(Platform);$(ISHIKO_CPP_ROOT)/types\lib\$(Platform);$(ISHIKO_CPP_ROOT)/diff\lib\$(Platform);$(ISHIKO_CPP_ROOT)/xml\lib\$(Platform);$(ISHIKO_CPP_ROOT)/process\lib\$(Platform);$(FMT_ROOT)\lib;$(ISHIKO_CPP_ROOT)/time\lib\$(Platform);$(ISHIKO_CPP_ROOT)/test-framework\lib\$(Platform);%(AdditionalLibraryDirectories) - fmt-d-x64.lib;%(AdditionalDependencies) - - - - - Level3 - MaxSpeed - true - true - PUGIXML_HEADER_ONLY;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - true - false - $(ISHIKO_CPP_ROOT)/base-platform\include;$(ISHIKO_CPP_ROOT)/errors\include;$(ISHIKO_CPP_ROOT)/memory\include;$(BOOST_ROOT);$(ISHIKO_CPP_ROOT)/text\include;$(ISHIKO_CPP_ROOT)/configuration\include;$(ISHIKO_CPP_ROOT)/io\include;$(ISHIKO_CPP_ROOT)/filesystem\include;$(ISHIKO_CPP_ROOT)/types\include;$(ISHIKO_CPP_ROOT)/diff\include;$(PUGIXML_ROOT)\src;$(ISHIKO_CPP_ROOT)/xml\include;$(ISHIKO_CPP_ROOT)/process\include;$(FMT_ROOT)\include;$(ISHIKO_CPP_ROOT)/time\include;$(ISHIKO_CPP_ROOT)/test-framework\include;%(AdditionalIncludeDirectories) - MultiThreadedDLL - - - Console - true - true - true - $(ISHIKO_CPP_ROOT)/base-platform\lib\$(Platform);$(ISHIKO_CPP_ROOT)/errors\lib\$(Platform);$(ISHIKO_CPP_ROOT)/memory\lib\$(Platform);$(BOOST_ROOT)\stage\lib;$(ISHIKO_CPP_ROOT)/text\lib\$(Platform);$(ISHIKO_CPP_ROOT)/configuration\lib\$(Platform);$(ISHIKO_CPP_ROOT)/io\lib\$(Platform);$(ISHIKO_CPP_ROOT)/filesystem\lib\$(Platform);$(ISHIKO_CPP_ROOT)/types\lib\$(Platform);$(ISHIKO_CPP_ROOT)/diff\lib\$(Platform);$(ISHIKO_CPP_ROOT)/xml\lib\$(Platform);$(ISHIKO_CPP_ROOT)/process\lib\$(Platform);$(FMT_ROOT)\lib;$(ISHIKO_CPP_ROOT)/time\lib\$(Platform);$(ISHIKO_CPP_ROOT)/test-framework\lib\$(Platform);%(AdditionalLibraryDirectories) - fmt-d-x64.lib;%(AdditionalDependencies) - - - - - Level3 - MaxSpeed - true - true - PUGIXML_HEADER_ONLY;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - true - false - $(ISHIKO_CPP_ROOT)/base-platform\include;$(ISHIKO_CPP_ROOT)/errors\include;$(ISHIKO_CPP_ROOT)/memory\include;$(BOOST_ROOT);$(ISHIKO_CPP_ROOT)/text\include;$(ISHIKO_CPP_ROOT)/configuration\include;$(ISHIKO_CPP_ROOT)/io\include;$(ISHIKO_CPP_ROOT)/filesystem\include;$(ISHIKO_CPP_ROOT)/types\include;$(ISHIKO_CPP_ROOT)/diff\include;$(PUGIXML_ROOT)\src;$(ISHIKO_CPP_ROOT)/xml\include;$(ISHIKO_CPP_ROOT)/process\include;$(FMT_ROOT)\include;$(ISHIKO_CPP_ROOT)/time\include;$(ISHIKO_CPP_ROOT)/test-framework\include;%(AdditionalIncludeDirectories) - MultiThreadedDLL - - - Console - true - true - true - $(ISHIKO_CPP_ROOT)/base-platform\lib\$(Platform);$(ISHIKO_CPP_ROOT)/errors\lib\$(Platform);$(ISHIKO_CPP_ROOT)/memory\lib\$(Platform);$(BOOST_ROOT)\stage\lib;$(ISHIKO_CPP_ROOT)/text\lib\$(Platform);$(ISHIKO_CPP_ROOT)/configuration\lib\$(Platform);$(ISHIKO_CPP_ROOT)/io\lib\$(Platform);$(ISHIKO_CPP_ROOT)/filesystem\lib\$(Platform);$(ISHIKO_CPP_ROOT)/types\lib\$(Platform);$(ISHIKO_CPP_ROOT)/diff\lib\$(Platform);$(ISHIKO_CPP_ROOT)/xml\lib\$(Platform);$(ISHIKO_CPP_ROOT)/process\lib\$(Platform);$(FMT_ROOT)\lib;$(ISHIKO_CPP_ROOT)/time\lib\$(Platform);$(ISHIKO_CPP_ROOT)/test-framework\lib\$(Platform);%(AdditionalLibraryDirectories) - fmt-d-x64.lib;%(AdditionalDependencies) - - - - - - - - - diff --git a/tests/build-files/vc14/IshikoSynchronizationTests.vcxproj.filters b/tests/build-files/vc14/IshikoSynchronizationTests.vcxproj.filters deleted file mode 100644 index 1347ef1..0000000 --- a/tests/build-files/vc14/IshikoSynchronizationTests.vcxproj.filters +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hpp;hxx;hm;inl;inc;xsd - - - {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} - rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms - - - - - Source Files - - - diff --git a/tests/build-files/vc15/IshikoSynchronizationTests.vcxproj b/tests/build-files/vc15/IshikoSynchronizationTests.vcxproj index 5d4608f..de4c657 100644 --- a/tests/build-files/vc15/IshikoSynchronizationTests.vcxproj +++ b/tests/build-files/vc15/IshikoSynchronizationTests.vcxproj @@ -86,13 +86,14 @@ PUGIXML_HEADER_ONLY;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) true false - $(ISHIKO_CPP_ROOT)/base-platform\include;$(ISHIKO_CPP_ROOT)/errors\include;$(ISHIKO_CPP_ROOT)/memory\include;$(BOOST_ROOT);$(ISHIKO_CPP_ROOT)/text\include;$(ISHIKO_CPP_ROOT)/configuration\include;$(ISHIKO_CPP_ROOT)/io\include;$(ISHIKO_CPP_ROOT)/filesystem\include;$(ISHIKO_CPP_ROOT)/types\include;$(ISHIKO_CPP_ROOT)/diff\include;$(PUGIXML_ROOT)\src;$(ISHIKO_CPP_ROOT)/xml\include;$(ISHIKO_CPP_ROOT)/process\include;$(FMT_ROOT)\include;$(ISHIKO_CPP_ROOT)/time\include;$(ISHIKO_CPP_ROOT)/test-framework\include;%(AdditionalIncludeDirectories) + $(ISHIKO_CPP_ROOT)/base-platform\include;$(ISHIKO_CPP_ROOT)/errors\include;$(FMT_ROOT)\include;$(ISHIKO_CPP_ROOT)/memory\include;$(BOOST_ROOT);$(ISHIKO_CPP_ROOT)/text\include;$(ISHIKO_CPP_ROOT)/configuration\include;$(ISHIKO_CPP_ROOT)/io\include;$(ISHIKO_CPP_ROOT)/filesystem\include;$(ISHIKO_CPP_ROOT)/types\include;$(ISHIKO_CPP_ROOT)/diff\include;$(PUGIXML_ROOT)\src;$(ISHIKO_CPP_ROOT)/xml\include;$(ISHIKO_CPP_ROOT)/process\include;$(ISHIKO_CPP_ROOT)/time\include;$(ISHIKO_CPP_ROOT)/test-framework\include;%(AdditionalIncludeDirectories) MultiThreadedDebugDLL + /utf-8 %(AdditionalOptions) Console true - $(ISHIKO_CPP_ROOT)/base-platform\lib\$(Platform);$(ISHIKO_CPP_ROOT)/errors\lib\$(Platform);$(ISHIKO_CPP_ROOT)/memory\lib\$(Platform);$(BOOST_ROOT)\stage\lib;$(ISHIKO_CPP_ROOT)/text\lib\$(Platform);$(ISHIKO_CPP_ROOT)/configuration\lib\$(Platform);$(ISHIKO_CPP_ROOT)/io\lib\$(Platform);$(ISHIKO_CPP_ROOT)/filesystem\lib\$(Platform);$(ISHIKO_CPP_ROOT)/types\lib\$(Platform);$(ISHIKO_CPP_ROOT)/diff\lib\$(Platform);$(ISHIKO_CPP_ROOT)/xml\lib\$(Platform);$(ISHIKO_CPP_ROOT)/process\lib\$(Platform);$(FMT_ROOT)\lib;$(ISHIKO_CPP_ROOT)/time\lib\$(Platform);$(ISHIKO_CPP_ROOT)/test-framework\lib\$(Platform);%(AdditionalLibraryDirectories) + $(ISHIKO_CPP_ROOT)/base-platform\lib\$(Platform);$(ISHIKO_CPP_ROOT)/errors\lib\$(Platform);$(FMT_ROOT)\lib;$(ISHIKO_CPP_ROOT)/memory\lib\$(Platform);$(BOOST_ROOT)\stage\lib;$(ISHIKO_CPP_ROOT)/text\lib\$(Platform);$(ISHIKO_CPP_ROOT)/configuration\lib\$(Platform);$(ISHIKO_CPP_ROOT)/io\lib\$(Platform);$(ISHIKO_CPP_ROOT)/filesystem\lib\$(Platform);$(ISHIKO_CPP_ROOT)/types\lib\$(Platform);$(ISHIKO_CPP_ROOT)/diff\lib\$(Platform);$(ISHIKO_CPP_ROOT)/xml\lib\$(Platform);$(ISHIKO_CPP_ROOT)/process\lib\$(Platform);$(ISHIKO_CPP_ROOT)/time\lib\$(Platform);$(ISHIKO_CPP_ROOT)/test-framework\lib\$(Platform);%(AdditionalLibraryDirectories) fmt-d-x64.lib;%(AdditionalDependencies) @@ -103,13 +104,14 @@ PUGIXML_HEADER_ONLY;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) true false - $(ISHIKO_CPP_ROOT)/base-platform\include;$(ISHIKO_CPP_ROOT)/errors\include;$(ISHIKO_CPP_ROOT)/memory\include;$(BOOST_ROOT);$(ISHIKO_CPP_ROOT)/text\include;$(ISHIKO_CPP_ROOT)/configuration\include;$(ISHIKO_CPP_ROOT)/io\include;$(ISHIKO_CPP_ROOT)/filesystem\include;$(ISHIKO_CPP_ROOT)/types\include;$(ISHIKO_CPP_ROOT)/diff\include;$(PUGIXML_ROOT)\src;$(ISHIKO_CPP_ROOT)/xml\include;$(ISHIKO_CPP_ROOT)/process\include;$(FMT_ROOT)\include;$(ISHIKO_CPP_ROOT)/time\include;$(ISHIKO_CPP_ROOT)/test-framework\include;%(AdditionalIncludeDirectories) + $(ISHIKO_CPP_ROOT)/base-platform\include;$(ISHIKO_CPP_ROOT)/errors\include;$(FMT_ROOT)\include;$(ISHIKO_CPP_ROOT)/memory\include;$(BOOST_ROOT);$(ISHIKO_CPP_ROOT)/text\include;$(ISHIKO_CPP_ROOT)/configuration\include;$(ISHIKO_CPP_ROOT)/io\include;$(ISHIKO_CPP_ROOT)/filesystem\include;$(ISHIKO_CPP_ROOT)/types\include;$(ISHIKO_CPP_ROOT)/diff\include;$(PUGIXML_ROOT)\src;$(ISHIKO_CPP_ROOT)/xml\include;$(ISHIKO_CPP_ROOT)/process\include;$(ISHIKO_CPP_ROOT)/time\include;$(ISHIKO_CPP_ROOT)/test-framework\include;%(AdditionalIncludeDirectories) MultiThreadedDebugDLL + /utf-8 %(AdditionalOptions) Console true - $(ISHIKO_CPP_ROOT)/base-platform\lib\$(Platform);$(ISHIKO_CPP_ROOT)/errors\lib\$(Platform);$(ISHIKO_CPP_ROOT)/memory\lib\$(Platform);$(BOOST_ROOT)\stage\lib;$(ISHIKO_CPP_ROOT)/text\lib\$(Platform);$(ISHIKO_CPP_ROOT)/configuration\lib\$(Platform);$(ISHIKO_CPP_ROOT)/io\lib\$(Platform);$(ISHIKO_CPP_ROOT)/filesystem\lib\$(Platform);$(ISHIKO_CPP_ROOT)/types\lib\$(Platform);$(ISHIKO_CPP_ROOT)/diff\lib\$(Platform);$(ISHIKO_CPP_ROOT)/xml\lib\$(Platform);$(ISHIKO_CPP_ROOT)/process\lib\$(Platform);$(FMT_ROOT)\lib;$(ISHIKO_CPP_ROOT)/time\lib\$(Platform);$(ISHIKO_CPP_ROOT)/test-framework\lib\$(Platform);%(AdditionalLibraryDirectories) + $(ISHIKO_CPP_ROOT)/base-platform\lib\$(Platform);$(ISHIKO_CPP_ROOT)/errors\lib\$(Platform);$(FMT_ROOT)\lib;$(ISHIKO_CPP_ROOT)/memory\lib\$(Platform);$(BOOST_ROOT)\stage\lib;$(ISHIKO_CPP_ROOT)/text\lib\$(Platform);$(ISHIKO_CPP_ROOT)/configuration\lib\$(Platform);$(ISHIKO_CPP_ROOT)/io\lib\$(Platform);$(ISHIKO_CPP_ROOT)/filesystem\lib\$(Platform);$(ISHIKO_CPP_ROOT)/types\lib\$(Platform);$(ISHIKO_CPP_ROOT)/diff\lib\$(Platform);$(ISHIKO_CPP_ROOT)/xml\lib\$(Platform);$(ISHIKO_CPP_ROOT)/process\lib\$(Platform);$(ISHIKO_CPP_ROOT)/time\lib\$(Platform);$(ISHIKO_CPP_ROOT)/test-framework\lib\$(Platform);%(AdditionalLibraryDirectories) fmt-d-x64.lib;%(AdditionalDependencies) @@ -122,15 +124,16 @@ PUGIXML_HEADER_ONLY;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) true false - $(ISHIKO_CPP_ROOT)/base-platform\include;$(ISHIKO_CPP_ROOT)/errors\include;$(ISHIKO_CPP_ROOT)/memory\include;$(BOOST_ROOT);$(ISHIKO_CPP_ROOT)/text\include;$(ISHIKO_CPP_ROOT)/configuration\include;$(ISHIKO_CPP_ROOT)/io\include;$(ISHIKO_CPP_ROOT)/filesystem\include;$(ISHIKO_CPP_ROOT)/types\include;$(ISHIKO_CPP_ROOT)/diff\include;$(PUGIXML_ROOT)\src;$(ISHIKO_CPP_ROOT)/xml\include;$(ISHIKO_CPP_ROOT)/process\include;$(FMT_ROOT)\include;$(ISHIKO_CPP_ROOT)/time\include;$(ISHIKO_CPP_ROOT)/test-framework\include;%(AdditionalIncludeDirectories) + $(ISHIKO_CPP_ROOT)/base-platform\include;$(ISHIKO_CPP_ROOT)/errors\include;$(FMT_ROOT)\include;$(ISHIKO_CPP_ROOT)/memory\include;$(BOOST_ROOT);$(ISHIKO_CPP_ROOT)/text\include;$(ISHIKO_CPP_ROOT)/configuration\include;$(ISHIKO_CPP_ROOT)/io\include;$(ISHIKO_CPP_ROOT)/filesystem\include;$(ISHIKO_CPP_ROOT)/types\include;$(ISHIKO_CPP_ROOT)/diff\include;$(PUGIXML_ROOT)\src;$(ISHIKO_CPP_ROOT)/xml\include;$(ISHIKO_CPP_ROOT)/process\include;$(ISHIKO_CPP_ROOT)/time\include;$(ISHIKO_CPP_ROOT)/test-framework\include;%(AdditionalIncludeDirectories) MultiThreadedDLL + /utf-8 %(AdditionalOptions) Console true true true - $(ISHIKO_CPP_ROOT)/base-platform\lib\$(Platform);$(ISHIKO_CPP_ROOT)/errors\lib\$(Platform);$(ISHIKO_CPP_ROOT)/memory\lib\$(Platform);$(BOOST_ROOT)\stage\lib;$(ISHIKO_CPP_ROOT)/text\lib\$(Platform);$(ISHIKO_CPP_ROOT)/configuration\lib\$(Platform);$(ISHIKO_CPP_ROOT)/io\lib\$(Platform);$(ISHIKO_CPP_ROOT)/filesystem\lib\$(Platform);$(ISHIKO_CPP_ROOT)/types\lib\$(Platform);$(ISHIKO_CPP_ROOT)/diff\lib\$(Platform);$(ISHIKO_CPP_ROOT)/xml\lib\$(Platform);$(ISHIKO_CPP_ROOT)/process\lib\$(Platform);$(FMT_ROOT)\lib;$(ISHIKO_CPP_ROOT)/time\lib\$(Platform);$(ISHIKO_CPP_ROOT)/test-framework\lib\$(Platform);%(AdditionalLibraryDirectories) + $(ISHIKO_CPP_ROOT)/base-platform\lib\$(Platform);$(ISHIKO_CPP_ROOT)/errors\lib\$(Platform);$(FMT_ROOT)\lib;$(ISHIKO_CPP_ROOT)/memory\lib\$(Platform);$(BOOST_ROOT)\stage\lib;$(ISHIKO_CPP_ROOT)/text\lib\$(Platform);$(ISHIKO_CPP_ROOT)/configuration\lib\$(Platform);$(ISHIKO_CPP_ROOT)/io\lib\$(Platform);$(ISHIKO_CPP_ROOT)/filesystem\lib\$(Platform);$(ISHIKO_CPP_ROOT)/types\lib\$(Platform);$(ISHIKO_CPP_ROOT)/diff\lib\$(Platform);$(ISHIKO_CPP_ROOT)/xml\lib\$(Platform);$(ISHIKO_CPP_ROOT)/process\lib\$(Platform);$(ISHIKO_CPP_ROOT)/time\lib\$(Platform);$(ISHIKO_CPP_ROOT)/test-framework\lib\$(Platform);%(AdditionalLibraryDirectories) fmt-d-x64.lib;%(AdditionalDependencies) @@ -143,15 +146,16 @@ PUGIXML_HEADER_ONLY;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) true false - $(ISHIKO_CPP_ROOT)/base-platform\include;$(ISHIKO_CPP_ROOT)/errors\include;$(ISHIKO_CPP_ROOT)/memory\include;$(BOOST_ROOT);$(ISHIKO_CPP_ROOT)/text\include;$(ISHIKO_CPP_ROOT)/configuration\include;$(ISHIKO_CPP_ROOT)/io\include;$(ISHIKO_CPP_ROOT)/filesystem\include;$(ISHIKO_CPP_ROOT)/types\include;$(ISHIKO_CPP_ROOT)/diff\include;$(PUGIXML_ROOT)\src;$(ISHIKO_CPP_ROOT)/xml\include;$(ISHIKO_CPP_ROOT)/process\include;$(FMT_ROOT)\include;$(ISHIKO_CPP_ROOT)/time\include;$(ISHIKO_CPP_ROOT)/test-framework\include;%(AdditionalIncludeDirectories) + $(ISHIKO_CPP_ROOT)/base-platform\include;$(ISHIKO_CPP_ROOT)/errors\include;$(FMT_ROOT)\include;$(ISHIKO_CPP_ROOT)/memory\include;$(BOOST_ROOT);$(ISHIKO_CPP_ROOT)/text\include;$(ISHIKO_CPP_ROOT)/configuration\include;$(ISHIKO_CPP_ROOT)/io\include;$(ISHIKO_CPP_ROOT)/filesystem\include;$(ISHIKO_CPP_ROOT)/types\include;$(ISHIKO_CPP_ROOT)/diff\include;$(PUGIXML_ROOT)\src;$(ISHIKO_CPP_ROOT)/xml\include;$(ISHIKO_CPP_ROOT)/process\include;$(ISHIKO_CPP_ROOT)/time\include;$(ISHIKO_CPP_ROOT)/test-framework\include;%(AdditionalIncludeDirectories) MultiThreadedDLL + /utf-8 %(AdditionalOptions) Console true true true - $(ISHIKO_CPP_ROOT)/base-platform\lib\$(Platform);$(ISHIKO_CPP_ROOT)/errors\lib\$(Platform);$(ISHIKO_CPP_ROOT)/memory\lib\$(Platform);$(BOOST_ROOT)\stage\lib;$(ISHIKO_CPP_ROOT)/text\lib\$(Platform);$(ISHIKO_CPP_ROOT)/configuration\lib\$(Platform);$(ISHIKO_CPP_ROOT)/io\lib\$(Platform);$(ISHIKO_CPP_ROOT)/filesystem\lib\$(Platform);$(ISHIKO_CPP_ROOT)/types\lib\$(Platform);$(ISHIKO_CPP_ROOT)/diff\lib\$(Platform);$(ISHIKO_CPP_ROOT)/xml\lib\$(Platform);$(ISHIKO_CPP_ROOT)/process\lib\$(Platform);$(FMT_ROOT)\lib;$(ISHIKO_CPP_ROOT)/time\lib\$(Platform);$(ISHIKO_CPP_ROOT)/test-framework\lib\$(Platform);%(AdditionalLibraryDirectories) + $(ISHIKO_CPP_ROOT)/base-platform\lib\$(Platform);$(ISHIKO_CPP_ROOT)/errors\lib\$(Platform);$(FMT_ROOT)\lib;$(ISHIKO_CPP_ROOT)/memory\lib\$(Platform);$(BOOST_ROOT)\stage\lib;$(ISHIKO_CPP_ROOT)/text\lib\$(Platform);$(ISHIKO_CPP_ROOT)/configuration\lib\$(Platform);$(ISHIKO_CPP_ROOT)/io\lib\$(Platform);$(ISHIKO_CPP_ROOT)/filesystem\lib\$(Platform);$(ISHIKO_CPP_ROOT)/types\lib\$(Platform);$(ISHIKO_CPP_ROOT)/diff\lib\$(Platform);$(ISHIKO_CPP_ROOT)/xml\lib\$(Platform);$(ISHIKO_CPP_ROOT)/process\lib\$(Platform);$(ISHIKO_CPP_ROOT)/time\lib\$(Platform);$(ISHIKO_CPP_ROOT)/test-framework\lib\$(Platform);%(AdditionalLibraryDirectories) fmt-d-x64.lib;%(AdditionalDependencies) diff --git a/tests/build-files/vc16/IshikoSynchronizationTests.vcxproj b/tests/build-files/vc16/IshikoSynchronizationTests.vcxproj index 96f8188..a57dbab 100644 --- a/tests/build-files/vc16/IshikoSynchronizationTests.vcxproj +++ b/tests/build-files/vc16/IshikoSynchronizationTests.vcxproj @@ -86,13 +86,14 @@ PUGIXML_HEADER_ONLY;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) true false - $(ISHIKO_CPP_ROOT)/base-platform\include;$(ISHIKO_CPP_ROOT)/errors\include;$(ISHIKO_CPP_ROOT)/memory\include;$(BOOST_ROOT);$(ISHIKO_CPP_ROOT)/text\include;$(ISHIKO_CPP_ROOT)/configuration\include;$(ISHIKO_CPP_ROOT)/io\include;$(ISHIKO_CPP_ROOT)/filesystem\include;$(ISHIKO_CPP_ROOT)/types\include;$(ISHIKO_CPP_ROOT)/diff\include;$(PUGIXML_ROOT)\src;$(ISHIKO_CPP_ROOT)/xml\include;$(ISHIKO_CPP_ROOT)/process\include;$(FMT_ROOT)\include;$(ISHIKO_CPP_ROOT)/time\include;$(ISHIKO_CPP_ROOT)/test-framework\include;%(AdditionalIncludeDirectories) + $(ISHIKO_CPP_ROOT)/base-platform\include;$(ISHIKO_CPP_ROOT)/errors\include;$(FMT_ROOT)\include;$(ISHIKO_CPP_ROOT)/memory\include;$(BOOST_ROOT);$(ISHIKO_CPP_ROOT)/text\include;$(ISHIKO_CPP_ROOT)/configuration\include;$(ISHIKO_CPP_ROOT)/io\include;$(ISHIKO_CPP_ROOT)/filesystem\include;$(ISHIKO_CPP_ROOT)/types\include;$(ISHIKO_CPP_ROOT)/diff\include;$(PUGIXML_ROOT)\src;$(ISHIKO_CPP_ROOT)/xml\include;$(ISHIKO_CPP_ROOT)/process\include;$(ISHIKO_CPP_ROOT)/time\include;$(ISHIKO_CPP_ROOT)/test-framework\include;%(AdditionalIncludeDirectories) MultiThreadedDebugDLL + /utf-8 %(AdditionalOptions) Console true - $(ISHIKO_CPP_ROOT)/base-platform\lib\$(Platform);$(ISHIKO_CPP_ROOT)/errors\lib\$(Platform);$(ISHIKO_CPP_ROOT)/memory\lib\$(Platform);$(BOOST_ROOT)\stage\lib;$(ISHIKO_CPP_ROOT)/text\lib\$(Platform);$(ISHIKO_CPP_ROOT)/configuration\lib\$(Platform);$(ISHIKO_CPP_ROOT)/io\lib\$(Platform);$(ISHIKO_CPP_ROOT)/filesystem\lib\$(Platform);$(ISHIKO_CPP_ROOT)/types\lib\$(Platform);$(ISHIKO_CPP_ROOT)/diff\lib\$(Platform);$(ISHIKO_CPP_ROOT)/xml\lib\$(Platform);$(ISHIKO_CPP_ROOT)/process\lib\$(Platform);$(FMT_ROOT)\lib;$(ISHIKO_CPP_ROOT)/time\lib\$(Platform);$(ISHIKO_CPP_ROOT)/test-framework\lib\$(Platform);%(AdditionalLibraryDirectories) + $(ISHIKO_CPP_ROOT)/base-platform\lib\$(Platform);$(ISHIKO_CPP_ROOT)/errors\lib\$(Platform);$(FMT_ROOT)\lib;$(ISHIKO_CPP_ROOT)/memory\lib\$(Platform);$(BOOST_ROOT)\stage\lib;$(ISHIKO_CPP_ROOT)/text\lib\$(Platform);$(ISHIKO_CPP_ROOT)/configuration\lib\$(Platform);$(ISHIKO_CPP_ROOT)/io\lib\$(Platform);$(ISHIKO_CPP_ROOT)/filesystem\lib\$(Platform);$(ISHIKO_CPP_ROOT)/types\lib\$(Platform);$(ISHIKO_CPP_ROOT)/diff\lib\$(Platform);$(ISHIKO_CPP_ROOT)/xml\lib\$(Platform);$(ISHIKO_CPP_ROOT)/process\lib\$(Platform);$(ISHIKO_CPP_ROOT)/time\lib\$(Platform);$(ISHIKO_CPP_ROOT)/test-framework\lib\$(Platform);%(AdditionalLibraryDirectories) fmt-d-x64.lib;%(AdditionalDependencies) @@ -103,13 +104,14 @@ PUGIXML_HEADER_ONLY;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) true false - $(ISHIKO_CPP_ROOT)/base-platform\include;$(ISHIKO_CPP_ROOT)/errors\include;$(ISHIKO_CPP_ROOT)/memory\include;$(BOOST_ROOT);$(ISHIKO_CPP_ROOT)/text\include;$(ISHIKO_CPP_ROOT)/configuration\include;$(ISHIKO_CPP_ROOT)/io\include;$(ISHIKO_CPP_ROOT)/filesystem\include;$(ISHIKO_CPP_ROOT)/types\include;$(ISHIKO_CPP_ROOT)/diff\include;$(PUGIXML_ROOT)\src;$(ISHIKO_CPP_ROOT)/xml\include;$(ISHIKO_CPP_ROOT)/process\include;$(FMT_ROOT)\include;$(ISHIKO_CPP_ROOT)/time\include;$(ISHIKO_CPP_ROOT)/test-framework\include;%(AdditionalIncludeDirectories) + $(ISHIKO_CPP_ROOT)/base-platform\include;$(ISHIKO_CPP_ROOT)/errors\include;$(FMT_ROOT)\include;$(ISHIKO_CPP_ROOT)/memory\include;$(BOOST_ROOT);$(ISHIKO_CPP_ROOT)/text\include;$(ISHIKO_CPP_ROOT)/configuration\include;$(ISHIKO_CPP_ROOT)/io\include;$(ISHIKO_CPP_ROOT)/filesystem\include;$(ISHIKO_CPP_ROOT)/types\include;$(ISHIKO_CPP_ROOT)/diff\include;$(PUGIXML_ROOT)\src;$(ISHIKO_CPP_ROOT)/xml\include;$(ISHIKO_CPP_ROOT)/process\include;$(ISHIKO_CPP_ROOT)/time\include;$(ISHIKO_CPP_ROOT)/test-framework\include;%(AdditionalIncludeDirectories) MultiThreadedDebugDLL + /utf-8 %(AdditionalOptions) Console true - $(ISHIKO_CPP_ROOT)/base-platform\lib\$(Platform);$(ISHIKO_CPP_ROOT)/errors\lib\$(Platform);$(ISHIKO_CPP_ROOT)/memory\lib\$(Platform);$(BOOST_ROOT)\stage\lib;$(ISHIKO_CPP_ROOT)/text\lib\$(Platform);$(ISHIKO_CPP_ROOT)/configuration\lib\$(Platform);$(ISHIKO_CPP_ROOT)/io\lib\$(Platform);$(ISHIKO_CPP_ROOT)/filesystem\lib\$(Platform);$(ISHIKO_CPP_ROOT)/types\lib\$(Platform);$(ISHIKO_CPP_ROOT)/diff\lib\$(Platform);$(ISHIKO_CPP_ROOT)/xml\lib\$(Platform);$(ISHIKO_CPP_ROOT)/process\lib\$(Platform);$(FMT_ROOT)\lib;$(ISHIKO_CPP_ROOT)/time\lib\$(Platform);$(ISHIKO_CPP_ROOT)/test-framework\lib\$(Platform);%(AdditionalLibraryDirectories) + $(ISHIKO_CPP_ROOT)/base-platform\lib\$(Platform);$(ISHIKO_CPP_ROOT)/errors\lib\$(Platform);$(FMT_ROOT)\lib;$(ISHIKO_CPP_ROOT)/memory\lib\$(Platform);$(BOOST_ROOT)\stage\lib;$(ISHIKO_CPP_ROOT)/text\lib\$(Platform);$(ISHIKO_CPP_ROOT)/configuration\lib\$(Platform);$(ISHIKO_CPP_ROOT)/io\lib\$(Platform);$(ISHIKO_CPP_ROOT)/filesystem\lib\$(Platform);$(ISHIKO_CPP_ROOT)/types\lib\$(Platform);$(ISHIKO_CPP_ROOT)/diff\lib\$(Platform);$(ISHIKO_CPP_ROOT)/xml\lib\$(Platform);$(ISHIKO_CPP_ROOT)/process\lib\$(Platform);$(ISHIKO_CPP_ROOT)/time\lib\$(Platform);$(ISHIKO_CPP_ROOT)/test-framework\lib\$(Platform);%(AdditionalLibraryDirectories) fmt-d-x64.lib;%(AdditionalDependencies) @@ -122,15 +124,16 @@ PUGIXML_HEADER_ONLY;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) true false - $(ISHIKO_CPP_ROOT)/base-platform\include;$(ISHIKO_CPP_ROOT)/errors\include;$(ISHIKO_CPP_ROOT)/memory\include;$(BOOST_ROOT);$(ISHIKO_CPP_ROOT)/text\include;$(ISHIKO_CPP_ROOT)/configuration\include;$(ISHIKO_CPP_ROOT)/io\include;$(ISHIKO_CPP_ROOT)/filesystem\include;$(ISHIKO_CPP_ROOT)/types\include;$(ISHIKO_CPP_ROOT)/diff\include;$(PUGIXML_ROOT)\src;$(ISHIKO_CPP_ROOT)/xml\include;$(ISHIKO_CPP_ROOT)/process\include;$(FMT_ROOT)\include;$(ISHIKO_CPP_ROOT)/time\include;$(ISHIKO_CPP_ROOT)/test-framework\include;%(AdditionalIncludeDirectories) + $(ISHIKO_CPP_ROOT)/base-platform\include;$(ISHIKO_CPP_ROOT)/errors\include;$(FMT_ROOT)\include;$(ISHIKO_CPP_ROOT)/memory\include;$(BOOST_ROOT);$(ISHIKO_CPP_ROOT)/text\include;$(ISHIKO_CPP_ROOT)/configuration\include;$(ISHIKO_CPP_ROOT)/io\include;$(ISHIKO_CPP_ROOT)/filesystem\include;$(ISHIKO_CPP_ROOT)/types\include;$(ISHIKO_CPP_ROOT)/diff\include;$(PUGIXML_ROOT)\src;$(ISHIKO_CPP_ROOT)/xml\include;$(ISHIKO_CPP_ROOT)/process\include;$(ISHIKO_CPP_ROOT)/time\include;$(ISHIKO_CPP_ROOT)/test-framework\include;%(AdditionalIncludeDirectories) MultiThreadedDLL + /utf-8 %(AdditionalOptions) Console true true true - $(ISHIKO_CPP_ROOT)/base-platform\lib\$(Platform);$(ISHIKO_CPP_ROOT)/errors\lib\$(Platform);$(ISHIKO_CPP_ROOT)/memory\lib\$(Platform);$(BOOST_ROOT)\stage\lib;$(ISHIKO_CPP_ROOT)/text\lib\$(Platform);$(ISHIKO_CPP_ROOT)/configuration\lib\$(Platform);$(ISHIKO_CPP_ROOT)/io\lib\$(Platform);$(ISHIKO_CPP_ROOT)/filesystem\lib\$(Platform);$(ISHIKO_CPP_ROOT)/types\lib\$(Platform);$(ISHIKO_CPP_ROOT)/diff\lib\$(Platform);$(ISHIKO_CPP_ROOT)/xml\lib\$(Platform);$(ISHIKO_CPP_ROOT)/process\lib\$(Platform);$(FMT_ROOT)\lib;$(ISHIKO_CPP_ROOT)/time\lib\$(Platform);$(ISHIKO_CPP_ROOT)/test-framework\lib\$(Platform);%(AdditionalLibraryDirectories) + $(ISHIKO_CPP_ROOT)/base-platform\lib\$(Platform);$(ISHIKO_CPP_ROOT)/errors\lib\$(Platform);$(FMT_ROOT)\lib;$(ISHIKO_CPP_ROOT)/memory\lib\$(Platform);$(BOOST_ROOT)\stage\lib;$(ISHIKO_CPP_ROOT)/text\lib\$(Platform);$(ISHIKO_CPP_ROOT)/configuration\lib\$(Platform);$(ISHIKO_CPP_ROOT)/io\lib\$(Platform);$(ISHIKO_CPP_ROOT)/filesystem\lib\$(Platform);$(ISHIKO_CPP_ROOT)/types\lib\$(Platform);$(ISHIKO_CPP_ROOT)/diff\lib\$(Platform);$(ISHIKO_CPP_ROOT)/xml\lib\$(Platform);$(ISHIKO_CPP_ROOT)/process\lib\$(Platform);$(ISHIKO_CPP_ROOT)/time\lib\$(Platform);$(ISHIKO_CPP_ROOT)/test-framework\lib\$(Platform);%(AdditionalLibraryDirectories) fmt-d-x64.lib;%(AdditionalDependencies) @@ -143,15 +146,16 @@ PUGIXML_HEADER_ONLY;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) true false - $(ISHIKO_CPP_ROOT)/base-platform\include;$(ISHIKO_CPP_ROOT)/errors\include;$(ISHIKO_CPP_ROOT)/memory\include;$(BOOST_ROOT);$(ISHIKO_CPP_ROOT)/text\include;$(ISHIKO_CPP_ROOT)/configuration\include;$(ISHIKO_CPP_ROOT)/io\include;$(ISHIKO_CPP_ROOT)/filesystem\include;$(ISHIKO_CPP_ROOT)/types\include;$(ISHIKO_CPP_ROOT)/diff\include;$(PUGIXML_ROOT)\src;$(ISHIKO_CPP_ROOT)/xml\include;$(ISHIKO_CPP_ROOT)/process\include;$(FMT_ROOT)\include;$(ISHIKO_CPP_ROOT)/time\include;$(ISHIKO_CPP_ROOT)/test-framework\include;%(AdditionalIncludeDirectories) + $(ISHIKO_CPP_ROOT)/base-platform\include;$(ISHIKO_CPP_ROOT)/errors\include;$(FMT_ROOT)\include;$(ISHIKO_CPP_ROOT)/memory\include;$(BOOST_ROOT);$(ISHIKO_CPP_ROOT)/text\include;$(ISHIKO_CPP_ROOT)/configuration\include;$(ISHIKO_CPP_ROOT)/io\include;$(ISHIKO_CPP_ROOT)/filesystem\include;$(ISHIKO_CPP_ROOT)/types\include;$(ISHIKO_CPP_ROOT)/diff\include;$(PUGIXML_ROOT)\src;$(ISHIKO_CPP_ROOT)/xml\include;$(ISHIKO_CPP_ROOT)/process\include;$(ISHIKO_CPP_ROOT)/time\include;$(ISHIKO_CPP_ROOT)/test-framework\include;%(AdditionalIncludeDirectories) MultiThreadedDLL + /utf-8 %(AdditionalOptions) Console true true true - $(ISHIKO_CPP_ROOT)/base-platform\lib\$(Platform);$(ISHIKO_CPP_ROOT)/errors\lib\$(Platform);$(ISHIKO_CPP_ROOT)/memory\lib\$(Platform);$(BOOST_ROOT)\stage\lib;$(ISHIKO_CPP_ROOT)/text\lib\$(Platform);$(ISHIKO_CPP_ROOT)/configuration\lib\$(Platform);$(ISHIKO_CPP_ROOT)/io\lib\$(Platform);$(ISHIKO_CPP_ROOT)/filesystem\lib\$(Platform);$(ISHIKO_CPP_ROOT)/types\lib\$(Platform);$(ISHIKO_CPP_ROOT)/diff\lib\$(Platform);$(ISHIKO_CPP_ROOT)/xml\lib\$(Platform);$(ISHIKO_CPP_ROOT)/process\lib\$(Platform);$(FMT_ROOT)\lib;$(ISHIKO_CPP_ROOT)/time\lib\$(Platform);$(ISHIKO_CPP_ROOT)/test-framework\lib\$(Platform);%(AdditionalLibraryDirectories) + $(ISHIKO_CPP_ROOT)/base-platform\lib\$(Platform);$(ISHIKO_CPP_ROOT)/errors\lib\$(Platform);$(FMT_ROOT)\lib;$(ISHIKO_CPP_ROOT)/memory\lib\$(Platform);$(BOOST_ROOT)\stage\lib;$(ISHIKO_CPP_ROOT)/text\lib\$(Platform);$(ISHIKO_CPP_ROOT)/configuration\lib\$(Platform);$(ISHIKO_CPP_ROOT)/io\lib\$(Platform);$(ISHIKO_CPP_ROOT)/filesystem\lib\$(Platform);$(ISHIKO_CPP_ROOT)/types\lib\$(Platform);$(ISHIKO_CPP_ROOT)/diff\lib\$(Platform);$(ISHIKO_CPP_ROOT)/xml\lib\$(Platform);$(ISHIKO_CPP_ROOT)/process\lib\$(Platform);$(ISHIKO_CPP_ROOT)/time\lib\$(Platform);$(ISHIKO_CPP_ROOT)/test-framework\lib\$(Platform);%(AdditionalLibraryDirectories) fmt-d-x64.lib;%(AdditionalDependencies) diff --git a/tests/build-files/vc17/IshikoSynchronizationTests.vcxproj b/tests/build-files/vc17/IshikoSynchronizationTests.vcxproj index 6cbb9f7..b6a253e 100644 --- a/tests/build-files/vc17/IshikoSynchronizationTests.vcxproj +++ b/tests/build-files/vc17/IshikoSynchronizationTests.vcxproj @@ -86,13 +86,14 @@ PUGIXML_HEADER_ONLY;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) true false - $(ISHIKO_CPP_ROOT)/base-platform\include;$(ISHIKO_CPP_ROOT)/errors\include;$(ISHIKO_CPP_ROOT)/memory\include;$(BOOST_ROOT);$(ISHIKO_CPP_ROOT)/text\include;$(ISHIKO_CPP_ROOT)/configuration\include;$(ISHIKO_CPP_ROOT)/io\include;$(ISHIKO_CPP_ROOT)/filesystem\include;$(ISHIKO_CPP_ROOT)/types\include;$(ISHIKO_CPP_ROOT)/diff\include;$(PUGIXML_ROOT)\src;$(ISHIKO_CPP_ROOT)/xml\include;$(ISHIKO_CPP_ROOT)/process\include;$(FMT_ROOT)\include;$(ISHIKO_CPP_ROOT)/time\include;$(ISHIKO_CPP_ROOT)/test-framework\include;%(AdditionalIncludeDirectories) + $(ISHIKO_CPP_ROOT)/base-platform\include;$(ISHIKO_CPP_ROOT)/errors\include;$(FMT_ROOT)\include;$(ISHIKO_CPP_ROOT)/memory\include;$(BOOST_ROOT);$(ISHIKO_CPP_ROOT)/text\include;$(ISHIKO_CPP_ROOT)/configuration\include;$(ISHIKO_CPP_ROOT)/io\include;$(ISHIKO_CPP_ROOT)/filesystem\include;$(ISHIKO_CPP_ROOT)/types\include;$(ISHIKO_CPP_ROOT)/diff\include;$(PUGIXML_ROOT)\src;$(ISHIKO_CPP_ROOT)/xml\include;$(ISHIKO_CPP_ROOT)/process\include;$(ISHIKO_CPP_ROOT)/time\include;$(ISHIKO_CPP_ROOT)/test-framework\include;%(AdditionalIncludeDirectories) MultiThreadedDebugDLL + /utf-8 %(AdditionalOptions) Console true - $(ISHIKO_CPP_ROOT)/base-platform\lib\$(Platform);$(ISHIKO_CPP_ROOT)/errors\lib\$(Platform);$(ISHIKO_CPP_ROOT)/memory\lib\$(Platform);$(BOOST_ROOT)\stage\lib;$(ISHIKO_CPP_ROOT)/text\lib\$(Platform);$(ISHIKO_CPP_ROOT)/configuration\lib\$(Platform);$(ISHIKO_CPP_ROOT)/io\lib\$(Platform);$(ISHIKO_CPP_ROOT)/filesystem\lib\$(Platform);$(ISHIKO_CPP_ROOT)/types\lib\$(Platform);$(ISHIKO_CPP_ROOT)/diff\lib\$(Platform);$(ISHIKO_CPP_ROOT)/xml\lib\$(Platform);$(ISHIKO_CPP_ROOT)/process\lib\$(Platform);$(FMT_ROOT)\lib;$(ISHIKO_CPP_ROOT)/time\lib\$(Platform);$(ISHIKO_CPP_ROOT)/test-framework\lib\$(Platform);%(AdditionalLibraryDirectories) + $(ISHIKO_CPP_ROOT)/base-platform\lib\$(Platform);$(ISHIKO_CPP_ROOT)/errors\lib\$(Platform);$(FMT_ROOT)\lib;$(ISHIKO_CPP_ROOT)/memory\lib\$(Platform);$(BOOST_ROOT)\stage\lib;$(ISHIKO_CPP_ROOT)/text\lib\$(Platform);$(ISHIKO_CPP_ROOT)/configuration\lib\$(Platform);$(ISHIKO_CPP_ROOT)/io\lib\$(Platform);$(ISHIKO_CPP_ROOT)/filesystem\lib\$(Platform);$(ISHIKO_CPP_ROOT)/types\lib\$(Platform);$(ISHIKO_CPP_ROOT)/diff\lib\$(Platform);$(ISHIKO_CPP_ROOT)/xml\lib\$(Platform);$(ISHIKO_CPP_ROOT)/process\lib\$(Platform);$(ISHIKO_CPP_ROOT)/time\lib\$(Platform);$(ISHIKO_CPP_ROOT)/test-framework\lib\$(Platform);%(AdditionalLibraryDirectories) fmt-d-x64.lib;%(AdditionalDependencies) @@ -103,13 +104,14 @@ PUGIXML_HEADER_ONLY;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) true false - $(ISHIKO_CPP_ROOT)/base-platform\include;$(ISHIKO_CPP_ROOT)/errors\include;$(ISHIKO_CPP_ROOT)/memory\include;$(BOOST_ROOT);$(ISHIKO_CPP_ROOT)/text\include;$(ISHIKO_CPP_ROOT)/configuration\include;$(ISHIKO_CPP_ROOT)/io\include;$(ISHIKO_CPP_ROOT)/filesystem\include;$(ISHIKO_CPP_ROOT)/types\include;$(ISHIKO_CPP_ROOT)/diff\include;$(PUGIXML_ROOT)\src;$(ISHIKO_CPP_ROOT)/xml\include;$(ISHIKO_CPP_ROOT)/process\include;$(FMT_ROOT)\include;$(ISHIKO_CPP_ROOT)/time\include;$(ISHIKO_CPP_ROOT)/test-framework\include;%(AdditionalIncludeDirectories) + $(ISHIKO_CPP_ROOT)/base-platform\include;$(ISHIKO_CPP_ROOT)/errors\include;$(FMT_ROOT)\include;$(ISHIKO_CPP_ROOT)/memory\include;$(BOOST_ROOT);$(ISHIKO_CPP_ROOT)/text\include;$(ISHIKO_CPP_ROOT)/configuration\include;$(ISHIKO_CPP_ROOT)/io\include;$(ISHIKO_CPP_ROOT)/filesystem\include;$(ISHIKO_CPP_ROOT)/types\include;$(ISHIKO_CPP_ROOT)/diff\include;$(PUGIXML_ROOT)\src;$(ISHIKO_CPP_ROOT)/xml\include;$(ISHIKO_CPP_ROOT)/process\include;$(ISHIKO_CPP_ROOT)/time\include;$(ISHIKO_CPP_ROOT)/test-framework\include;%(AdditionalIncludeDirectories) MultiThreadedDebugDLL + /utf-8 %(AdditionalOptions) Console true - $(ISHIKO_CPP_ROOT)/base-platform\lib\$(Platform);$(ISHIKO_CPP_ROOT)/errors\lib\$(Platform);$(ISHIKO_CPP_ROOT)/memory\lib\$(Platform);$(BOOST_ROOT)\stage\lib;$(ISHIKO_CPP_ROOT)/text\lib\$(Platform);$(ISHIKO_CPP_ROOT)/configuration\lib\$(Platform);$(ISHIKO_CPP_ROOT)/io\lib\$(Platform);$(ISHIKO_CPP_ROOT)/filesystem\lib\$(Platform);$(ISHIKO_CPP_ROOT)/types\lib\$(Platform);$(ISHIKO_CPP_ROOT)/diff\lib\$(Platform);$(ISHIKO_CPP_ROOT)/xml\lib\$(Platform);$(ISHIKO_CPP_ROOT)/process\lib\$(Platform);$(FMT_ROOT)\lib;$(ISHIKO_CPP_ROOT)/time\lib\$(Platform);$(ISHIKO_CPP_ROOT)/test-framework\lib\$(Platform);%(AdditionalLibraryDirectories) + $(ISHIKO_CPP_ROOT)/base-platform\lib\$(Platform);$(ISHIKO_CPP_ROOT)/errors\lib\$(Platform);$(FMT_ROOT)\lib;$(ISHIKO_CPP_ROOT)/memory\lib\$(Platform);$(BOOST_ROOT)\stage\lib;$(ISHIKO_CPP_ROOT)/text\lib\$(Platform);$(ISHIKO_CPP_ROOT)/configuration\lib\$(Platform);$(ISHIKO_CPP_ROOT)/io\lib\$(Platform);$(ISHIKO_CPP_ROOT)/filesystem\lib\$(Platform);$(ISHIKO_CPP_ROOT)/types\lib\$(Platform);$(ISHIKO_CPP_ROOT)/diff\lib\$(Platform);$(ISHIKO_CPP_ROOT)/xml\lib\$(Platform);$(ISHIKO_CPP_ROOT)/process\lib\$(Platform);$(ISHIKO_CPP_ROOT)/time\lib\$(Platform);$(ISHIKO_CPP_ROOT)/test-framework\lib\$(Platform);%(AdditionalLibraryDirectories) fmt-d-x64.lib;%(AdditionalDependencies) @@ -122,15 +124,16 @@ PUGIXML_HEADER_ONLY;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) true false - $(ISHIKO_CPP_ROOT)/base-platform\include;$(ISHIKO_CPP_ROOT)/errors\include;$(ISHIKO_CPP_ROOT)/memory\include;$(BOOST_ROOT);$(ISHIKO_CPP_ROOT)/text\include;$(ISHIKO_CPP_ROOT)/configuration\include;$(ISHIKO_CPP_ROOT)/io\include;$(ISHIKO_CPP_ROOT)/filesystem\include;$(ISHIKO_CPP_ROOT)/types\include;$(ISHIKO_CPP_ROOT)/diff\include;$(PUGIXML_ROOT)\src;$(ISHIKO_CPP_ROOT)/xml\include;$(ISHIKO_CPP_ROOT)/process\include;$(FMT_ROOT)\include;$(ISHIKO_CPP_ROOT)/time\include;$(ISHIKO_CPP_ROOT)/test-framework\include;%(AdditionalIncludeDirectories) + $(ISHIKO_CPP_ROOT)/base-platform\include;$(ISHIKO_CPP_ROOT)/errors\include;$(FMT_ROOT)\include;$(ISHIKO_CPP_ROOT)/memory\include;$(BOOST_ROOT);$(ISHIKO_CPP_ROOT)/text\include;$(ISHIKO_CPP_ROOT)/configuration\include;$(ISHIKO_CPP_ROOT)/io\include;$(ISHIKO_CPP_ROOT)/filesystem\include;$(ISHIKO_CPP_ROOT)/types\include;$(ISHIKO_CPP_ROOT)/diff\include;$(PUGIXML_ROOT)\src;$(ISHIKO_CPP_ROOT)/xml\include;$(ISHIKO_CPP_ROOT)/process\include;$(ISHIKO_CPP_ROOT)/time\include;$(ISHIKO_CPP_ROOT)/test-framework\include;%(AdditionalIncludeDirectories) MultiThreadedDLL + /utf-8 %(AdditionalOptions) Console true true true - $(ISHIKO_CPP_ROOT)/base-platform\lib\$(Platform);$(ISHIKO_CPP_ROOT)/errors\lib\$(Platform);$(ISHIKO_CPP_ROOT)/memory\lib\$(Platform);$(BOOST_ROOT)\stage\lib;$(ISHIKO_CPP_ROOT)/text\lib\$(Platform);$(ISHIKO_CPP_ROOT)/configuration\lib\$(Platform);$(ISHIKO_CPP_ROOT)/io\lib\$(Platform);$(ISHIKO_CPP_ROOT)/filesystem\lib\$(Platform);$(ISHIKO_CPP_ROOT)/types\lib\$(Platform);$(ISHIKO_CPP_ROOT)/diff\lib\$(Platform);$(ISHIKO_CPP_ROOT)/xml\lib\$(Platform);$(ISHIKO_CPP_ROOT)/process\lib\$(Platform);$(FMT_ROOT)\lib;$(ISHIKO_CPP_ROOT)/time\lib\$(Platform);$(ISHIKO_CPP_ROOT)/test-framework\lib\$(Platform);%(AdditionalLibraryDirectories) + $(ISHIKO_CPP_ROOT)/base-platform\lib\$(Platform);$(ISHIKO_CPP_ROOT)/errors\lib\$(Platform);$(FMT_ROOT)\lib;$(ISHIKO_CPP_ROOT)/memory\lib\$(Platform);$(BOOST_ROOT)\stage\lib;$(ISHIKO_CPP_ROOT)/text\lib\$(Platform);$(ISHIKO_CPP_ROOT)/configuration\lib\$(Platform);$(ISHIKO_CPP_ROOT)/io\lib\$(Platform);$(ISHIKO_CPP_ROOT)/filesystem\lib\$(Platform);$(ISHIKO_CPP_ROOT)/types\lib\$(Platform);$(ISHIKO_CPP_ROOT)/diff\lib\$(Platform);$(ISHIKO_CPP_ROOT)/xml\lib\$(Platform);$(ISHIKO_CPP_ROOT)/process\lib\$(Platform);$(ISHIKO_CPP_ROOT)/time\lib\$(Platform);$(ISHIKO_CPP_ROOT)/test-framework\lib\$(Platform);%(AdditionalLibraryDirectories) fmt-d-x64.lib;%(AdditionalDependencies) @@ -143,15 +146,16 @@ PUGIXML_HEADER_ONLY;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) true false - $(ISHIKO_CPP_ROOT)/base-platform\include;$(ISHIKO_CPP_ROOT)/errors\include;$(ISHIKO_CPP_ROOT)/memory\include;$(BOOST_ROOT);$(ISHIKO_CPP_ROOT)/text\include;$(ISHIKO_CPP_ROOT)/configuration\include;$(ISHIKO_CPP_ROOT)/io\include;$(ISHIKO_CPP_ROOT)/filesystem\include;$(ISHIKO_CPP_ROOT)/types\include;$(ISHIKO_CPP_ROOT)/diff\include;$(PUGIXML_ROOT)\src;$(ISHIKO_CPP_ROOT)/xml\include;$(ISHIKO_CPP_ROOT)/process\include;$(FMT_ROOT)\include;$(ISHIKO_CPP_ROOT)/time\include;$(ISHIKO_CPP_ROOT)/test-framework\include;%(AdditionalIncludeDirectories) + $(ISHIKO_CPP_ROOT)/base-platform\include;$(ISHIKO_CPP_ROOT)/errors\include;$(FMT_ROOT)\include;$(ISHIKO_CPP_ROOT)/memory\include;$(BOOST_ROOT);$(ISHIKO_CPP_ROOT)/text\include;$(ISHIKO_CPP_ROOT)/configuration\include;$(ISHIKO_CPP_ROOT)/io\include;$(ISHIKO_CPP_ROOT)/filesystem\include;$(ISHIKO_CPP_ROOT)/types\include;$(ISHIKO_CPP_ROOT)/diff\include;$(PUGIXML_ROOT)\src;$(ISHIKO_CPP_ROOT)/xml\include;$(ISHIKO_CPP_ROOT)/process\include;$(ISHIKO_CPP_ROOT)/time\include;$(ISHIKO_CPP_ROOT)/test-framework\include;%(AdditionalIncludeDirectories) MultiThreadedDLL + /utf-8 %(AdditionalOptions) Console true true true - $(ISHIKO_CPP_ROOT)/base-platform\lib\$(Platform);$(ISHIKO_CPP_ROOT)/errors\lib\$(Platform);$(ISHIKO_CPP_ROOT)/memory\lib\$(Platform);$(BOOST_ROOT)\stage\lib;$(ISHIKO_CPP_ROOT)/text\lib\$(Platform);$(ISHIKO_CPP_ROOT)/configuration\lib\$(Platform);$(ISHIKO_CPP_ROOT)/io\lib\$(Platform);$(ISHIKO_CPP_ROOT)/filesystem\lib\$(Platform);$(ISHIKO_CPP_ROOT)/types\lib\$(Platform);$(ISHIKO_CPP_ROOT)/diff\lib\$(Platform);$(ISHIKO_CPP_ROOT)/xml\lib\$(Platform);$(ISHIKO_CPP_ROOT)/process\lib\$(Platform);$(FMT_ROOT)\lib;$(ISHIKO_CPP_ROOT)/time\lib\$(Platform);$(ISHIKO_CPP_ROOT)/test-framework\lib\$(Platform);%(AdditionalLibraryDirectories) + $(ISHIKO_CPP_ROOT)/base-platform\lib\$(Platform);$(ISHIKO_CPP_ROOT)/errors\lib\$(Platform);$(FMT_ROOT)\lib;$(ISHIKO_CPP_ROOT)/memory\lib\$(Platform);$(BOOST_ROOT)\stage\lib;$(ISHIKO_CPP_ROOT)/text\lib\$(Platform);$(ISHIKO_CPP_ROOT)/configuration\lib\$(Platform);$(ISHIKO_CPP_ROOT)/io\lib\$(Platform);$(ISHIKO_CPP_ROOT)/filesystem\lib\$(Platform);$(ISHIKO_CPP_ROOT)/types\lib\$(Platform);$(ISHIKO_CPP_ROOT)/diff\lib\$(Platform);$(ISHIKO_CPP_ROOT)/xml\lib\$(Platform);$(ISHIKO_CPP_ROOT)/process\lib\$(Platform);$(ISHIKO_CPP_ROOT)/time\lib\$(Platform);$(ISHIKO_CPP_ROOT)/test-framework\lib\$(Platform);%(AdditionalLibraryDirectories) fmt-d-x64.lib;%(AdditionalDependencies) From 23c6803bbc844ac25af74f87d861e7239fa429e9 Mon Sep 17 00:00:00 2001 From: Xavier Leclercq Date: Sun, 26 Oct 2025 00:28:11 +0100 Subject: [PATCH 2/3] Updates --- .../bakefile/IshikoSynchronization.bkl | 1 + .../vc15/IshikoSynchronization.vcxproj | 1 + .../IshikoSynchronization.vcxproj.filters | 3 + .../vc16/IshikoSynchronization.vcxproj | 1 + .../IshikoSynchronization.vcxproj.filters | 3 + .../vc17/IshikoSynchronization.vcxproj | 1 + .../IshikoSynchronization.vcxproj.filters | 3 + include/Ishiko/Synchronization.bkl | 20 ++++++ include/Ishiko/Synchronization.hpp | 3 +- include/Ishiko/Synchronization/Spinlock.hpp | 25 ++++++- .../Ishiko/Synchronization/linkoptions.hpp | 13 ++++ src/Spinlock.cpp | 18 +++++ .../bakefile/IshikoSynchronizationTests.bkl | 9 ++- tests/build-files/gnumake/GNUmakefile | 44 +++++++----- .../vc15/IshikoSynchronizationTests.vcxproj | 20 +++--- ...IshikoSynchronizationTests.vcxproj.filters | 8 +++ .../vc16/IshikoSynchronizationTests.vcxproj | 20 +++--- ...IshikoSynchronizationTests.vcxproj.filters | 8 +++ .../vc17/IshikoSynchronizationTests.vcxproj | 20 +++--- ...IshikoSynchronizationTests.vcxproj.filters | 8 +++ tests/src/SpinlockTests.cpp | 71 +++++++++++++++++++ tests/src/SpinlockTests.hpp | 20 ++++++ tests/src/main.cpp | 7 +- 23 files changed, 276 insertions(+), 51 deletions(-) create mode 100644 include/Ishiko/Synchronization.bkl create mode 100644 include/Ishiko/Synchronization/linkoptions.hpp create mode 100644 tests/src/SpinlockTests.cpp create mode 100644 tests/src/SpinlockTests.hpp diff --git a/build-files/bakefile/IshikoSynchronization.bkl b/build-files/bakefile/IshikoSynchronization.bkl index 73ccb3b..cba560f 100644 --- a/build-files/bakefile/IshikoSynchronization.bkl +++ b/build-files/bakefile/IshikoSynchronization.bkl @@ -31,6 +31,7 @@ library IshikoSynchronization headers { ../../include/Ishiko/Synchronization.hpp + ../../include/Ishiko/Synchronization/linkoptions.hpp ../../include/Ishiko/Synchronization/Spinlock.hpp } diff --git a/build-files/vc15/IshikoSynchronization.vcxproj b/build-files/vc15/IshikoSynchronization.vcxproj index f0fe654..eda0935 100644 --- a/build-files/vc15/IshikoSynchronization.vcxproj +++ b/build-files/vc15/IshikoSynchronization.vcxproj @@ -158,6 +158,7 @@ + diff --git a/build-files/vc15/IshikoSynchronization.vcxproj.filters b/build-files/vc15/IshikoSynchronization.vcxproj.filters index 74003ed..b913075 100644 --- a/build-files/vc15/IshikoSynchronization.vcxproj.filters +++ b/build-files/vc15/IshikoSynchronization.vcxproj.filters @@ -20,6 +20,9 @@ Header Files + + Header Files + Header Files diff --git a/build-files/vc16/IshikoSynchronization.vcxproj b/build-files/vc16/IshikoSynchronization.vcxproj index 37f3d1c..e25fe40 100644 --- a/build-files/vc16/IshikoSynchronization.vcxproj +++ b/build-files/vc16/IshikoSynchronization.vcxproj @@ -158,6 +158,7 @@ + diff --git a/build-files/vc16/IshikoSynchronization.vcxproj.filters b/build-files/vc16/IshikoSynchronization.vcxproj.filters index 74003ed..b913075 100644 --- a/build-files/vc16/IshikoSynchronization.vcxproj.filters +++ b/build-files/vc16/IshikoSynchronization.vcxproj.filters @@ -20,6 +20,9 @@ Header Files + + Header Files + Header Files diff --git a/build-files/vc17/IshikoSynchronization.vcxproj b/build-files/vc17/IshikoSynchronization.vcxproj index 1eba257..176f013 100644 --- a/build-files/vc17/IshikoSynchronization.vcxproj +++ b/build-files/vc17/IshikoSynchronization.vcxproj @@ -158,6 +158,7 @@ + diff --git a/build-files/vc17/IshikoSynchronization.vcxproj.filters b/build-files/vc17/IshikoSynchronization.vcxproj.filters index 74003ed..b913075 100644 --- a/build-files/vc17/IshikoSynchronization.vcxproj.filters +++ b/build-files/vc17/IshikoSynchronization.vcxproj.filters @@ -20,6 +20,9 @@ Header Files + + Header Files + Header Files diff --git a/include/Ishiko/Synchronization.bkl b/include/Ishiko/Synchronization.bkl new file mode 100644 index 0000000..0b105bc --- /dev/null +++ b/include/Ishiko/Synchronization.bkl @@ -0,0 +1,20 @@ +setting ISHIKO_CPP_SYNCHRONIZATION_ROOT +{ + help = "Path to the Ishiko/C++ Synchronization installation"; + default = '$(ISHIKO_CPP_ROOT)/synchronization'; +} + +template IshikoSynchronization +{ + includedirs += $(ISHIKO_CPP_SYNCHRONIZATION_ROOT)/include; + + if ($(toolset) == gnu) + { + libdirs += $(ISHIKO_CPP_SYNCHRONIZATION_ROOT)/lib; + } + + if ($(toolset) != gnu) + { + libdirs += $(ISHIKO_CPP_SYNCHRONIZATION_ROOT)/lib/$(arch); + } +} diff --git a/include/Ishiko/Synchronization.hpp b/include/Ishiko/Synchronization.hpp index 19c55fe..d24e0fd 100644 --- a/include/Ishiko/Synchronization.hpp +++ b/include/Ishiko/Synchronization.hpp @@ -1,9 +1,10 @@ -// SPDX-FileCopyrightText: 2005-2024 Xavier Leclercq +// SPDX-FileCopyrightText: 2005-2025 Xavier Leclercq // SPDX-License-Identifier: BSL-1.0 #ifndef GUARD_ISHIKO_CPP_SYNCHRONIZATION_HPP #define GUARD_ISHIKO_CPP_SYNCHRONIZATION_HPP +#include "Synchronization/linkoptions.hpp" #include "Synchronization/Spinlock.hpp" #endif diff --git a/include/Ishiko/Synchronization/Spinlock.hpp b/include/Ishiko/Synchronization/Spinlock.hpp index 94b9394..fe333c2 100644 --- a/include/Ishiko/Synchronization/Spinlock.hpp +++ b/include/Ishiko/Synchronization/Spinlock.hpp @@ -1,7 +1,26 @@ -// SPDX-FileCopyrightText: 2005-2024 Xavier Leclercq +// SPDX-FileCopyrightText: 2005-2025 Xavier Leclercq // SPDX-License-Identifier: BSL-1.0 -#ifndef GUARD_ISHIKO_CPP_SPINLOCK_HPP -#define GUARD_ISHIKO_CPP_SPINLOCK_HPP +#ifndef GUARD_ISHIKO_CPP_SYNCHRONIZATION_SPINLOCK_HPP +#define GUARD_ISHIKO_CPP_SYNCHRONIZATION_SPINLOCK_HPP + +#include + +namespace Ishiko +{ + class Spinlock + { + public: + Spinlock(); + Spinlock(const Spinlock& other) = delete; + + void acquire(); + void release(); + + private: + std::atomic_flag m_lock = ATOMIC_FLAG_INIT; + }; + +} #endif diff --git a/include/Ishiko/Synchronization/linkoptions.hpp b/include/Ishiko/Synchronization/linkoptions.hpp new file mode 100644 index 0000000..6e95e5b --- /dev/null +++ b/include/Ishiko/Synchronization/linkoptions.hpp @@ -0,0 +1,13 @@ +// SPDX-FileCopyrightText: 2005-2025 Xavier Leclercq +// SPDX-License-Identifier: BSL-1.0 + +#ifndef GUARD_ISHIKO_CPP_SYNCHRONIZATION_LINKOPTIONS_HPP +#define GUARD_ISHIKO_CPP_SYNCHRONIZATION_LINKOPTIONS_HPP + +#ifdef _DEBUG +#pragma comment(lib, "IshikoSynchronization-d.lib") +#else +#pragma comment(lib, "IshikoSynchronization.lib") +#endif + +#endif diff --git a/src/Spinlock.cpp b/src/Spinlock.cpp index 4397653..c307973 100644 --- a/src/Spinlock.cpp +++ b/src/Spinlock.cpp @@ -2,3 +2,21 @@ // SPDX-License-Identifier: BSL-1.0 #include "Spinlock.hpp" + +using namespace Ishiko; + +Spinlock::Spinlock() +{ +} + +void Spinlock::acquire() +{ + while (m_lock.test_and_set(std::memory_order_acquire)) + { + } +} + +void Spinlock::release() +{ + m_lock.clear(std::memory_order_release); +} diff --git a/tests/build-files/bakefile/IshikoSynchronizationTests.bkl b/tests/build-files/bakefile/IshikoSynchronizationTests.bkl index f766e47..582626d 100644 --- a/tests/build-files/bakefile/IshikoSynchronizationTests.bkl +++ b/tests/build-files/bakefile/IshikoSynchronizationTests.bkl @@ -1,4 +1,5 @@ ishikopath = envvar("ISHIKO_CPP_ROOT"); +import $(ishikopath)/synchronization/include/Ishiko/Synchronization.bkl; import $(ishikopath)/test-framework/include/Ishiko/TestFramework/Core.bkl; toolsets = gnu vs2022 vs2019 vs2017; @@ -8,7 +9,7 @@ vs2022.solutionfile = ../vc17/IshikoSynchronizationTests.sln; vs2019.solutionfile = ../vc16/IshikoSynchronizationTests.sln; vs2017.solutionfile = ../vc15/IshikoSynchronizationTests.sln; -program IshikoSynchronizationTests : IshikoTestFrameworkCore +program IshikoSynchronizationTests : IshikoSynchronization, IshikoTestFrameworkCore { archs = x86 x86_64; @@ -24,8 +25,14 @@ program IshikoSynchronizationTests : IshikoTestFrameworkCore cxx-compiler-options = "/utf-8"; } + headers + { + ../../src/SpinlockTests.hpp + } + sources { ../../src/main.cpp + ../../src/SpinlockTests.cpp } } diff --git a/tests/build-files/gnumake/GNUmakefile b/tests/build-files/gnumake/GNUmakefile index f5eb8f4..7d704c2 100644 --- a/tests/build-files/gnumake/GNUmakefile +++ b/tests/build-files/gnumake/GNUmakefile @@ -37,22 +37,23 @@ endif # Additionally, this makefile is customizable with the following # settings: # -# ISHIKO_CPP_BASEPLATFORM_ROOT Path to the Ishiko/C++ BasePlatform installation -# ISHIKO_CPP_ERRORS_ROOT Path to the Ishiko/C++ Errors installation -# ISHIKO_CPP_FMT_ROOT Path to the fmt installation -# ISHIKO_CPP_MEMORY_ROOT Path to the Ishiko/C++ Memory installation -# ISHIKO_CPP_BOOST_ROOT Path to the Boost installation -# ISHIKO_CPP_TEXT_ROOT Path to the Ishiko/C++ Text installation -# ISHIKO_CPP_CONFIGURATION_ROOT Path to the Ishiko/C++ Configuration installation -# ISHIKO_CPP_IO_ROOT Path to the Ishiko/C++ IO installation -# ISHIKO_CPP_FILESYSTEM_ROOT Path to the Ishiko/C++ FileSystem installation -# ISHIKO_CPP_TYPES_ROOT Path to the Ishiko/C++ Types installation -# ISHIKO_CPP_DIFF_ROOT Path to the Ishiko/C++ Diff installation -# ISHIKO_CPP_PROCESS_ROOT Path to the Ishiko/C++ Process installation -# ISHIKO_CPP_TIME_ROOT Path to the Ishiko/C++ Time installation -# ISHIKO_CPP_PUGIXML_ROOT Path to the pugixml installation -# ISHIKO_CPP_XML_ROOT Path to the Ishiko/C++ XML installation -# ISHIKO_CPP_TESTFRAMEWORK_ROOT Path to the Ishiko/C++ TestFramework installation +# ISHIKO_CPP_SYNCHRONIZATION_ROOT Path to the Ishiko/C++ Synchronization installation +# ISHIKO_CPP_BASEPLATFORM_ROOT Path to the Ishiko/C++ BasePlatform installation +# ISHIKO_CPP_ERRORS_ROOT Path to the Ishiko/C++ Errors installation +# ISHIKO_CPP_FMT_ROOT Path to the fmt installation +# ISHIKO_CPP_MEMORY_ROOT Path to the Ishiko/C++ Memory installation +# ISHIKO_CPP_BOOST_ROOT Path to the Boost installation +# ISHIKO_CPP_TEXT_ROOT Path to the Ishiko/C++ Text installation +# ISHIKO_CPP_CONFIGURATION_ROOT Path to the Ishiko/C++ Configuration installation +# ISHIKO_CPP_IO_ROOT Path to the Ishiko/C++ IO installation +# ISHIKO_CPP_FILESYSTEM_ROOT Path to the Ishiko/C++ FileSystem installation +# ISHIKO_CPP_TYPES_ROOT Path to the Ishiko/C++ Types installation +# ISHIKO_CPP_DIFF_ROOT Path to the Ishiko/C++ Diff installation +# ISHIKO_CPP_PROCESS_ROOT Path to the Ishiko/C++ Process installation +# ISHIKO_CPP_TIME_ROOT Path to the Ishiko/C++ Time installation +# ISHIKO_CPP_PUGIXML_ROOT Path to the pugixml installation +# ISHIKO_CPP_XML_ROOT Path to the Ishiko/C++ XML installation +# ISHIKO_CPP_TESTFRAMEWORK_ROOT Path to the Ishiko/C++ TestFramework installation # Use "make RANLIB=''" for platforms without ranlib. RANLIB ?= ranlib @@ -73,6 +74,8 @@ endif # Configurable settings: # +# Path to the Ishiko/C++ Synchronization installation +ISHIKO_CPP_SYNCHRONIZATION_ROOT ?= $(ISHIKO_CPP_ROOT)/synchronization # Path to the Ishiko/C++ BasePlatform installation ISHIKO_CPP_BASEPLATFORM_ROOT ?= $(ISHIKO_CPP_ROOT)/base-platform # Path to the Ishiko/C++ Errors installation @@ -110,11 +113,14 @@ ISHIKO_CPP_TESTFRAMEWORK_ROOT ?= $(ISHIKO_CPP_ROOT)/test-framework all: $(_builddir)IshikoSynchronizationTests -$(_builddir)IshikoSynchronizationTests: $(_builddir)IshikoSynchronizationTests_main.o - $(CXX) -o $@ $(LDFLAGS) $(_builddir)IshikoSynchronizationTests_main.o -L$(ISHIKO_CPP_BASEPLATFORM_ROOT)/lib -L$(ISHIKO_CPP_ERRORS_ROOT)/lib -L$(ISHIKO_CPP_FMT_ROOT)/lib -L$(ISHIKO_CPP_MEMORY_ROOT)/lib -L$(ISHIKO_CPP_BOOST_ROOT)/lib -L$(ISHIKO_CPP_TEXT_ROOT)/lib -L$(ISHIKO_CPP_CONFIGURATION_ROOT)/lib -L$(ISHIKO_CPP_IO_ROOT)/lib -L$(ISHIKO_CPP_FILESYSTEM_ROOT)/lib -L$(ISHIKO_CPP_TYPES_ROOT)/lib -L$(ISHIKO_CPP_DIFF_ROOT)/lib -L$(ISHIKO_CPP_XML_ROOT)/lib -L$(ISHIKO_CPP_PROCESS_ROOT)/lib -L$(ISHIKO_CPP_TIME_ROOT)/lib -L$(ISHIKO_CPP_TESTFRAMEWORK_ROOT)/lib -lIshikoTestFrameworkCore -lIshikoConfiguration -lIshikoXML -lIshikoFileSystem -lIshikoIO -lIshikoProcess -lIshikoTime -lIshikoText -lIshikoErrors -lIshikoBasePlatform -lfmt -lboost_filesystem -pthread +$(_builddir)IshikoSynchronizationTests: $(_builddir)IshikoSynchronizationTests_main.o $(_builddir)IshikoSynchronizationTests_SpinlockTests.o + $(CXX) -o $@ $(LDFLAGS) $(_builddir)IshikoSynchronizationTests_main.o $(_builddir)IshikoSynchronizationTests_SpinlockTests.o -L$(ISHIKO_CPP_SYNCHRONIZATION_ROOT)/lib -L$(ISHIKO_CPP_BASEPLATFORM_ROOT)/lib -L$(ISHIKO_CPP_ERRORS_ROOT)/lib -L$(ISHIKO_CPP_FMT_ROOT)/lib -L$(ISHIKO_CPP_MEMORY_ROOT)/lib -L$(ISHIKO_CPP_BOOST_ROOT)/lib -L$(ISHIKO_CPP_TEXT_ROOT)/lib -L$(ISHIKO_CPP_CONFIGURATION_ROOT)/lib -L$(ISHIKO_CPP_IO_ROOT)/lib -L$(ISHIKO_CPP_FILESYSTEM_ROOT)/lib -L$(ISHIKO_CPP_TYPES_ROOT)/lib -L$(ISHIKO_CPP_DIFF_ROOT)/lib -L$(ISHIKO_CPP_XML_ROOT)/lib -L$(ISHIKO_CPP_PROCESS_ROOT)/lib -L$(ISHIKO_CPP_TIME_ROOT)/lib -L$(ISHIKO_CPP_TESTFRAMEWORK_ROOT)/lib -lIshikoTestFrameworkCore -lIshikoConfiguration -lIshikoXML -lIshikoFileSystem -lIshikoIO -lIshikoProcess -lIshikoTime -lIshikoText -lIshikoErrors -lIshikoBasePlatform -lfmt -lboost_filesystem -pthread $(_builddir)IshikoSynchronizationTests_main.o: ../../src/main.cpp - $(CXX) -c -o $@ $(CPPFLAGS) $(CXXFLAGS) -MD -MP -pthread -DPUGIXML_HEADER_ONLY -I$(ISHIKO_CPP_BASEPLATFORM_ROOT)/include -I$(ISHIKO_CPP_ERRORS_ROOT)/include -I$(ISHIKO_CPP_FMT_ROOT)/include -I$(ISHIKO_CPP_MEMORY_ROOT)/include -I$(ISHIKO_CPP_BOOST_ROOT)/include -I$(ISHIKO_CPP_TEXT_ROOT)/include -I$(ISHIKO_CPP_CONFIGURATION_ROOT)/include -I$(ISHIKO_CPP_IO_ROOT)/include -I$(ISHIKO_CPP_FILESYSTEM_ROOT)/include -I$(ISHIKO_CPP_TYPES_ROOT)/include -I$(ISHIKO_CPP_DIFF_ROOT)/include -I$(ISHIKO_CPP_PUGIXML_ROOT)/src -I$(ISHIKO_CPP_XML_ROOT)/include -I$(ISHIKO_CPP_PROCESS_ROOT)/include -I$(ISHIKO_CPP_TIME_ROOT)/include -I$(ISHIKO_CPP_TESTFRAMEWORK_ROOT)/include -std=c++14 ../../src/main.cpp + $(CXX) -c -o $@ $(CPPFLAGS) $(CXXFLAGS) -MD -MP -pthread -DPUGIXML_HEADER_ONLY -I$(ISHIKO_CPP_SYNCHRONIZATION_ROOT)/include -I$(ISHIKO_CPP_BASEPLATFORM_ROOT)/include -I$(ISHIKO_CPP_ERRORS_ROOT)/include -I$(ISHIKO_CPP_FMT_ROOT)/include -I$(ISHIKO_CPP_MEMORY_ROOT)/include -I$(ISHIKO_CPP_BOOST_ROOT)/include -I$(ISHIKO_CPP_TEXT_ROOT)/include -I$(ISHIKO_CPP_CONFIGURATION_ROOT)/include -I$(ISHIKO_CPP_IO_ROOT)/include -I$(ISHIKO_CPP_FILESYSTEM_ROOT)/include -I$(ISHIKO_CPP_TYPES_ROOT)/include -I$(ISHIKO_CPP_DIFF_ROOT)/include -I$(ISHIKO_CPP_PUGIXML_ROOT)/src -I$(ISHIKO_CPP_XML_ROOT)/include -I$(ISHIKO_CPP_PROCESS_ROOT)/include -I$(ISHIKO_CPP_TIME_ROOT)/include -I$(ISHIKO_CPP_TESTFRAMEWORK_ROOT)/include -std=c++14 ../../src/main.cpp + +$(_builddir)IshikoSynchronizationTests_SpinlockTests.o: ../../src/SpinlockTests.cpp + $(CXX) -c -o $@ $(CPPFLAGS) $(CXXFLAGS) -MD -MP -pthread -DPUGIXML_HEADER_ONLY -I$(ISHIKO_CPP_SYNCHRONIZATION_ROOT)/include -I$(ISHIKO_CPP_BASEPLATFORM_ROOT)/include -I$(ISHIKO_CPP_ERRORS_ROOT)/include -I$(ISHIKO_CPP_FMT_ROOT)/include -I$(ISHIKO_CPP_MEMORY_ROOT)/include -I$(ISHIKO_CPP_BOOST_ROOT)/include -I$(ISHIKO_CPP_TEXT_ROOT)/include -I$(ISHIKO_CPP_CONFIGURATION_ROOT)/include -I$(ISHIKO_CPP_IO_ROOT)/include -I$(ISHIKO_CPP_FILESYSTEM_ROOT)/include -I$(ISHIKO_CPP_TYPES_ROOT)/include -I$(ISHIKO_CPP_DIFF_ROOT)/include -I$(ISHIKO_CPP_PUGIXML_ROOT)/src -I$(ISHIKO_CPP_XML_ROOT)/include -I$(ISHIKO_CPP_PROCESS_ROOT)/include -I$(ISHIKO_CPP_TIME_ROOT)/include -I$(ISHIKO_CPP_TESTFRAMEWORK_ROOT)/include -std=c++14 ../../src/SpinlockTests.cpp clean: rm -f $(_builddir)*.o diff --git a/tests/build-files/vc15/IshikoSynchronizationTests.vcxproj b/tests/build-files/vc15/IshikoSynchronizationTests.vcxproj index de4c657..d698507 100644 --- a/tests/build-files/vc15/IshikoSynchronizationTests.vcxproj +++ b/tests/build-files/vc15/IshikoSynchronizationTests.vcxproj @@ -86,14 +86,14 @@ PUGIXML_HEADER_ONLY;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) true false - $(ISHIKO_CPP_ROOT)/base-platform\include;$(ISHIKO_CPP_ROOT)/errors\include;$(FMT_ROOT)\include;$(ISHIKO_CPP_ROOT)/memory\include;$(BOOST_ROOT);$(ISHIKO_CPP_ROOT)/text\include;$(ISHIKO_CPP_ROOT)/configuration\include;$(ISHIKO_CPP_ROOT)/io\include;$(ISHIKO_CPP_ROOT)/filesystem\include;$(ISHIKO_CPP_ROOT)/types\include;$(ISHIKO_CPP_ROOT)/diff\include;$(PUGIXML_ROOT)\src;$(ISHIKO_CPP_ROOT)/xml\include;$(ISHIKO_CPP_ROOT)/process\include;$(ISHIKO_CPP_ROOT)/time\include;$(ISHIKO_CPP_ROOT)/test-framework\include;%(AdditionalIncludeDirectories) + $(ISHIKO_CPP_ROOT)/synchronization\include;$(ISHIKO_CPP_ROOT)/base-platform\include;$(ISHIKO_CPP_ROOT)/errors\include;$(FMT_ROOT)\include;$(ISHIKO_CPP_ROOT)/memory\include;$(BOOST_ROOT);$(ISHIKO_CPP_ROOT)/text\include;$(ISHIKO_CPP_ROOT)/configuration\include;$(ISHIKO_CPP_ROOT)/io\include;$(ISHIKO_CPP_ROOT)/filesystem\include;$(ISHIKO_CPP_ROOT)/types\include;$(ISHIKO_CPP_ROOT)/diff\include;$(PUGIXML_ROOT)\src;$(ISHIKO_CPP_ROOT)/xml\include;$(ISHIKO_CPP_ROOT)/process\include;$(ISHIKO_CPP_ROOT)/time\include;$(ISHIKO_CPP_ROOT)/test-framework\include;%(AdditionalIncludeDirectories) MultiThreadedDebugDLL /utf-8 %(AdditionalOptions) Console true - $(ISHIKO_CPP_ROOT)/base-platform\lib\$(Platform);$(ISHIKO_CPP_ROOT)/errors\lib\$(Platform);$(FMT_ROOT)\lib;$(ISHIKO_CPP_ROOT)/memory\lib\$(Platform);$(BOOST_ROOT)\stage\lib;$(ISHIKO_CPP_ROOT)/text\lib\$(Platform);$(ISHIKO_CPP_ROOT)/configuration\lib\$(Platform);$(ISHIKO_CPP_ROOT)/io\lib\$(Platform);$(ISHIKO_CPP_ROOT)/filesystem\lib\$(Platform);$(ISHIKO_CPP_ROOT)/types\lib\$(Platform);$(ISHIKO_CPP_ROOT)/diff\lib\$(Platform);$(ISHIKO_CPP_ROOT)/xml\lib\$(Platform);$(ISHIKO_CPP_ROOT)/process\lib\$(Platform);$(ISHIKO_CPP_ROOT)/time\lib\$(Platform);$(ISHIKO_CPP_ROOT)/test-framework\lib\$(Platform);%(AdditionalLibraryDirectories) + $(ISHIKO_CPP_ROOT)/synchronization\lib\$(Platform);$(ISHIKO_CPP_ROOT)/base-platform\lib\$(Platform);$(ISHIKO_CPP_ROOT)/errors\lib\$(Platform);$(FMT_ROOT)\lib;$(ISHIKO_CPP_ROOT)/memory\lib\$(Platform);$(BOOST_ROOT)\stage\lib;$(ISHIKO_CPP_ROOT)/text\lib\$(Platform);$(ISHIKO_CPP_ROOT)/configuration\lib\$(Platform);$(ISHIKO_CPP_ROOT)/io\lib\$(Platform);$(ISHIKO_CPP_ROOT)/filesystem\lib\$(Platform);$(ISHIKO_CPP_ROOT)/types\lib\$(Platform);$(ISHIKO_CPP_ROOT)/diff\lib\$(Platform);$(ISHIKO_CPP_ROOT)/xml\lib\$(Platform);$(ISHIKO_CPP_ROOT)/process\lib\$(Platform);$(ISHIKO_CPP_ROOT)/time\lib\$(Platform);$(ISHIKO_CPP_ROOT)/test-framework\lib\$(Platform);%(AdditionalLibraryDirectories) fmt-d-x64.lib;%(AdditionalDependencies) @@ -104,14 +104,14 @@ PUGIXML_HEADER_ONLY;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) true false - $(ISHIKO_CPP_ROOT)/base-platform\include;$(ISHIKO_CPP_ROOT)/errors\include;$(FMT_ROOT)\include;$(ISHIKO_CPP_ROOT)/memory\include;$(BOOST_ROOT);$(ISHIKO_CPP_ROOT)/text\include;$(ISHIKO_CPP_ROOT)/configuration\include;$(ISHIKO_CPP_ROOT)/io\include;$(ISHIKO_CPP_ROOT)/filesystem\include;$(ISHIKO_CPP_ROOT)/types\include;$(ISHIKO_CPP_ROOT)/diff\include;$(PUGIXML_ROOT)\src;$(ISHIKO_CPP_ROOT)/xml\include;$(ISHIKO_CPP_ROOT)/process\include;$(ISHIKO_CPP_ROOT)/time\include;$(ISHIKO_CPP_ROOT)/test-framework\include;%(AdditionalIncludeDirectories) + $(ISHIKO_CPP_ROOT)/synchronization\include;$(ISHIKO_CPP_ROOT)/base-platform\include;$(ISHIKO_CPP_ROOT)/errors\include;$(FMT_ROOT)\include;$(ISHIKO_CPP_ROOT)/memory\include;$(BOOST_ROOT);$(ISHIKO_CPP_ROOT)/text\include;$(ISHIKO_CPP_ROOT)/configuration\include;$(ISHIKO_CPP_ROOT)/io\include;$(ISHIKO_CPP_ROOT)/filesystem\include;$(ISHIKO_CPP_ROOT)/types\include;$(ISHIKO_CPP_ROOT)/diff\include;$(PUGIXML_ROOT)\src;$(ISHIKO_CPP_ROOT)/xml\include;$(ISHIKO_CPP_ROOT)/process\include;$(ISHIKO_CPP_ROOT)/time\include;$(ISHIKO_CPP_ROOT)/test-framework\include;%(AdditionalIncludeDirectories) MultiThreadedDebugDLL /utf-8 %(AdditionalOptions) Console true - $(ISHIKO_CPP_ROOT)/base-platform\lib\$(Platform);$(ISHIKO_CPP_ROOT)/errors\lib\$(Platform);$(FMT_ROOT)\lib;$(ISHIKO_CPP_ROOT)/memory\lib\$(Platform);$(BOOST_ROOT)\stage\lib;$(ISHIKO_CPP_ROOT)/text\lib\$(Platform);$(ISHIKO_CPP_ROOT)/configuration\lib\$(Platform);$(ISHIKO_CPP_ROOT)/io\lib\$(Platform);$(ISHIKO_CPP_ROOT)/filesystem\lib\$(Platform);$(ISHIKO_CPP_ROOT)/types\lib\$(Platform);$(ISHIKO_CPP_ROOT)/diff\lib\$(Platform);$(ISHIKO_CPP_ROOT)/xml\lib\$(Platform);$(ISHIKO_CPP_ROOT)/process\lib\$(Platform);$(ISHIKO_CPP_ROOT)/time\lib\$(Platform);$(ISHIKO_CPP_ROOT)/test-framework\lib\$(Platform);%(AdditionalLibraryDirectories) + $(ISHIKO_CPP_ROOT)/synchronization\lib\$(Platform);$(ISHIKO_CPP_ROOT)/base-platform\lib\$(Platform);$(ISHIKO_CPP_ROOT)/errors\lib\$(Platform);$(FMT_ROOT)\lib;$(ISHIKO_CPP_ROOT)/memory\lib\$(Platform);$(BOOST_ROOT)\stage\lib;$(ISHIKO_CPP_ROOT)/text\lib\$(Platform);$(ISHIKO_CPP_ROOT)/configuration\lib\$(Platform);$(ISHIKO_CPP_ROOT)/io\lib\$(Platform);$(ISHIKO_CPP_ROOT)/filesystem\lib\$(Platform);$(ISHIKO_CPP_ROOT)/types\lib\$(Platform);$(ISHIKO_CPP_ROOT)/diff\lib\$(Platform);$(ISHIKO_CPP_ROOT)/xml\lib\$(Platform);$(ISHIKO_CPP_ROOT)/process\lib\$(Platform);$(ISHIKO_CPP_ROOT)/time\lib\$(Platform);$(ISHIKO_CPP_ROOT)/test-framework\lib\$(Platform);%(AdditionalLibraryDirectories) fmt-d-x64.lib;%(AdditionalDependencies) @@ -124,7 +124,7 @@ PUGIXML_HEADER_ONLY;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) true false - $(ISHIKO_CPP_ROOT)/base-platform\include;$(ISHIKO_CPP_ROOT)/errors\include;$(FMT_ROOT)\include;$(ISHIKO_CPP_ROOT)/memory\include;$(BOOST_ROOT);$(ISHIKO_CPP_ROOT)/text\include;$(ISHIKO_CPP_ROOT)/configuration\include;$(ISHIKO_CPP_ROOT)/io\include;$(ISHIKO_CPP_ROOT)/filesystem\include;$(ISHIKO_CPP_ROOT)/types\include;$(ISHIKO_CPP_ROOT)/diff\include;$(PUGIXML_ROOT)\src;$(ISHIKO_CPP_ROOT)/xml\include;$(ISHIKO_CPP_ROOT)/process\include;$(ISHIKO_CPP_ROOT)/time\include;$(ISHIKO_CPP_ROOT)/test-framework\include;%(AdditionalIncludeDirectories) + $(ISHIKO_CPP_ROOT)/synchronization\include;$(ISHIKO_CPP_ROOT)/base-platform\include;$(ISHIKO_CPP_ROOT)/errors\include;$(FMT_ROOT)\include;$(ISHIKO_CPP_ROOT)/memory\include;$(BOOST_ROOT);$(ISHIKO_CPP_ROOT)/text\include;$(ISHIKO_CPP_ROOT)/configuration\include;$(ISHIKO_CPP_ROOT)/io\include;$(ISHIKO_CPP_ROOT)/filesystem\include;$(ISHIKO_CPP_ROOT)/types\include;$(ISHIKO_CPP_ROOT)/diff\include;$(PUGIXML_ROOT)\src;$(ISHIKO_CPP_ROOT)/xml\include;$(ISHIKO_CPP_ROOT)/process\include;$(ISHIKO_CPP_ROOT)/time\include;$(ISHIKO_CPP_ROOT)/test-framework\include;%(AdditionalIncludeDirectories) MultiThreadedDLL /utf-8 %(AdditionalOptions) @@ -133,7 +133,7 @@ true true true - $(ISHIKO_CPP_ROOT)/base-platform\lib\$(Platform);$(ISHIKO_CPP_ROOT)/errors\lib\$(Platform);$(FMT_ROOT)\lib;$(ISHIKO_CPP_ROOT)/memory\lib\$(Platform);$(BOOST_ROOT)\stage\lib;$(ISHIKO_CPP_ROOT)/text\lib\$(Platform);$(ISHIKO_CPP_ROOT)/configuration\lib\$(Platform);$(ISHIKO_CPP_ROOT)/io\lib\$(Platform);$(ISHIKO_CPP_ROOT)/filesystem\lib\$(Platform);$(ISHIKO_CPP_ROOT)/types\lib\$(Platform);$(ISHIKO_CPP_ROOT)/diff\lib\$(Platform);$(ISHIKO_CPP_ROOT)/xml\lib\$(Platform);$(ISHIKO_CPP_ROOT)/process\lib\$(Platform);$(ISHIKO_CPP_ROOT)/time\lib\$(Platform);$(ISHIKO_CPP_ROOT)/test-framework\lib\$(Platform);%(AdditionalLibraryDirectories) + $(ISHIKO_CPP_ROOT)/synchronization\lib\$(Platform);$(ISHIKO_CPP_ROOT)/base-platform\lib\$(Platform);$(ISHIKO_CPP_ROOT)/errors\lib\$(Platform);$(FMT_ROOT)\lib;$(ISHIKO_CPP_ROOT)/memory\lib\$(Platform);$(BOOST_ROOT)\stage\lib;$(ISHIKO_CPP_ROOT)/text\lib\$(Platform);$(ISHIKO_CPP_ROOT)/configuration\lib\$(Platform);$(ISHIKO_CPP_ROOT)/io\lib\$(Platform);$(ISHIKO_CPP_ROOT)/filesystem\lib\$(Platform);$(ISHIKO_CPP_ROOT)/types\lib\$(Platform);$(ISHIKO_CPP_ROOT)/diff\lib\$(Platform);$(ISHIKO_CPP_ROOT)/xml\lib\$(Platform);$(ISHIKO_CPP_ROOT)/process\lib\$(Platform);$(ISHIKO_CPP_ROOT)/time\lib\$(Platform);$(ISHIKO_CPP_ROOT)/test-framework\lib\$(Platform);%(AdditionalLibraryDirectories) fmt-d-x64.lib;%(AdditionalDependencies) @@ -146,7 +146,7 @@ PUGIXML_HEADER_ONLY;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) true false - $(ISHIKO_CPP_ROOT)/base-platform\include;$(ISHIKO_CPP_ROOT)/errors\include;$(FMT_ROOT)\include;$(ISHIKO_CPP_ROOT)/memory\include;$(BOOST_ROOT);$(ISHIKO_CPP_ROOT)/text\include;$(ISHIKO_CPP_ROOT)/configuration\include;$(ISHIKO_CPP_ROOT)/io\include;$(ISHIKO_CPP_ROOT)/filesystem\include;$(ISHIKO_CPP_ROOT)/types\include;$(ISHIKO_CPP_ROOT)/diff\include;$(PUGIXML_ROOT)\src;$(ISHIKO_CPP_ROOT)/xml\include;$(ISHIKO_CPP_ROOT)/process\include;$(ISHIKO_CPP_ROOT)/time\include;$(ISHIKO_CPP_ROOT)/test-framework\include;%(AdditionalIncludeDirectories) + $(ISHIKO_CPP_ROOT)/synchronization\include;$(ISHIKO_CPP_ROOT)/base-platform\include;$(ISHIKO_CPP_ROOT)/errors\include;$(FMT_ROOT)\include;$(ISHIKO_CPP_ROOT)/memory\include;$(BOOST_ROOT);$(ISHIKO_CPP_ROOT)/text\include;$(ISHIKO_CPP_ROOT)/configuration\include;$(ISHIKO_CPP_ROOT)/io\include;$(ISHIKO_CPP_ROOT)/filesystem\include;$(ISHIKO_CPP_ROOT)/types\include;$(ISHIKO_CPP_ROOT)/diff\include;$(PUGIXML_ROOT)\src;$(ISHIKO_CPP_ROOT)/xml\include;$(ISHIKO_CPP_ROOT)/process\include;$(ISHIKO_CPP_ROOT)/time\include;$(ISHIKO_CPP_ROOT)/test-framework\include;%(AdditionalIncludeDirectories) MultiThreadedDLL /utf-8 %(AdditionalOptions) @@ -155,12 +155,16 @@ true true true - $(ISHIKO_CPP_ROOT)/base-platform\lib\$(Platform);$(ISHIKO_CPP_ROOT)/errors\lib\$(Platform);$(FMT_ROOT)\lib;$(ISHIKO_CPP_ROOT)/memory\lib\$(Platform);$(BOOST_ROOT)\stage\lib;$(ISHIKO_CPP_ROOT)/text\lib\$(Platform);$(ISHIKO_CPP_ROOT)/configuration\lib\$(Platform);$(ISHIKO_CPP_ROOT)/io\lib\$(Platform);$(ISHIKO_CPP_ROOT)/filesystem\lib\$(Platform);$(ISHIKO_CPP_ROOT)/types\lib\$(Platform);$(ISHIKO_CPP_ROOT)/diff\lib\$(Platform);$(ISHIKO_CPP_ROOT)/xml\lib\$(Platform);$(ISHIKO_CPP_ROOT)/process\lib\$(Platform);$(ISHIKO_CPP_ROOT)/time\lib\$(Platform);$(ISHIKO_CPP_ROOT)/test-framework\lib\$(Platform);%(AdditionalLibraryDirectories) + $(ISHIKO_CPP_ROOT)/synchronization\lib\$(Platform);$(ISHIKO_CPP_ROOT)/base-platform\lib\$(Platform);$(ISHIKO_CPP_ROOT)/errors\lib\$(Platform);$(FMT_ROOT)\lib;$(ISHIKO_CPP_ROOT)/memory\lib\$(Platform);$(BOOST_ROOT)\stage\lib;$(ISHIKO_CPP_ROOT)/text\lib\$(Platform);$(ISHIKO_CPP_ROOT)/configuration\lib\$(Platform);$(ISHIKO_CPP_ROOT)/io\lib\$(Platform);$(ISHIKO_CPP_ROOT)/filesystem\lib\$(Platform);$(ISHIKO_CPP_ROOT)/types\lib\$(Platform);$(ISHIKO_CPP_ROOT)/diff\lib\$(Platform);$(ISHIKO_CPP_ROOT)/xml\lib\$(Platform);$(ISHIKO_CPP_ROOT)/process\lib\$(Platform);$(ISHIKO_CPP_ROOT)/time\lib\$(Platform);$(ISHIKO_CPP_ROOT)/test-framework\lib\$(Platform);%(AdditionalLibraryDirectories) fmt-d-x64.lib;%(AdditionalDependencies) + + + + diff --git a/tests/build-files/vc15/IshikoSynchronizationTests.vcxproj.filters b/tests/build-files/vc15/IshikoSynchronizationTests.vcxproj.filters index 1347ef1..0f16eb2 100644 --- a/tests/build-files/vc15/IshikoSynchronizationTests.vcxproj.filters +++ b/tests/build-files/vc15/IshikoSynchronizationTests.vcxproj.filters @@ -16,9 +16,17 @@ rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms + + + Header Files + + Source Files + + Source Files + diff --git a/tests/build-files/vc16/IshikoSynchronizationTests.vcxproj b/tests/build-files/vc16/IshikoSynchronizationTests.vcxproj index a57dbab..62d6115 100644 --- a/tests/build-files/vc16/IshikoSynchronizationTests.vcxproj +++ b/tests/build-files/vc16/IshikoSynchronizationTests.vcxproj @@ -86,14 +86,14 @@ PUGIXML_HEADER_ONLY;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) true false - $(ISHIKO_CPP_ROOT)/base-platform\include;$(ISHIKO_CPP_ROOT)/errors\include;$(FMT_ROOT)\include;$(ISHIKO_CPP_ROOT)/memory\include;$(BOOST_ROOT);$(ISHIKO_CPP_ROOT)/text\include;$(ISHIKO_CPP_ROOT)/configuration\include;$(ISHIKO_CPP_ROOT)/io\include;$(ISHIKO_CPP_ROOT)/filesystem\include;$(ISHIKO_CPP_ROOT)/types\include;$(ISHIKO_CPP_ROOT)/diff\include;$(PUGIXML_ROOT)\src;$(ISHIKO_CPP_ROOT)/xml\include;$(ISHIKO_CPP_ROOT)/process\include;$(ISHIKO_CPP_ROOT)/time\include;$(ISHIKO_CPP_ROOT)/test-framework\include;%(AdditionalIncludeDirectories) + $(ISHIKO_CPP_ROOT)/synchronization\include;$(ISHIKO_CPP_ROOT)/base-platform\include;$(ISHIKO_CPP_ROOT)/errors\include;$(FMT_ROOT)\include;$(ISHIKO_CPP_ROOT)/memory\include;$(BOOST_ROOT);$(ISHIKO_CPP_ROOT)/text\include;$(ISHIKO_CPP_ROOT)/configuration\include;$(ISHIKO_CPP_ROOT)/io\include;$(ISHIKO_CPP_ROOT)/filesystem\include;$(ISHIKO_CPP_ROOT)/types\include;$(ISHIKO_CPP_ROOT)/diff\include;$(PUGIXML_ROOT)\src;$(ISHIKO_CPP_ROOT)/xml\include;$(ISHIKO_CPP_ROOT)/process\include;$(ISHIKO_CPP_ROOT)/time\include;$(ISHIKO_CPP_ROOT)/test-framework\include;%(AdditionalIncludeDirectories) MultiThreadedDebugDLL /utf-8 %(AdditionalOptions) Console true - $(ISHIKO_CPP_ROOT)/base-platform\lib\$(Platform);$(ISHIKO_CPP_ROOT)/errors\lib\$(Platform);$(FMT_ROOT)\lib;$(ISHIKO_CPP_ROOT)/memory\lib\$(Platform);$(BOOST_ROOT)\stage\lib;$(ISHIKO_CPP_ROOT)/text\lib\$(Platform);$(ISHIKO_CPP_ROOT)/configuration\lib\$(Platform);$(ISHIKO_CPP_ROOT)/io\lib\$(Platform);$(ISHIKO_CPP_ROOT)/filesystem\lib\$(Platform);$(ISHIKO_CPP_ROOT)/types\lib\$(Platform);$(ISHIKO_CPP_ROOT)/diff\lib\$(Platform);$(ISHIKO_CPP_ROOT)/xml\lib\$(Platform);$(ISHIKO_CPP_ROOT)/process\lib\$(Platform);$(ISHIKO_CPP_ROOT)/time\lib\$(Platform);$(ISHIKO_CPP_ROOT)/test-framework\lib\$(Platform);%(AdditionalLibraryDirectories) + $(ISHIKO_CPP_ROOT)/synchronization\lib\$(Platform);$(ISHIKO_CPP_ROOT)/base-platform\lib\$(Platform);$(ISHIKO_CPP_ROOT)/errors\lib\$(Platform);$(FMT_ROOT)\lib;$(ISHIKO_CPP_ROOT)/memory\lib\$(Platform);$(BOOST_ROOT)\stage\lib;$(ISHIKO_CPP_ROOT)/text\lib\$(Platform);$(ISHIKO_CPP_ROOT)/configuration\lib\$(Platform);$(ISHIKO_CPP_ROOT)/io\lib\$(Platform);$(ISHIKO_CPP_ROOT)/filesystem\lib\$(Platform);$(ISHIKO_CPP_ROOT)/types\lib\$(Platform);$(ISHIKO_CPP_ROOT)/diff\lib\$(Platform);$(ISHIKO_CPP_ROOT)/xml\lib\$(Platform);$(ISHIKO_CPP_ROOT)/process\lib\$(Platform);$(ISHIKO_CPP_ROOT)/time\lib\$(Platform);$(ISHIKO_CPP_ROOT)/test-framework\lib\$(Platform);%(AdditionalLibraryDirectories) fmt-d-x64.lib;%(AdditionalDependencies) @@ -104,14 +104,14 @@ PUGIXML_HEADER_ONLY;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) true false - $(ISHIKO_CPP_ROOT)/base-platform\include;$(ISHIKO_CPP_ROOT)/errors\include;$(FMT_ROOT)\include;$(ISHIKO_CPP_ROOT)/memory\include;$(BOOST_ROOT);$(ISHIKO_CPP_ROOT)/text\include;$(ISHIKO_CPP_ROOT)/configuration\include;$(ISHIKO_CPP_ROOT)/io\include;$(ISHIKO_CPP_ROOT)/filesystem\include;$(ISHIKO_CPP_ROOT)/types\include;$(ISHIKO_CPP_ROOT)/diff\include;$(PUGIXML_ROOT)\src;$(ISHIKO_CPP_ROOT)/xml\include;$(ISHIKO_CPP_ROOT)/process\include;$(ISHIKO_CPP_ROOT)/time\include;$(ISHIKO_CPP_ROOT)/test-framework\include;%(AdditionalIncludeDirectories) + $(ISHIKO_CPP_ROOT)/synchronization\include;$(ISHIKO_CPP_ROOT)/base-platform\include;$(ISHIKO_CPP_ROOT)/errors\include;$(FMT_ROOT)\include;$(ISHIKO_CPP_ROOT)/memory\include;$(BOOST_ROOT);$(ISHIKO_CPP_ROOT)/text\include;$(ISHIKO_CPP_ROOT)/configuration\include;$(ISHIKO_CPP_ROOT)/io\include;$(ISHIKO_CPP_ROOT)/filesystem\include;$(ISHIKO_CPP_ROOT)/types\include;$(ISHIKO_CPP_ROOT)/diff\include;$(PUGIXML_ROOT)\src;$(ISHIKO_CPP_ROOT)/xml\include;$(ISHIKO_CPP_ROOT)/process\include;$(ISHIKO_CPP_ROOT)/time\include;$(ISHIKO_CPP_ROOT)/test-framework\include;%(AdditionalIncludeDirectories) MultiThreadedDebugDLL /utf-8 %(AdditionalOptions) Console true - $(ISHIKO_CPP_ROOT)/base-platform\lib\$(Platform);$(ISHIKO_CPP_ROOT)/errors\lib\$(Platform);$(FMT_ROOT)\lib;$(ISHIKO_CPP_ROOT)/memory\lib\$(Platform);$(BOOST_ROOT)\stage\lib;$(ISHIKO_CPP_ROOT)/text\lib\$(Platform);$(ISHIKO_CPP_ROOT)/configuration\lib\$(Platform);$(ISHIKO_CPP_ROOT)/io\lib\$(Platform);$(ISHIKO_CPP_ROOT)/filesystem\lib\$(Platform);$(ISHIKO_CPP_ROOT)/types\lib\$(Platform);$(ISHIKO_CPP_ROOT)/diff\lib\$(Platform);$(ISHIKO_CPP_ROOT)/xml\lib\$(Platform);$(ISHIKO_CPP_ROOT)/process\lib\$(Platform);$(ISHIKO_CPP_ROOT)/time\lib\$(Platform);$(ISHIKO_CPP_ROOT)/test-framework\lib\$(Platform);%(AdditionalLibraryDirectories) + $(ISHIKO_CPP_ROOT)/synchronization\lib\$(Platform);$(ISHIKO_CPP_ROOT)/base-platform\lib\$(Platform);$(ISHIKO_CPP_ROOT)/errors\lib\$(Platform);$(FMT_ROOT)\lib;$(ISHIKO_CPP_ROOT)/memory\lib\$(Platform);$(BOOST_ROOT)\stage\lib;$(ISHIKO_CPP_ROOT)/text\lib\$(Platform);$(ISHIKO_CPP_ROOT)/configuration\lib\$(Platform);$(ISHIKO_CPP_ROOT)/io\lib\$(Platform);$(ISHIKO_CPP_ROOT)/filesystem\lib\$(Platform);$(ISHIKO_CPP_ROOT)/types\lib\$(Platform);$(ISHIKO_CPP_ROOT)/diff\lib\$(Platform);$(ISHIKO_CPP_ROOT)/xml\lib\$(Platform);$(ISHIKO_CPP_ROOT)/process\lib\$(Platform);$(ISHIKO_CPP_ROOT)/time\lib\$(Platform);$(ISHIKO_CPP_ROOT)/test-framework\lib\$(Platform);%(AdditionalLibraryDirectories) fmt-d-x64.lib;%(AdditionalDependencies) @@ -124,7 +124,7 @@ PUGIXML_HEADER_ONLY;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) true false - $(ISHIKO_CPP_ROOT)/base-platform\include;$(ISHIKO_CPP_ROOT)/errors\include;$(FMT_ROOT)\include;$(ISHIKO_CPP_ROOT)/memory\include;$(BOOST_ROOT);$(ISHIKO_CPP_ROOT)/text\include;$(ISHIKO_CPP_ROOT)/configuration\include;$(ISHIKO_CPP_ROOT)/io\include;$(ISHIKO_CPP_ROOT)/filesystem\include;$(ISHIKO_CPP_ROOT)/types\include;$(ISHIKO_CPP_ROOT)/diff\include;$(PUGIXML_ROOT)\src;$(ISHIKO_CPP_ROOT)/xml\include;$(ISHIKO_CPP_ROOT)/process\include;$(ISHIKO_CPP_ROOT)/time\include;$(ISHIKO_CPP_ROOT)/test-framework\include;%(AdditionalIncludeDirectories) + $(ISHIKO_CPP_ROOT)/synchronization\include;$(ISHIKO_CPP_ROOT)/base-platform\include;$(ISHIKO_CPP_ROOT)/errors\include;$(FMT_ROOT)\include;$(ISHIKO_CPP_ROOT)/memory\include;$(BOOST_ROOT);$(ISHIKO_CPP_ROOT)/text\include;$(ISHIKO_CPP_ROOT)/configuration\include;$(ISHIKO_CPP_ROOT)/io\include;$(ISHIKO_CPP_ROOT)/filesystem\include;$(ISHIKO_CPP_ROOT)/types\include;$(ISHIKO_CPP_ROOT)/diff\include;$(PUGIXML_ROOT)\src;$(ISHIKO_CPP_ROOT)/xml\include;$(ISHIKO_CPP_ROOT)/process\include;$(ISHIKO_CPP_ROOT)/time\include;$(ISHIKO_CPP_ROOT)/test-framework\include;%(AdditionalIncludeDirectories) MultiThreadedDLL /utf-8 %(AdditionalOptions) @@ -133,7 +133,7 @@ true true true - $(ISHIKO_CPP_ROOT)/base-platform\lib\$(Platform);$(ISHIKO_CPP_ROOT)/errors\lib\$(Platform);$(FMT_ROOT)\lib;$(ISHIKO_CPP_ROOT)/memory\lib\$(Platform);$(BOOST_ROOT)\stage\lib;$(ISHIKO_CPP_ROOT)/text\lib\$(Platform);$(ISHIKO_CPP_ROOT)/configuration\lib\$(Platform);$(ISHIKO_CPP_ROOT)/io\lib\$(Platform);$(ISHIKO_CPP_ROOT)/filesystem\lib\$(Platform);$(ISHIKO_CPP_ROOT)/types\lib\$(Platform);$(ISHIKO_CPP_ROOT)/diff\lib\$(Platform);$(ISHIKO_CPP_ROOT)/xml\lib\$(Platform);$(ISHIKO_CPP_ROOT)/process\lib\$(Platform);$(ISHIKO_CPP_ROOT)/time\lib\$(Platform);$(ISHIKO_CPP_ROOT)/test-framework\lib\$(Platform);%(AdditionalLibraryDirectories) + $(ISHIKO_CPP_ROOT)/synchronization\lib\$(Platform);$(ISHIKO_CPP_ROOT)/base-platform\lib\$(Platform);$(ISHIKO_CPP_ROOT)/errors\lib\$(Platform);$(FMT_ROOT)\lib;$(ISHIKO_CPP_ROOT)/memory\lib\$(Platform);$(BOOST_ROOT)\stage\lib;$(ISHIKO_CPP_ROOT)/text\lib\$(Platform);$(ISHIKO_CPP_ROOT)/configuration\lib\$(Platform);$(ISHIKO_CPP_ROOT)/io\lib\$(Platform);$(ISHIKO_CPP_ROOT)/filesystem\lib\$(Platform);$(ISHIKO_CPP_ROOT)/types\lib\$(Platform);$(ISHIKO_CPP_ROOT)/diff\lib\$(Platform);$(ISHIKO_CPP_ROOT)/xml\lib\$(Platform);$(ISHIKO_CPP_ROOT)/process\lib\$(Platform);$(ISHIKO_CPP_ROOT)/time\lib\$(Platform);$(ISHIKO_CPP_ROOT)/test-framework\lib\$(Platform);%(AdditionalLibraryDirectories) fmt-d-x64.lib;%(AdditionalDependencies) @@ -146,7 +146,7 @@ PUGIXML_HEADER_ONLY;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) true false - $(ISHIKO_CPP_ROOT)/base-platform\include;$(ISHIKO_CPP_ROOT)/errors\include;$(FMT_ROOT)\include;$(ISHIKO_CPP_ROOT)/memory\include;$(BOOST_ROOT);$(ISHIKO_CPP_ROOT)/text\include;$(ISHIKO_CPP_ROOT)/configuration\include;$(ISHIKO_CPP_ROOT)/io\include;$(ISHIKO_CPP_ROOT)/filesystem\include;$(ISHIKO_CPP_ROOT)/types\include;$(ISHIKO_CPP_ROOT)/diff\include;$(PUGIXML_ROOT)\src;$(ISHIKO_CPP_ROOT)/xml\include;$(ISHIKO_CPP_ROOT)/process\include;$(ISHIKO_CPP_ROOT)/time\include;$(ISHIKO_CPP_ROOT)/test-framework\include;%(AdditionalIncludeDirectories) + $(ISHIKO_CPP_ROOT)/synchronization\include;$(ISHIKO_CPP_ROOT)/base-platform\include;$(ISHIKO_CPP_ROOT)/errors\include;$(FMT_ROOT)\include;$(ISHIKO_CPP_ROOT)/memory\include;$(BOOST_ROOT);$(ISHIKO_CPP_ROOT)/text\include;$(ISHIKO_CPP_ROOT)/configuration\include;$(ISHIKO_CPP_ROOT)/io\include;$(ISHIKO_CPP_ROOT)/filesystem\include;$(ISHIKO_CPP_ROOT)/types\include;$(ISHIKO_CPP_ROOT)/diff\include;$(PUGIXML_ROOT)\src;$(ISHIKO_CPP_ROOT)/xml\include;$(ISHIKO_CPP_ROOT)/process\include;$(ISHIKO_CPP_ROOT)/time\include;$(ISHIKO_CPP_ROOT)/test-framework\include;%(AdditionalIncludeDirectories) MultiThreadedDLL /utf-8 %(AdditionalOptions) @@ -155,12 +155,16 @@ true true true - $(ISHIKO_CPP_ROOT)/base-platform\lib\$(Platform);$(ISHIKO_CPP_ROOT)/errors\lib\$(Platform);$(FMT_ROOT)\lib;$(ISHIKO_CPP_ROOT)/memory\lib\$(Platform);$(BOOST_ROOT)\stage\lib;$(ISHIKO_CPP_ROOT)/text\lib\$(Platform);$(ISHIKO_CPP_ROOT)/configuration\lib\$(Platform);$(ISHIKO_CPP_ROOT)/io\lib\$(Platform);$(ISHIKO_CPP_ROOT)/filesystem\lib\$(Platform);$(ISHIKO_CPP_ROOT)/types\lib\$(Platform);$(ISHIKO_CPP_ROOT)/diff\lib\$(Platform);$(ISHIKO_CPP_ROOT)/xml\lib\$(Platform);$(ISHIKO_CPP_ROOT)/process\lib\$(Platform);$(ISHIKO_CPP_ROOT)/time\lib\$(Platform);$(ISHIKO_CPP_ROOT)/test-framework\lib\$(Platform);%(AdditionalLibraryDirectories) + $(ISHIKO_CPP_ROOT)/synchronization\lib\$(Platform);$(ISHIKO_CPP_ROOT)/base-platform\lib\$(Platform);$(ISHIKO_CPP_ROOT)/errors\lib\$(Platform);$(FMT_ROOT)\lib;$(ISHIKO_CPP_ROOT)/memory\lib\$(Platform);$(BOOST_ROOT)\stage\lib;$(ISHIKO_CPP_ROOT)/text\lib\$(Platform);$(ISHIKO_CPP_ROOT)/configuration\lib\$(Platform);$(ISHIKO_CPP_ROOT)/io\lib\$(Platform);$(ISHIKO_CPP_ROOT)/filesystem\lib\$(Platform);$(ISHIKO_CPP_ROOT)/types\lib\$(Platform);$(ISHIKO_CPP_ROOT)/diff\lib\$(Platform);$(ISHIKO_CPP_ROOT)/xml\lib\$(Platform);$(ISHIKO_CPP_ROOT)/process\lib\$(Platform);$(ISHIKO_CPP_ROOT)/time\lib\$(Platform);$(ISHIKO_CPP_ROOT)/test-framework\lib\$(Platform);%(AdditionalLibraryDirectories) fmt-d-x64.lib;%(AdditionalDependencies) + + + + diff --git a/tests/build-files/vc16/IshikoSynchronizationTests.vcxproj.filters b/tests/build-files/vc16/IshikoSynchronizationTests.vcxproj.filters index 1347ef1..0f16eb2 100644 --- a/tests/build-files/vc16/IshikoSynchronizationTests.vcxproj.filters +++ b/tests/build-files/vc16/IshikoSynchronizationTests.vcxproj.filters @@ -16,9 +16,17 @@ rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms + + + Header Files + + Source Files + + Source Files + diff --git a/tests/build-files/vc17/IshikoSynchronizationTests.vcxproj b/tests/build-files/vc17/IshikoSynchronizationTests.vcxproj index b6a253e..cb5f281 100644 --- a/tests/build-files/vc17/IshikoSynchronizationTests.vcxproj +++ b/tests/build-files/vc17/IshikoSynchronizationTests.vcxproj @@ -86,14 +86,14 @@ PUGIXML_HEADER_ONLY;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) true false - $(ISHIKO_CPP_ROOT)/base-platform\include;$(ISHIKO_CPP_ROOT)/errors\include;$(FMT_ROOT)\include;$(ISHIKO_CPP_ROOT)/memory\include;$(BOOST_ROOT);$(ISHIKO_CPP_ROOT)/text\include;$(ISHIKO_CPP_ROOT)/configuration\include;$(ISHIKO_CPP_ROOT)/io\include;$(ISHIKO_CPP_ROOT)/filesystem\include;$(ISHIKO_CPP_ROOT)/types\include;$(ISHIKO_CPP_ROOT)/diff\include;$(PUGIXML_ROOT)\src;$(ISHIKO_CPP_ROOT)/xml\include;$(ISHIKO_CPP_ROOT)/process\include;$(ISHIKO_CPP_ROOT)/time\include;$(ISHIKO_CPP_ROOT)/test-framework\include;%(AdditionalIncludeDirectories) + $(ISHIKO_CPP_ROOT)/synchronization\include;$(ISHIKO_CPP_ROOT)/base-platform\include;$(ISHIKO_CPP_ROOT)/errors\include;$(FMT_ROOT)\include;$(ISHIKO_CPP_ROOT)/memory\include;$(BOOST_ROOT);$(ISHIKO_CPP_ROOT)/text\include;$(ISHIKO_CPP_ROOT)/configuration\include;$(ISHIKO_CPP_ROOT)/io\include;$(ISHIKO_CPP_ROOT)/filesystem\include;$(ISHIKO_CPP_ROOT)/types\include;$(ISHIKO_CPP_ROOT)/diff\include;$(PUGIXML_ROOT)\src;$(ISHIKO_CPP_ROOT)/xml\include;$(ISHIKO_CPP_ROOT)/process\include;$(ISHIKO_CPP_ROOT)/time\include;$(ISHIKO_CPP_ROOT)/test-framework\include;%(AdditionalIncludeDirectories) MultiThreadedDebugDLL /utf-8 %(AdditionalOptions) Console true - $(ISHIKO_CPP_ROOT)/base-platform\lib\$(Platform);$(ISHIKO_CPP_ROOT)/errors\lib\$(Platform);$(FMT_ROOT)\lib;$(ISHIKO_CPP_ROOT)/memory\lib\$(Platform);$(BOOST_ROOT)\stage\lib;$(ISHIKO_CPP_ROOT)/text\lib\$(Platform);$(ISHIKO_CPP_ROOT)/configuration\lib\$(Platform);$(ISHIKO_CPP_ROOT)/io\lib\$(Platform);$(ISHIKO_CPP_ROOT)/filesystem\lib\$(Platform);$(ISHIKO_CPP_ROOT)/types\lib\$(Platform);$(ISHIKO_CPP_ROOT)/diff\lib\$(Platform);$(ISHIKO_CPP_ROOT)/xml\lib\$(Platform);$(ISHIKO_CPP_ROOT)/process\lib\$(Platform);$(ISHIKO_CPP_ROOT)/time\lib\$(Platform);$(ISHIKO_CPP_ROOT)/test-framework\lib\$(Platform);%(AdditionalLibraryDirectories) + $(ISHIKO_CPP_ROOT)/synchronization\lib\$(Platform);$(ISHIKO_CPP_ROOT)/base-platform\lib\$(Platform);$(ISHIKO_CPP_ROOT)/errors\lib\$(Platform);$(FMT_ROOT)\lib;$(ISHIKO_CPP_ROOT)/memory\lib\$(Platform);$(BOOST_ROOT)\stage\lib;$(ISHIKO_CPP_ROOT)/text\lib\$(Platform);$(ISHIKO_CPP_ROOT)/configuration\lib\$(Platform);$(ISHIKO_CPP_ROOT)/io\lib\$(Platform);$(ISHIKO_CPP_ROOT)/filesystem\lib\$(Platform);$(ISHIKO_CPP_ROOT)/types\lib\$(Platform);$(ISHIKO_CPP_ROOT)/diff\lib\$(Platform);$(ISHIKO_CPP_ROOT)/xml\lib\$(Platform);$(ISHIKO_CPP_ROOT)/process\lib\$(Platform);$(ISHIKO_CPP_ROOT)/time\lib\$(Platform);$(ISHIKO_CPP_ROOT)/test-framework\lib\$(Platform);%(AdditionalLibraryDirectories) fmt-d-x64.lib;%(AdditionalDependencies) @@ -104,14 +104,14 @@ PUGIXML_HEADER_ONLY;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) true false - $(ISHIKO_CPP_ROOT)/base-platform\include;$(ISHIKO_CPP_ROOT)/errors\include;$(FMT_ROOT)\include;$(ISHIKO_CPP_ROOT)/memory\include;$(BOOST_ROOT);$(ISHIKO_CPP_ROOT)/text\include;$(ISHIKO_CPP_ROOT)/configuration\include;$(ISHIKO_CPP_ROOT)/io\include;$(ISHIKO_CPP_ROOT)/filesystem\include;$(ISHIKO_CPP_ROOT)/types\include;$(ISHIKO_CPP_ROOT)/diff\include;$(PUGIXML_ROOT)\src;$(ISHIKO_CPP_ROOT)/xml\include;$(ISHIKO_CPP_ROOT)/process\include;$(ISHIKO_CPP_ROOT)/time\include;$(ISHIKO_CPP_ROOT)/test-framework\include;%(AdditionalIncludeDirectories) + $(ISHIKO_CPP_ROOT)/synchronization\include;$(ISHIKO_CPP_ROOT)/base-platform\include;$(ISHIKO_CPP_ROOT)/errors\include;$(FMT_ROOT)\include;$(ISHIKO_CPP_ROOT)/memory\include;$(BOOST_ROOT);$(ISHIKO_CPP_ROOT)/text\include;$(ISHIKO_CPP_ROOT)/configuration\include;$(ISHIKO_CPP_ROOT)/io\include;$(ISHIKO_CPP_ROOT)/filesystem\include;$(ISHIKO_CPP_ROOT)/types\include;$(ISHIKO_CPP_ROOT)/diff\include;$(PUGIXML_ROOT)\src;$(ISHIKO_CPP_ROOT)/xml\include;$(ISHIKO_CPP_ROOT)/process\include;$(ISHIKO_CPP_ROOT)/time\include;$(ISHIKO_CPP_ROOT)/test-framework\include;%(AdditionalIncludeDirectories) MultiThreadedDebugDLL /utf-8 %(AdditionalOptions) Console true - $(ISHIKO_CPP_ROOT)/base-platform\lib\$(Platform);$(ISHIKO_CPP_ROOT)/errors\lib\$(Platform);$(FMT_ROOT)\lib;$(ISHIKO_CPP_ROOT)/memory\lib\$(Platform);$(BOOST_ROOT)\stage\lib;$(ISHIKO_CPP_ROOT)/text\lib\$(Platform);$(ISHIKO_CPP_ROOT)/configuration\lib\$(Platform);$(ISHIKO_CPP_ROOT)/io\lib\$(Platform);$(ISHIKO_CPP_ROOT)/filesystem\lib\$(Platform);$(ISHIKO_CPP_ROOT)/types\lib\$(Platform);$(ISHIKO_CPP_ROOT)/diff\lib\$(Platform);$(ISHIKO_CPP_ROOT)/xml\lib\$(Platform);$(ISHIKO_CPP_ROOT)/process\lib\$(Platform);$(ISHIKO_CPP_ROOT)/time\lib\$(Platform);$(ISHIKO_CPP_ROOT)/test-framework\lib\$(Platform);%(AdditionalLibraryDirectories) + $(ISHIKO_CPP_ROOT)/synchronization\lib\$(Platform);$(ISHIKO_CPP_ROOT)/base-platform\lib\$(Platform);$(ISHIKO_CPP_ROOT)/errors\lib\$(Platform);$(FMT_ROOT)\lib;$(ISHIKO_CPP_ROOT)/memory\lib\$(Platform);$(BOOST_ROOT)\stage\lib;$(ISHIKO_CPP_ROOT)/text\lib\$(Platform);$(ISHIKO_CPP_ROOT)/configuration\lib\$(Platform);$(ISHIKO_CPP_ROOT)/io\lib\$(Platform);$(ISHIKO_CPP_ROOT)/filesystem\lib\$(Platform);$(ISHIKO_CPP_ROOT)/types\lib\$(Platform);$(ISHIKO_CPP_ROOT)/diff\lib\$(Platform);$(ISHIKO_CPP_ROOT)/xml\lib\$(Platform);$(ISHIKO_CPP_ROOT)/process\lib\$(Platform);$(ISHIKO_CPP_ROOT)/time\lib\$(Platform);$(ISHIKO_CPP_ROOT)/test-framework\lib\$(Platform);%(AdditionalLibraryDirectories) fmt-d-x64.lib;%(AdditionalDependencies) @@ -124,7 +124,7 @@ PUGIXML_HEADER_ONLY;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) true false - $(ISHIKO_CPP_ROOT)/base-platform\include;$(ISHIKO_CPP_ROOT)/errors\include;$(FMT_ROOT)\include;$(ISHIKO_CPP_ROOT)/memory\include;$(BOOST_ROOT);$(ISHIKO_CPP_ROOT)/text\include;$(ISHIKO_CPP_ROOT)/configuration\include;$(ISHIKO_CPP_ROOT)/io\include;$(ISHIKO_CPP_ROOT)/filesystem\include;$(ISHIKO_CPP_ROOT)/types\include;$(ISHIKO_CPP_ROOT)/diff\include;$(PUGIXML_ROOT)\src;$(ISHIKO_CPP_ROOT)/xml\include;$(ISHIKO_CPP_ROOT)/process\include;$(ISHIKO_CPP_ROOT)/time\include;$(ISHIKO_CPP_ROOT)/test-framework\include;%(AdditionalIncludeDirectories) + $(ISHIKO_CPP_ROOT)/synchronization\include;$(ISHIKO_CPP_ROOT)/base-platform\include;$(ISHIKO_CPP_ROOT)/errors\include;$(FMT_ROOT)\include;$(ISHIKO_CPP_ROOT)/memory\include;$(BOOST_ROOT);$(ISHIKO_CPP_ROOT)/text\include;$(ISHIKO_CPP_ROOT)/configuration\include;$(ISHIKO_CPP_ROOT)/io\include;$(ISHIKO_CPP_ROOT)/filesystem\include;$(ISHIKO_CPP_ROOT)/types\include;$(ISHIKO_CPP_ROOT)/diff\include;$(PUGIXML_ROOT)\src;$(ISHIKO_CPP_ROOT)/xml\include;$(ISHIKO_CPP_ROOT)/process\include;$(ISHIKO_CPP_ROOT)/time\include;$(ISHIKO_CPP_ROOT)/test-framework\include;%(AdditionalIncludeDirectories) MultiThreadedDLL /utf-8 %(AdditionalOptions) @@ -133,7 +133,7 @@ true true true - $(ISHIKO_CPP_ROOT)/base-platform\lib\$(Platform);$(ISHIKO_CPP_ROOT)/errors\lib\$(Platform);$(FMT_ROOT)\lib;$(ISHIKO_CPP_ROOT)/memory\lib\$(Platform);$(BOOST_ROOT)\stage\lib;$(ISHIKO_CPP_ROOT)/text\lib\$(Platform);$(ISHIKO_CPP_ROOT)/configuration\lib\$(Platform);$(ISHIKO_CPP_ROOT)/io\lib\$(Platform);$(ISHIKO_CPP_ROOT)/filesystem\lib\$(Platform);$(ISHIKO_CPP_ROOT)/types\lib\$(Platform);$(ISHIKO_CPP_ROOT)/diff\lib\$(Platform);$(ISHIKO_CPP_ROOT)/xml\lib\$(Platform);$(ISHIKO_CPP_ROOT)/process\lib\$(Platform);$(ISHIKO_CPP_ROOT)/time\lib\$(Platform);$(ISHIKO_CPP_ROOT)/test-framework\lib\$(Platform);%(AdditionalLibraryDirectories) + $(ISHIKO_CPP_ROOT)/synchronization\lib\$(Platform);$(ISHIKO_CPP_ROOT)/base-platform\lib\$(Platform);$(ISHIKO_CPP_ROOT)/errors\lib\$(Platform);$(FMT_ROOT)\lib;$(ISHIKO_CPP_ROOT)/memory\lib\$(Platform);$(BOOST_ROOT)\stage\lib;$(ISHIKO_CPP_ROOT)/text\lib\$(Platform);$(ISHIKO_CPP_ROOT)/configuration\lib\$(Platform);$(ISHIKO_CPP_ROOT)/io\lib\$(Platform);$(ISHIKO_CPP_ROOT)/filesystem\lib\$(Platform);$(ISHIKO_CPP_ROOT)/types\lib\$(Platform);$(ISHIKO_CPP_ROOT)/diff\lib\$(Platform);$(ISHIKO_CPP_ROOT)/xml\lib\$(Platform);$(ISHIKO_CPP_ROOT)/process\lib\$(Platform);$(ISHIKO_CPP_ROOT)/time\lib\$(Platform);$(ISHIKO_CPP_ROOT)/test-framework\lib\$(Platform);%(AdditionalLibraryDirectories) fmt-d-x64.lib;%(AdditionalDependencies) @@ -146,7 +146,7 @@ PUGIXML_HEADER_ONLY;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) true false - $(ISHIKO_CPP_ROOT)/base-platform\include;$(ISHIKO_CPP_ROOT)/errors\include;$(FMT_ROOT)\include;$(ISHIKO_CPP_ROOT)/memory\include;$(BOOST_ROOT);$(ISHIKO_CPP_ROOT)/text\include;$(ISHIKO_CPP_ROOT)/configuration\include;$(ISHIKO_CPP_ROOT)/io\include;$(ISHIKO_CPP_ROOT)/filesystem\include;$(ISHIKO_CPP_ROOT)/types\include;$(ISHIKO_CPP_ROOT)/diff\include;$(PUGIXML_ROOT)\src;$(ISHIKO_CPP_ROOT)/xml\include;$(ISHIKO_CPP_ROOT)/process\include;$(ISHIKO_CPP_ROOT)/time\include;$(ISHIKO_CPP_ROOT)/test-framework\include;%(AdditionalIncludeDirectories) + $(ISHIKO_CPP_ROOT)/synchronization\include;$(ISHIKO_CPP_ROOT)/base-platform\include;$(ISHIKO_CPP_ROOT)/errors\include;$(FMT_ROOT)\include;$(ISHIKO_CPP_ROOT)/memory\include;$(BOOST_ROOT);$(ISHIKO_CPP_ROOT)/text\include;$(ISHIKO_CPP_ROOT)/configuration\include;$(ISHIKO_CPP_ROOT)/io\include;$(ISHIKO_CPP_ROOT)/filesystem\include;$(ISHIKO_CPP_ROOT)/types\include;$(ISHIKO_CPP_ROOT)/diff\include;$(PUGIXML_ROOT)\src;$(ISHIKO_CPP_ROOT)/xml\include;$(ISHIKO_CPP_ROOT)/process\include;$(ISHIKO_CPP_ROOT)/time\include;$(ISHIKO_CPP_ROOT)/test-framework\include;%(AdditionalIncludeDirectories) MultiThreadedDLL /utf-8 %(AdditionalOptions) @@ -155,12 +155,16 @@ true true true - $(ISHIKO_CPP_ROOT)/base-platform\lib\$(Platform);$(ISHIKO_CPP_ROOT)/errors\lib\$(Platform);$(FMT_ROOT)\lib;$(ISHIKO_CPP_ROOT)/memory\lib\$(Platform);$(BOOST_ROOT)\stage\lib;$(ISHIKO_CPP_ROOT)/text\lib\$(Platform);$(ISHIKO_CPP_ROOT)/configuration\lib\$(Platform);$(ISHIKO_CPP_ROOT)/io\lib\$(Platform);$(ISHIKO_CPP_ROOT)/filesystem\lib\$(Platform);$(ISHIKO_CPP_ROOT)/types\lib\$(Platform);$(ISHIKO_CPP_ROOT)/diff\lib\$(Platform);$(ISHIKO_CPP_ROOT)/xml\lib\$(Platform);$(ISHIKO_CPP_ROOT)/process\lib\$(Platform);$(ISHIKO_CPP_ROOT)/time\lib\$(Platform);$(ISHIKO_CPP_ROOT)/test-framework\lib\$(Platform);%(AdditionalLibraryDirectories) + $(ISHIKO_CPP_ROOT)/synchronization\lib\$(Platform);$(ISHIKO_CPP_ROOT)/base-platform\lib\$(Platform);$(ISHIKO_CPP_ROOT)/errors\lib\$(Platform);$(FMT_ROOT)\lib;$(ISHIKO_CPP_ROOT)/memory\lib\$(Platform);$(BOOST_ROOT)\stage\lib;$(ISHIKO_CPP_ROOT)/text\lib\$(Platform);$(ISHIKO_CPP_ROOT)/configuration\lib\$(Platform);$(ISHIKO_CPP_ROOT)/io\lib\$(Platform);$(ISHIKO_CPP_ROOT)/filesystem\lib\$(Platform);$(ISHIKO_CPP_ROOT)/types\lib\$(Platform);$(ISHIKO_CPP_ROOT)/diff\lib\$(Platform);$(ISHIKO_CPP_ROOT)/xml\lib\$(Platform);$(ISHIKO_CPP_ROOT)/process\lib\$(Platform);$(ISHIKO_CPP_ROOT)/time\lib\$(Platform);$(ISHIKO_CPP_ROOT)/test-framework\lib\$(Platform);%(AdditionalLibraryDirectories) fmt-d-x64.lib;%(AdditionalDependencies) + + + + diff --git a/tests/build-files/vc17/IshikoSynchronizationTests.vcxproj.filters b/tests/build-files/vc17/IshikoSynchronizationTests.vcxproj.filters index 1347ef1..0f16eb2 100644 --- a/tests/build-files/vc17/IshikoSynchronizationTests.vcxproj.filters +++ b/tests/build-files/vc17/IshikoSynchronizationTests.vcxproj.filters @@ -16,9 +16,17 @@ rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms + + + Header Files + + Source Files + + Source Files + diff --git a/tests/src/SpinlockTests.cpp b/tests/src/SpinlockTests.cpp new file mode 100644 index 0000000..326b4e7 --- /dev/null +++ b/tests/src/SpinlockTests.cpp @@ -0,0 +1,71 @@ +// SPDX-FileCopyrightText: 2005-2025 Xavier Leclercq +// SPDX-License-Identifier: BSL-1.0 + +#include "SpinlockTests.hpp" +#include "Ishiko/Synchronization/Spinlock.hpp" +#include + +using namespace Ishiko; + +SpinlockTests::SpinlockTests(const TestNumber& number, const TestContext& context) + : TestSequence(number, "Spinlock tests", context) +{ + append("Constructor test 1", ConstructorTest1); + append("acquire test 1", AcquireTest1); + append("acquire test 2", AcquireTest2); +} + +void SpinlockTests::ConstructorTest1(Test& test) +{ + Spinlock spinlock; + + ISHIKO_TEST_PASS(); +} + +void SpinlockTests::AcquireTest1(Test& test) +{ + Spinlock spinlock; + spinlock.acquire(); + spinlock.release(); + + ISHIKO_TEST_PASS(); +} + +static Spinlock AcquireTest2Spinlock; + +static unsigned long SpinlockAcquireTest2Helper(void* data) +{ + // Take the current result, play a bit with it and then put back the modified value + // Voluntarily lengthy so the 2 threads will interrupt eachother and cause the result to + // be invalid if critical section is not used + int i = 0; + while (i < 20000) + { + AcquireTest2Spinlock.acquire(); + int result = *((int*)data); + int j = 0; + while (j < 100000) + { + j++; + } + result++; + *((int*)data) = result; + AcquireTest2Spinlock.release(); + i++; + } + return 0; +} + +void SpinlockTests::AcquireTest2(Test& test) +{ + int result = 0; + + std::thread thread1(SpinlockAcquireTest2Helper, &result); + std::thread thread2(SpinlockAcquireTest2Helper, &result); + thread1.resume(); + thread2.resume(); + thread1.join(); + thread2.join(); + + ISHIKO_TEST_FAIL_IF_NEQ(result, 40000); +} diff --git a/tests/src/SpinlockTests.hpp b/tests/src/SpinlockTests.hpp new file mode 100644 index 0000000..eccc99c --- /dev/null +++ b/tests/src/SpinlockTests.hpp @@ -0,0 +1,20 @@ +// SPDX-FileCopyrightText: 2005-2025 Xavier Leclercq +// SPDX-License-Identifier: BSL-1.0 + +#ifndef GUARD_ISHIKO_CPP_SYNCHRONIZATION_TESTS_SPINLOCKTESTS_HPP +#define GUARD_ISHIKO_CPP_SYNCHRONIZATION_TESTS_SPINLOCKTESTS_HPP + +#include + +class SpinlockTests : public Ishiko::TestSequence +{ +public: + SpinlockTests(const Ishiko::TestNumber& number, const Ishiko::TestContext& context); + +private: + static void ConstructorTest1(Ishiko::Test& test); + static void AcquireTest1(Ishiko::Test& test); + static void AcquireTest2(Ishiko::Test& test); +}; + +#endif diff --git a/tests/src/main.cpp b/tests/src/main.cpp index 2071123..f0d983d 100644 --- a/tests/src/main.cpp +++ b/tests/src/main.cpp @@ -1,7 +1,8 @@ -// SPDX-FileCopyrightText: 2005-2024 Xavier Leclercq +// SPDX-FileCopyrightText: 2005-2025 Xavier Leclercq // SPDX-License-Identifier: BSL-1.0 -//#include "SpinlockTests.hpp" +#include "SpinlockTests.hpp" +#include "Ishiko/Synchronization/linkoptions.hpp" #include #include @@ -18,7 +19,7 @@ int main(int argc, char* argv[]) TestHarness the_test_harness("Ishiko/C++ Synchronization Library Tests", configuration); TestSequence& the_tests = the_test_harness.tests(); - //the_tests.append(); + the_tests.append(); return the_test_harness.run(); } From 5742bd6c1f1c5e5504487c5ee4339a91155c1b73 Mon Sep 17 00:00:00 2001 From: Xavier Leclercq Date: Sun, 26 Oct 2025 00:55:40 +0100 Subject: [PATCH 3/3] Updates --- .../bakefile/IshikoSynchronizationTests.bkl | 3 ++- tests/build-files/gnumake/GNUmakefile | 15 +++++++++------ .../vc15/IshikoSynchronizationTests.vcxproj | 16 ++++++++-------- .../vc16/IshikoSynchronizationTests.vcxproj | 16 ++++++++-------- .../vc17/IshikoSynchronizationTests.vcxproj | 16 ++++++++-------- tests/src/SpinlockTests.cpp | 7 ++++--- 6 files changed, 39 insertions(+), 34 deletions(-) diff --git a/tests/build-files/bakefile/IshikoSynchronizationTests.bkl b/tests/build-files/bakefile/IshikoSynchronizationTests.bkl index 582626d..9a78dd3 100644 --- a/tests/build-files/bakefile/IshikoSynchronizationTests.bkl +++ b/tests/build-files/bakefile/IshikoSynchronizationTests.bkl @@ -1,4 +1,5 @@ ishikopath = envvar("ISHIKO_CPP_ROOT"); +import $(ishikopath)/concurrency/include/Ishiko/Concurrency.bkl; import $(ishikopath)/synchronization/include/Ishiko/Synchronization.bkl; import $(ishikopath)/test-framework/include/Ishiko/TestFramework/Core.bkl; @@ -9,7 +10,7 @@ vs2022.solutionfile = ../vc17/IshikoSynchronizationTests.sln; vs2019.solutionfile = ../vc16/IshikoSynchronizationTests.sln; vs2017.solutionfile = ../vc15/IshikoSynchronizationTests.sln; -program IshikoSynchronizationTests : IshikoSynchronization, IshikoTestFrameworkCore +program IshikoSynchronizationTests : IshikoConcurrency, IshikoSynchronization, IshikoTestFrameworkCore { archs = x86 x86_64; diff --git a/tests/build-files/gnumake/GNUmakefile b/tests/build-files/gnumake/GNUmakefile index 7d704c2..52d6ad3 100644 --- a/tests/build-files/gnumake/GNUmakefile +++ b/tests/build-files/gnumake/GNUmakefile @@ -37,8 +37,9 @@ endif # Additionally, this makefile is customizable with the following # settings: # -# ISHIKO_CPP_SYNCHRONIZATION_ROOT Path to the Ishiko/C++ Synchronization installation # ISHIKO_CPP_BASEPLATFORM_ROOT Path to the Ishiko/C++ BasePlatform installation +# ISHIKO_CPP_CONCURRENCY_ROOT Path to the Ishiko/C++ Concurrency installation +# ISHIKO_CPP_SYNCHRONIZATION_ROOT Path to the Ishiko/C++ Synchronization installation # ISHIKO_CPP_ERRORS_ROOT Path to the Ishiko/C++ Errors installation # ISHIKO_CPP_FMT_ROOT Path to the fmt installation # ISHIKO_CPP_MEMORY_ROOT Path to the Ishiko/C++ Memory installation @@ -74,10 +75,12 @@ endif # Configurable settings: # -# Path to the Ishiko/C++ Synchronization installation -ISHIKO_CPP_SYNCHRONIZATION_ROOT ?= $(ISHIKO_CPP_ROOT)/synchronization # Path to the Ishiko/C++ BasePlatform installation ISHIKO_CPP_BASEPLATFORM_ROOT ?= $(ISHIKO_CPP_ROOT)/base-platform +# Path to the Ishiko/C++ Concurrency installation +ISHIKO_CPP_CONCURRENCY_ROOT ?= $(ISHIKO_CPP_ROOT)/concurrency +# Path to the Ishiko/C++ Synchronization installation +ISHIKO_CPP_SYNCHRONIZATION_ROOT ?= $(ISHIKO_CPP_ROOT)/synchronization # Path to the Ishiko/C++ Errors installation ISHIKO_CPP_ERRORS_ROOT ?= $(ISHIKO_CPP_ROOT)/errors # Path to the fmt installation @@ -114,13 +117,13 @@ ISHIKO_CPP_TESTFRAMEWORK_ROOT ?= $(ISHIKO_CPP_ROOT)/test-framework all: $(_builddir)IshikoSynchronizationTests $(_builddir)IshikoSynchronizationTests: $(_builddir)IshikoSynchronizationTests_main.o $(_builddir)IshikoSynchronizationTests_SpinlockTests.o - $(CXX) -o $@ $(LDFLAGS) $(_builddir)IshikoSynchronizationTests_main.o $(_builddir)IshikoSynchronizationTests_SpinlockTests.o -L$(ISHIKO_CPP_SYNCHRONIZATION_ROOT)/lib -L$(ISHIKO_CPP_BASEPLATFORM_ROOT)/lib -L$(ISHIKO_CPP_ERRORS_ROOT)/lib -L$(ISHIKO_CPP_FMT_ROOT)/lib -L$(ISHIKO_CPP_MEMORY_ROOT)/lib -L$(ISHIKO_CPP_BOOST_ROOT)/lib -L$(ISHIKO_CPP_TEXT_ROOT)/lib -L$(ISHIKO_CPP_CONFIGURATION_ROOT)/lib -L$(ISHIKO_CPP_IO_ROOT)/lib -L$(ISHIKO_CPP_FILESYSTEM_ROOT)/lib -L$(ISHIKO_CPP_TYPES_ROOT)/lib -L$(ISHIKO_CPP_DIFF_ROOT)/lib -L$(ISHIKO_CPP_XML_ROOT)/lib -L$(ISHIKO_CPP_PROCESS_ROOT)/lib -L$(ISHIKO_CPP_TIME_ROOT)/lib -L$(ISHIKO_CPP_TESTFRAMEWORK_ROOT)/lib -lIshikoTestFrameworkCore -lIshikoConfiguration -lIshikoXML -lIshikoFileSystem -lIshikoIO -lIshikoProcess -lIshikoTime -lIshikoText -lIshikoErrors -lIshikoBasePlatform -lfmt -lboost_filesystem -pthread + $(CXX) -o $@ $(LDFLAGS) $(_builddir)IshikoSynchronizationTests_main.o $(_builddir)IshikoSynchronizationTests_SpinlockTests.o -L$(ISHIKO_CPP_BASEPLATFORM_ROOT)/lib -L$(ISHIKO_CPP_CONCURRENCY_ROOT)/lib -L$(ISHIKO_CPP_SYNCHRONIZATION_ROOT)/lib -L$(ISHIKO_CPP_ERRORS_ROOT)/lib -L$(ISHIKO_CPP_FMT_ROOT)/lib -L$(ISHIKO_CPP_MEMORY_ROOT)/lib -L$(ISHIKO_CPP_BOOST_ROOT)/lib -L$(ISHIKO_CPP_TEXT_ROOT)/lib -L$(ISHIKO_CPP_CONFIGURATION_ROOT)/lib -L$(ISHIKO_CPP_IO_ROOT)/lib -L$(ISHIKO_CPP_FILESYSTEM_ROOT)/lib -L$(ISHIKO_CPP_TYPES_ROOT)/lib -L$(ISHIKO_CPP_DIFF_ROOT)/lib -L$(ISHIKO_CPP_XML_ROOT)/lib -L$(ISHIKO_CPP_PROCESS_ROOT)/lib -L$(ISHIKO_CPP_TIME_ROOT)/lib -L$(ISHIKO_CPP_TESTFRAMEWORK_ROOT)/lib -lIshikoTestFrameworkCore -lIshikoConfiguration -lIshikoXML -lIshikoFileSystem -lIshikoIO -lIshikoProcess -lIshikoTime -lIshikoText -lIshikoErrors -lIshikoBasePlatform -lfmt -lboost_filesystem -pthread $(_builddir)IshikoSynchronizationTests_main.o: ../../src/main.cpp - $(CXX) -c -o $@ $(CPPFLAGS) $(CXXFLAGS) -MD -MP -pthread -DPUGIXML_HEADER_ONLY -I$(ISHIKO_CPP_SYNCHRONIZATION_ROOT)/include -I$(ISHIKO_CPP_BASEPLATFORM_ROOT)/include -I$(ISHIKO_CPP_ERRORS_ROOT)/include -I$(ISHIKO_CPP_FMT_ROOT)/include -I$(ISHIKO_CPP_MEMORY_ROOT)/include -I$(ISHIKO_CPP_BOOST_ROOT)/include -I$(ISHIKO_CPP_TEXT_ROOT)/include -I$(ISHIKO_CPP_CONFIGURATION_ROOT)/include -I$(ISHIKO_CPP_IO_ROOT)/include -I$(ISHIKO_CPP_FILESYSTEM_ROOT)/include -I$(ISHIKO_CPP_TYPES_ROOT)/include -I$(ISHIKO_CPP_DIFF_ROOT)/include -I$(ISHIKO_CPP_PUGIXML_ROOT)/src -I$(ISHIKO_CPP_XML_ROOT)/include -I$(ISHIKO_CPP_PROCESS_ROOT)/include -I$(ISHIKO_CPP_TIME_ROOT)/include -I$(ISHIKO_CPP_TESTFRAMEWORK_ROOT)/include -std=c++14 ../../src/main.cpp + $(CXX) -c -o $@ $(CPPFLAGS) $(CXXFLAGS) -MD -MP -pthread -DPUGIXML_HEADER_ONLY -I$(ISHIKO_CPP_BASEPLATFORM_ROOT)/include -I$(ISHIKO_CPP_CONCURRENCY_ROOT)/include -I$(ISHIKO_CPP_SYNCHRONIZATION_ROOT)/include -I$(ISHIKO_CPP_ERRORS_ROOT)/include -I$(ISHIKO_CPP_FMT_ROOT)/include -I$(ISHIKO_CPP_MEMORY_ROOT)/include -I$(ISHIKO_CPP_BOOST_ROOT)/include -I$(ISHIKO_CPP_TEXT_ROOT)/include -I$(ISHIKO_CPP_CONFIGURATION_ROOT)/include -I$(ISHIKO_CPP_IO_ROOT)/include -I$(ISHIKO_CPP_FILESYSTEM_ROOT)/include -I$(ISHIKO_CPP_TYPES_ROOT)/include -I$(ISHIKO_CPP_DIFF_ROOT)/include -I$(ISHIKO_CPP_PUGIXML_ROOT)/src -I$(ISHIKO_CPP_XML_ROOT)/include -I$(ISHIKO_CPP_PROCESS_ROOT)/include -I$(ISHIKO_CPP_TIME_ROOT)/include -I$(ISHIKO_CPP_TESTFRAMEWORK_ROOT)/include -std=c++14 ../../src/main.cpp $(_builddir)IshikoSynchronizationTests_SpinlockTests.o: ../../src/SpinlockTests.cpp - $(CXX) -c -o $@ $(CPPFLAGS) $(CXXFLAGS) -MD -MP -pthread -DPUGIXML_HEADER_ONLY -I$(ISHIKO_CPP_SYNCHRONIZATION_ROOT)/include -I$(ISHIKO_CPP_BASEPLATFORM_ROOT)/include -I$(ISHIKO_CPP_ERRORS_ROOT)/include -I$(ISHIKO_CPP_FMT_ROOT)/include -I$(ISHIKO_CPP_MEMORY_ROOT)/include -I$(ISHIKO_CPP_BOOST_ROOT)/include -I$(ISHIKO_CPP_TEXT_ROOT)/include -I$(ISHIKO_CPP_CONFIGURATION_ROOT)/include -I$(ISHIKO_CPP_IO_ROOT)/include -I$(ISHIKO_CPP_FILESYSTEM_ROOT)/include -I$(ISHIKO_CPP_TYPES_ROOT)/include -I$(ISHIKO_CPP_DIFF_ROOT)/include -I$(ISHIKO_CPP_PUGIXML_ROOT)/src -I$(ISHIKO_CPP_XML_ROOT)/include -I$(ISHIKO_CPP_PROCESS_ROOT)/include -I$(ISHIKO_CPP_TIME_ROOT)/include -I$(ISHIKO_CPP_TESTFRAMEWORK_ROOT)/include -std=c++14 ../../src/SpinlockTests.cpp + $(CXX) -c -o $@ $(CPPFLAGS) $(CXXFLAGS) -MD -MP -pthread -DPUGIXML_HEADER_ONLY -I$(ISHIKO_CPP_BASEPLATFORM_ROOT)/include -I$(ISHIKO_CPP_CONCURRENCY_ROOT)/include -I$(ISHIKO_CPP_SYNCHRONIZATION_ROOT)/include -I$(ISHIKO_CPP_ERRORS_ROOT)/include -I$(ISHIKO_CPP_FMT_ROOT)/include -I$(ISHIKO_CPP_MEMORY_ROOT)/include -I$(ISHIKO_CPP_BOOST_ROOT)/include -I$(ISHIKO_CPP_TEXT_ROOT)/include -I$(ISHIKO_CPP_CONFIGURATION_ROOT)/include -I$(ISHIKO_CPP_IO_ROOT)/include -I$(ISHIKO_CPP_FILESYSTEM_ROOT)/include -I$(ISHIKO_CPP_TYPES_ROOT)/include -I$(ISHIKO_CPP_DIFF_ROOT)/include -I$(ISHIKO_CPP_PUGIXML_ROOT)/src -I$(ISHIKO_CPP_XML_ROOT)/include -I$(ISHIKO_CPP_PROCESS_ROOT)/include -I$(ISHIKO_CPP_TIME_ROOT)/include -I$(ISHIKO_CPP_TESTFRAMEWORK_ROOT)/include -std=c++14 ../../src/SpinlockTests.cpp clean: rm -f $(_builddir)*.o diff --git a/tests/build-files/vc15/IshikoSynchronizationTests.vcxproj b/tests/build-files/vc15/IshikoSynchronizationTests.vcxproj index d698507..28ad59d 100644 --- a/tests/build-files/vc15/IshikoSynchronizationTests.vcxproj +++ b/tests/build-files/vc15/IshikoSynchronizationTests.vcxproj @@ -86,14 +86,14 @@ PUGIXML_HEADER_ONLY;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) true false - $(ISHIKO_CPP_ROOT)/synchronization\include;$(ISHIKO_CPP_ROOT)/base-platform\include;$(ISHIKO_CPP_ROOT)/errors\include;$(FMT_ROOT)\include;$(ISHIKO_CPP_ROOT)/memory\include;$(BOOST_ROOT);$(ISHIKO_CPP_ROOT)/text\include;$(ISHIKO_CPP_ROOT)/configuration\include;$(ISHIKO_CPP_ROOT)/io\include;$(ISHIKO_CPP_ROOT)/filesystem\include;$(ISHIKO_CPP_ROOT)/types\include;$(ISHIKO_CPP_ROOT)/diff\include;$(PUGIXML_ROOT)\src;$(ISHIKO_CPP_ROOT)/xml\include;$(ISHIKO_CPP_ROOT)/process\include;$(ISHIKO_CPP_ROOT)/time\include;$(ISHIKO_CPP_ROOT)/test-framework\include;%(AdditionalIncludeDirectories) + $(ISHIKO_CPP_ROOT)/base-platform\include;$(ISHIKO_CPP_ROOT)/concurrency\include;$(ISHIKO_CPP_ROOT)/synchronization\include;$(ISHIKO_CPP_ROOT)/errors\include;$(FMT_ROOT)\include;$(ISHIKO_CPP_ROOT)/memory\include;$(BOOST_ROOT);$(ISHIKO_CPP_ROOT)/text\include;$(ISHIKO_CPP_ROOT)/configuration\include;$(ISHIKO_CPP_ROOT)/io\include;$(ISHIKO_CPP_ROOT)/filesystem\include;$(ISHIKO_CPP_ROOT)/types\include;$(ISHIKO_CPP_ROOT)/diff\include;$(PUGIXML_ROOT)\src;$(ISHIKO_CPP_ROOT)/xml\include;$(ISHIKO_CPP_ROOT)/process\include;$(ISHIKO_CPP_ROOT)/time\include;$(ISHIKO_CPP_ROOT)/test-framework\include;%(AdditionalIncludeDirectories) MultiThreadedDebugDLL /utf-8 %(AdditionalOptions) Console true - $(ISHIKO_CPP_ROOT)/synchronization\lib\$(Platform);$(ISHIKO_CPP_ROOT)/base-platform\lib\$(Platform);$(ISHIKO_CPP_ROOT)/errors\lib\$(Platform);$(FMT_ROOT)\lib;$(ISHIKO_CPP_ROOT)/memory\lib\$(Platform);$(BOOST_ROOT)\stage\lib;$(ISHIKO_CPP_ROOT)/text\lib\$(Platform);$(ISHIKO_CPP_ROOT)/configuration\lib\$(Platform);$(ISHIKO_CPP_ROOT)/io\lib\$(Platform);$(ISHIKO_CPP_ROOT)/filesystem\lib\$(Platform);$(ISHIKO_CPP_ROOT)/types\lib\$(Platform);$(ISHIKO_CPP_ROOT)/diff\lib\$(Platform);$(ISHIKO_CPP_ROOT)/xml\lib\$(Platform);$(ISHIKO_CPP_ROOT)/process\lib\$(Platform);$(ISHIKO_CPP_ROOT)/time\lib\$(Platform);$(ISHIKO_CPP_ROOT)/test-framework\lib\$(Platform);%(AdditionalLibraryDirectories) + $(ISHIKO_CPP_ROOT)/base-platform\lib\$(Platform);$(ISHIKO_CPP_ROOT)/concurrency\lib\$(Platform);$(ISHIKO_CPP_ROOT)/synchronization\lib\$(Platform);$(ISHIKO_CPP_ROOT)/errors\lib\$(Platform);$(FMT_ROOT)\lib;$(ISHIKO_CPP_ROOT)/memory\lib\$(Platform);$(BOOST_ROOT)\stage\lib;$(ISHIKO_CPP_ROOT)/text\lib\$(Platform);$(ISHIKO_CPP_ROOT)/configuration\lib\$(Platform);$(ISHIKO_CPP_ROOT)/io\lib\$(Platform);$(ISHIKO_CPP_ROOT)/filesystem\lib\$(Platform);$(ISHIKO_CPP_ROOT)/types\lib\$(Platform);$(ISHIKO_CPP_ROOT)/diff\lib\$(Platform);$(ISHIKO_CPP_ROOT)/xml\lib\$(Platform);$(ISHIKO_CPP_ROOT)/process\lib\$(Platform);$(ISHIKO_CPP_ROOT)/time\lib\$(Platform);$(ISHIKO_CPP_ROOT)/test-framework\lib\$(Platform);%(AdditionalLibraryDirectories) fmt-d-x64.lib;%(AdditionalDependencies) @@ -104,14 +104,14 @@ PUGIXML_HEADER_ONLY;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) true false - $(ISHIKO_CPP_ROOT)/synchronization\include;$(ISHIKO_CPP_ROOT)/base-platform\include;$(ISHIKO_CPP_ROOT)/errors\include;$(FMT_ROOT)\include;$(ISHIKO_CPP_ROOT)/memory\include;$(BOOST_ROOT);$(ISHIKO_CPP_ROOT)/text\include;$(ISHIKO_CPP_ROOT)/configuration\include;$(ISHIKO_CPP_ROOT)/io\include;$(ISHIKO_CPP_ROOT)/filesystem\include;$(ISHIKO_CPP_ROOT)/types\include;$(ISHIKO_CPP_ROOT)/diff\include;$(PUGIXML_ROOT)\src;$(ISHIKO_CPP_ROOT)/xml\include;$(ISHIKO_CPP_ROOT)/process\include;$(ISHIKO_CPP_ROOT)/time\include;$(ISHIKO_CPP_ROOT)/test-framework\include;%(AdditionalIncludeDirectories) + $(ISHIKO_CPP_ROOT)/base-platform\include;$(ISHIKO_CPP_ROOT)/concurrency\include;$(ISHIKO_CPP_ROOT)/synchronization\include;$(ISHIKO_CPP_ROOT)/errors\include;$(FMT_ROOT)\include;$(ISHIKO_CPP_ROOT)/memory\include;$(BOOST_ROOT);$(ISHIKO_CPP_ROOT)/text\include;$(ISHIKO_CPP_ROOT)/configuration\include;$(ISHIKO_CPP_ROOT)/io\include;$(ISHIKO_CPP_ROOT)/filesystem\include;$(ISHIKO_CPP_ROOT)/types\include;$(ISHIKO_CPP_ROOT)/diff\include;$(PUGIXML_ROOT)\src;$(ISHIKO_CPP_ROOT)/xml\include;$(ISHIKO_CPP_ROOT)/process\include;$(ISHIKO_CPP_ROOT)/time\include;$(ISHIKO_CPP_ROOT)/test-framework\include;%(AdditionalIncludeDirectories) MultiThreadedDebugDLL /utf-8 %(AdditionalOptions) Console true - $(ISHIKO_CPP_ROOT)/synchronization\lib\$(Platform);$(ISHIKO_CPP_ROOT)/base-platform\lib\$(Platform);$(ISHIKO_CPP_ROOT)/errors\lib\$(Platform);$(FMT_ROOT)\lib;$(ISHIKO_CPP_ROOT)/memory\lib\$(Platform);$(BOOST_ROOT)\stage\lib;$(ISHIKO_CPP_ROOT)/text\lib\$(Platform);$(ISHIKO_CPP_ROOT)/configuration\lib\$(Platform);$(ISHIKO_CPP_ROOT)/io\lib\$(Platform);$(ISHIKO_CPP_ROOT)/filesystem\lib\$(Platform);$(ISHIKO_CPP_ROOT)/types\lib\$(Platform);$(ISHIKO_CPP_ROOT)/diff\lib\$(Platform);$(ISHIKO_CPP_ROOT)/xml\lib\$(Platform);$(ISHIKO_CPP_ROOT)/process\lib\$(Platform);$(ISHIKO_CPP_ROOT)/time\lib\$(Platform);$(ISHIKO_CPP_ROOT)/test-framework\lib\$(Platform);%(AdditionalLibraryDirectories) + $(ISHIKO_CPP_ROOT)/base-platform\lib\$(Platform);$(ISHIKO_CPP_ROOT)/concurrency\lib\$(Platform);$(ISHIKO_CPP_ROOT)/synchronization\lib\$(Platform);$(ISHIKO_CPP_ROOT)/errors\lib\$(Platform);$(FMT_ROOT)\lib;$(ISHIKO_CPP_ROOT)/memory\lib\$(Platform);$(BOOST_ROOT)\stage\lib;$(ISHIKO_CPP_ROOT)/text\lib\$(Platform);$(ISHIKO_CPP_ROOT)/configuration\lib\$(Platform);$(ISHIKO_CPP_ROOT)/io\lib\$(Platform);$(ISHIKO_CPP_ROOT)/filesystem\lib\$(Platform);$(ISHIKO_CPP_ROOT)/types\lib\$(Platform);$(ISHIKO_CPP_ROOT)/diff\lib\$(Platform);$(ISHIKO_CPP_ROOT)/xml\lib\$(Platform);$(ISHIKO_CPP_ROOT)/process\lib\$(Platform);$(ISHIKO_CPP_ROOT)/time\lib\$(Platform);$(ISHIKO_CPP_ROOT)/test-framework\lib\$(Platform);%(AdditionalLibraryDirectories) fmt-d-x64.lib;%(AdditionalDependencies) @@ -124,7 +124,7 @@ PUGIXML_HEADER_ONLY;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) true false - $(ISHIKO_CPP_ROOT)/synchronization\include;$(ISHIKO_CPP_ROOT)/base-platform\include;$(ISHIKO_CPP_ROOT)/errors\include;$(FMT_ROOT)\include;$(ISHIKO_CPP_ROOT)/memory\include;$(BOOST_ROOT);$(ISHIKO_CPP_ROOT)/text\include;$(ISHIKO_CPP_ROOT)/configuration\include;$(ISHIKO_CPP_ROOT)/io\include;$(ISHIKO_CPP_ROOT)/filesystem\include;$(ISHIKO_CPP_ROOT)/types\include;$(ISHIKO_CPP_ROOT)/diff\include;$(PUGIXML_ROOT)\src;$(ISHIKO_CPP_ROOT)/xml\include;$(ISHIKO_CPP_ROOT)/process\include;$(ISHIKO_CPP_ROOT)/time\include;$(ISHIKO_CPP_ROOT)/test-framework\include;%(AdditionalIncludeDirectories) + $(ISHIKO_CPP_ROOT)/base-platform\include;$(ISHIKO_CPP_ROOT)/concurrency\include;$(ISHIKO_CPP_ROOT)/synchronization\include;$(ISHIKO_CPP_ROOT)/errors\include;$(FMT_ROOT)\include;$(ISHIKO_CPP_ROOT)/memory\include;$(BOOST_ROOT);$(ISHIKO_CPP_ROOT)/text\include;$(ISHIKO_CPP_ROOT)/configuration\include;$(ISHIKO_CPP_ROOT)/io\include;$(ISHIKO_CPP_ROOT)/filesystem\include;$(ISHIKO_CPP_ROOT)/types\include;$(ISHIKO_CPP_ROOT)/diff\include;$(PUGIXML_ROOT)\src;$(ISHIKO_CPP_ROOT)/xml\include;$(ISHIKO_CPP_ROOT)/process\include;$(ISHIKO_CPP_ROOT)/time\include;$(ISHIKO_CPP_ROOT)/test-framework\include;%(AdditionalIncludeDirectories) MultiThreadedDLL /utf-8 %(AdditionalOptions) @@ -133,7 +133,7 @@ true true true - $(ISHIKO_CPP_ROOT)/synchronization\lib\$(Platform);$(ISHIKO_CPP_ROOT)/base-platform\lib\$(Platform);$(ISHIKO_CPP_ROOT)/errors\lib\$(Platform);$(FMT_ROOT)\lib;$(ISHIKO_CPP_ROOT)/memory\lib\$(Platform);$(BOOST_ROOT)\stage\lib;$(ISHIKO_CPP_ROOT)/text\lib\$(Platform);$(ISHIKO_CPP_ROOT)/configuration\lib\$(Platform);$(ISHIKO_CPP_ROOT)/io\lib\$(Platform);$(ISHIKO_CPP_ROOT)/filesystem\lib\$(Platform);$(ISHIKO_CPP_ROOT)/types\lib\$(Platform);$(ISHIKO_CPP_ROOT)/diff\lib\$(Platform);$(ISHIKO_CPP_ROOT)/xml\lib\$(Platform);$(ISHIKO_CPP_ROOT)/process\lib\$(Platform);$(ISHIKO_CPP_ROOT)/time\lib\$(Platform);$(ISHIKO_CPP_ROOT)/test-framework\lib\$(Platform);%(AdditionalLibraryDirectories) + $(ISHIKO_CPP_ROOT)/base-platform\lib\$(Platform);$(ISHIKO_CPP_ROOT)/concurrency\lib\$(Platform);$(ISHIKO_CPP_ROOT)/synchronization\lib\$(Platform);$(ISHIKO_CPP_ROOT)/errors\lib\$(Platform);$(FMT_ROOT)\lib;$(ISHIKO_CPP_ROOT)/memory\lib\$(Platform);$(BOOST_ROOT)\stage\lib;$(ISHIKO_CPP_ROOT)/text\lib\$(Platform);$(ISHIKO_CPP_ROOT)/configuration\lib\$(Platform);$(ISHIKO_CPP_ROOT)/io\lib\$(Platform);$(ISHIKO_CPP_ROOT)/filesystem\lib\$(Platform);$(ISHIKO_CPP_ROOT)/types\lib\$(Platform);$(ISHIKO_CPP_ROOT)/diff\lib\$(Platform);$(ISHIKO_CPP_ROOT)/xml\lib\$(Platform);$(ISHIKO_CPP_ROOT)/process\lib\$(Platform);$(ISHIKO_CPP_ROOT)/time\lib\$(Platform);$(ISHIKO_CPP_ROOT)/test-framework\lib\$(Platform);%(AdditionalLibraryDirectories) fmt-d-x64.lib;%(AdditionalDependencies) @@ -146,7 +146,7 @@ PUGIXML_HEADER_ONLY;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) true false - $(ISHIKO_CPP_ROOT)/synchronization\include;$(ISHIKO_CPP_ROOT)/base-platform\include;$(ISHIKO_CPP_ROOT)/errors\include;$(FMT_ROOT)\include;$(ISHIKO_CPP_ROOT)/memory\include;$(BOOST_ROOT);$(ISHIKO_CPP_ROOT)/text\include;$(ISHIKO_CPP_ROOT)/configuration\include;$(ISHIKO_CPP_ROOT)/io\include;$(ISHIKO_CPP_ROOT)/filesystem\include;$(ISHIKO_CPP_ROOT)/types\include;$(ISHIKO_CPP_ROOT)/diff\include;$(PUGIXML_ROOT)\src;$(ISHIKO_CPP_ROOT)/xml\include;$(ISHIKO_CPP_ROOT)/process\include;$(ISHIKO_CPP_ROOT)/time\include;$(ISHIKO_CPP_ROOT)/test-framework\include;%(AdditionalIncludeDirectories) + $(ISHIKO_CPP_ROOT)/base-platform\include;$(ISHIKO_CPP_ROOT)/concurrency\include;$(ISHIKO_CPP_ROOT)/synchronization\include;$(ISHIKO_CPP_ROOT)/errors\include;$(FMT_ROOT)\include;$(ISHIKO_CPP_ROOT)/memory\include;$(BOOST_ROOT);$(ISHIKO_CPP_ROOT)/text\include;$(ISHIKO_CPP_ROOT)/configuration\include;$(ISHIKO_CPP_ROOT)/io\include;$(ISHIKO_CPP_ROOT)/filesystem\include;$(ISHIKO_CPP_ROOT)/types\include;$(ISHIKO_CPP_ROOT)/diff\include;$(PUGIXML_ROOT)\src;$(ISHIKO_CPP_ROOT)/xml\include;$(ISHIKO_CPP_ROOT)/process\include;$(ISHIKO_CPP_ROOT)/time\include;$(ISHIKO_CPP_ROOT)/test-framework\include;%(AdditionalIncludeDirectories) MultiThreadedDLL /utf-8 %(AdditionalOptions) @@ -155,7 +155,7 @@ true true true - $(ISHIKO_CPP_ROOT)/synchronization\lib\$(Platform);$(ISHIKO_CPP_ROOT)/base-platform\lib\$(Platform);$(ISHIKO_CPP_ROOT)/errors\lib\$(Platform);$(FMT_ROOT)\lib;$(ISHIKO_CPP_ROOT)/memory\lib\$(Platform);$(BOOST_ROOT)\stage\lib;$(ISHIKO_CPP_ROOT)/text\lib\$(Platform);$(ISHIKO_CPP_ROOT)/configuration\lib\$(Platform);$(ISHIKO_CPP_ROOT)/io\lib\$(Platform);$(ISHIKO_CPP_ROOT)/filesystem\lib\$(Platform);$(ISHIKO_CPP_ROOT)/types\lib\$(Platform);$(ISHIKO_CPP_ROOT)/diff\lib\$(Platform);$(ISHIKO_CPP_ROOT)/xml\lib\$(Platform);$(ISHIKO_CPP_ROOT)/process\lib\$(Platform);$(ISHIKO_CPP_ROOT)/time\lib\$(Platform);$(ISHIKO_CPP_ROOT)/test-framework\lib\$(Platform);%(AdditionalLibraryDirectories) + $(ISHIKO_CPP_ROOT)/base-platform\lib\$(Platform);$(ISHIKO_CPP_ROOT)/concurrency\lib\$(Platform);$(ISHIKO_CPP_ROOT)/synchronization\lib\$(Platform);$(ISHIKO_CPP_ROOT)/errors\lib\$(Platform);$(FMT_ROOT)\lib;$(ISHIKO_CPP_ROOT)/memory\lib\$(Platform);$(BOOST_ROOT)\stage\lib;$(ISHIKO_CPP_ROOT)/text\lib\$(Platform);$(ISHIKO_CPP_ROOT)/configuration\lib\$(Platform);$(ISHIKO_CPP_ROOT)/io\lib\$(Platform);$(ISHIKO_CPP_ROOT)/filesystem\lib\$(Platform);$(ISHIKO_CPP_ROOT)/types\lib\$(Platform);$(ISHIKO_CPP_ROOT)/diff\lib\$(Platform);$(ISHIKO_CPP_ROOT)/xml\lib\$(Platform);$(ISHIKO_CPP_ROOT)/process\lib\$(Platform);$(ISHIKO_CPP_ROOT)/time\lib\$(Platform);$(ISHIKO_CPP_ROOT)/test-framework\lib\$(Platform);%(AdditionalLibraryDirectories) fmt-d-x64.lib;%(AdditionalDependencies) diff --git a/tests/build-files/vc16/IshikoSynchronizationTests.vcxproj b/tests/build-files/vc16/IshikoSynchronizationTests.vcxproj index 62d6115..14548a0 100644 --- a/tests/build-files/vc16/IshikoSynchronizationTests.vcxproj +++ b/tests/build-files/vc16/IshikoSynchronizationTests.vcxproj @@ -86,14 +86,14 @@ PUGIXML_HEADER_ONLY;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) true false - $(ISHIKO_CPP_ROOT)/synchronization\include;$(ISHIKO_CPP_ROOT)/base-platform\include;$(ISHIKO_CPP_ROOT)/errors\include;$(FMT_ROOT)\include;$(ISHIKO_CPP_ROOT)/memory\include;$(BOOST_ROOT);$(ISHIKO_CPP_ROOT)/text\include;$(ISHIKO_CPP_ROOT)/configuration\include;$(ISHIKO_CPP_ROOT)/io\include;$(ISHIKO_CPP_ROOT)/filesystem\include;$(ISHIKO_CPP_ROOT)/types\include;$(ISHIKO_CPP_ROOT)/diff\include;$(PUGIXML_ROOT)\src;$(ISHIKO_CPP_ROOT)/xml\include;$(ISHIKO_CPP_ROOT)/process\include;$(ISHIKO_CPP_ROOT)/time\include;$(ISHIKO_CPP_ROOT)/test-framework\include;%(AdditionalIncludeDirectories) + $(ISHIKO_CPP_ROOT)/base-platform\include;$(ISHIKO_CPP_ROOT)/concurrency\include;$(ISHIKO_CPP_ROOT)/synchronization\include;$(ISHIKO_CPP_ROOT)/errors\include;$(FMT_ROOT)\include;$(ISHIKO_CPP_ROOT)/memory\include;$(BOOST_ROOT);$(ISHIKO_CPP_ROOT)/text\include;$(ISHIKO_CPP_ROOT)/configuration\include;$(ISHIKO_CPP_ROOT)/io\include;$(ISHIKO_CPP_ROOT)/filesystem\include;$(ISHIKO_CPP_ROOT)/types\include;$(ISHIKO_CPP_ROOT)/diff\include;$(PUGIXML_ROOT)\src;$(ISHIKO_CPP_ROOT)/xml\include;$(ISHIKO_CPP_ROOT)/process\include;$(ISHIKO_CPP_ROOT)/time\include;$(ISHIKO_CPP_ROOT)/test-framework\include;%(AdditionalIncludeDirectories) MultiThreadedDebugDLL /utf-8 %(AdditionalOptions) Console true - $(ISHIKO_CPP_ROOT)/synchronization\lib\$(Platform);$(ISHIKO_CPP_ROOT)/base-platform\lib\$(Platform);$(ISHIKO_CPP_ROOT)/errors\lib\$(Platform);$(FMT_ROOT)\lib;$(ISHIKO_CPP_ROOT)/memory\lib\$(Platform);$(BOOST_ROOT)\stage\lib;$(ISHIKO_CPP_ROOT)/text\lib\$(Platform);$(ISHIKO_CPP_ROOT)/configuration\lib\$(Platform);$(ISHIKO_CPP_ROOT)/io\lib\$(Platform);$(ISHIKO_CPP_ROOT)/filesystem\lib\$(Platform);$(ISHIKO_CPP_ROOT)/types\lib\$(Platform);$(ISHIKO_CPP_ROOT)/diff\lib\$(Platform);$(ISHIKO_CPP_ROOT)/xml\lib\$(Platform);$(ISHIKO_CPP_ROOT)/process\lib\$(Platform);$(ISHIKO_CPP_ROOT)/time\lib\$(Platform);$(ISHIKO_CPP_ROOT)/test-framework\lib\$(Platform);%(AdditionalLibraryDirectories) + $(ISHIKO_CPP_ROOT)/base-platform\lib\$(Platform);$(ISHIKO_CPP_ROOT)/concurrency\lib\$(Platform);$(ISHIKO_CPP_ROOT)/synchronization\lib\$(Platform);$(ISHIKO_CPP_ROOT)/errors\lib\$(Platform);$(FMT_ROOT)\lib;$(ISHIKO_CPP_ROOT)/memory\lib\$(Platform);$(BOOST_ROOT)\stage\lib;$(ISHIKO_CPP_ROOT)/text\lib\$(Platform);$(ISHIKO_CPP_ROOT)/configuration\lib\$(Platform);$(ISHIKO_CPP_ROOT)/io\lib\$(Platform);$(ISHIKO_CPP_ROOT)/filesystem\lib\$(Platform);$(ISHIKO_CPP_ROOT)/types\lib\$(Platform);$(ISHIKO_CPP_ROOT)/diff\lib\$(Platform);$(ISHIKO_CPP_ROOT)/xml\lib\$(Platform);$(ISHIKO_CPP_ROOT)/process\lib\$(Platform);$(ISHIKO_CPP_ROOT)/time\lib\$(Platform);$(ISHIKO_CPP_ROOT)/test-framework\lib\$(Platform);%(AdditionalLibraryDirectories) fmt-d-x64.lib;%(AdditionalDependencies) @@ -104,14 +104,14 @@ PUGIXML_HEADER_ONLY;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) true false - $(ISHIKO_CPP_ROOT)/synchronization\include;$(ISHIKO_CPP_ROOT)/base-platform\include;$(ISHIKO_CPP_ROOT)/errors\include;$(FMT_ROOT)\include;$(ISHIKO_CPP_ROOT)/memory\include;$(BOOST_ROOT);$(ISHIKO_CPP_ROOT)/text\include;$(ISHIKO_CPP_ROOT)/configuration\include;$(ISHIKO_CPP_ROOT)/io\include;$(ISHIKO_CPP_ROOT)/filesystem\include;$(ISHIKO_CPP_ROOT)/types\include;$(ISHIKO_CPP_ROOT)/diff\include;$(PUGIXML_ROOT)\src;$(ISHIKO_CPP_ROOT)/xml\include;$(ISHIKO_CPP_ROOT)/process\include;$(ISHIKO_CPP_ROOT)/time\include;$(ISHIKO_CPP_ROOT)/test-framework\include;%(AdditionalIncludeDirectories) + $(ISHIKO_CPP_ROOT)/base-platform\include;$(ISHIKO_CPP_ROOT)/concurrency\include;$(ISHIKO_CPP_ROOT)/synchronization\include;$(ISHIKO_CPP_ROOT)/errors\include;$(FMT_ROOT)\include;$(ISHIKO_CPP_ROOT)/memory\include;$(BOOST_ROOT);$(ISHIKO_CPP_ROOT)/text\include;$(ISHIKO_CPP_ROOT)/configuration\include;$(ISHIKO_CPP_ROOT)/io\include;$(ISHIKO_CPP_ROOT)/filesystem\include;$(ISHIKO_CPP_ROOT)/types\include;$(ISHIKO_CPP_ROOT)/diff\include;$(PUGIXML_ROOT)\src;$(ISHIKO_CPP_ROOT)/xml\include;$(ISHIKO_CPP_ROOT)/process\include;$(ISHIKO_CPP_ROOT)/time\include;$(ISHIKO_CPP_ROOT)/test-framework\include;%(AdditionalIncludeDirectories) MultiThreadedDebugDLL /utf-8 %(AdditionalOptions) Console true - $(ISHIKO_CPP_ROOT)/synchronization\lib\$(Platform);$(ISHIKO_CPP_ROOT)/base-platform\lib\$(Platform);$(ISHIKO_CPP_ROOT)/errors\lib\$(Platform);$(FMT_ROOT)\lib;$(ISHIKO_CPP_ROOT)/memory\lib\$(Platform);$(BOOST_ROOT)\stage\lib;$(ISHIKO_CPP_ROOT)/text\lib\$(Platform);$(ISHIKO_CPP_ROOT)/configuration\lib\$(Platform);$(ISHIKO_CPP_ROOT)/io\lib\$(Platform);$(ISHIKO_CPP_ROOT)/filesystem\lib\$(Platform);$(ISHIKO_CPP_ROOT)/types\lib\$(Platform);$(ISHIKO_CPP_ROOT)/diff\lib\$(Platform);$(ISHIKO_CPP_ROOT)/xml\lib\$(Platform);$(ISHIKO_CPP_ROOT)/process\lib\$(Platform);$(ISHIKO_CPP_ROOT)/time\lib\$(Platform);$(ISHIKO_CPP_ROOT)/test-framework\lib\$(Platform);%(AdditionalLibraryDirectories) + $(ISHIKO_CPP_ROOT)/base-platform\lib\$(Platform);$(ISHIKO_CPP_ROOT)/concurrency\lib\$(Platform);$(ISHIKO_CPP_ROOT)/synchronization\lib\$(Platform);$(ISHIKO_CPP_ROOT)/errors\lib\$(Platform);$(FMT_ROOT)\lib;$(ISHIKO_CPP_ROOT)/memory\lib\$(Platform);$(BOOST_ROOT)\stage\lib;$(ISHIKO_CPP_ROOT)/text\lib\$(Platform);$(ISHIKO_CPP_ROOT)/configuration\lib\$(Platform);$(ISHIKO_CPP_ROOT)/io\lib\$(Platform);$(ISHIKO_CPP_ROOT)/filesystem\lib\$(Platform);$(ISHIKO_CPP_ROOT)/types\lib\$(Platform);$(ISHIKO_CPP_ROOT)/diff\lib\$(Platform);$(ISHIKO_CPP_ROOT)/xml\lib\$(Platform);$(ISHIKO_CPP_ROOT)/process\lib\$(Platform);$(ISHIKO_CPP_ROOT)/time\lib\$(Platform);$(ISHIKO_CPP_ROOT)/test-framework\lib\$(Platform);%(AdditionalLibraryDirectories) fmt-d-x64.lib;%(AdditionalDependencies) @@ -124,7 +124,7 @@ PUGIXML_HEADER_ONLY;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) true false - $(ISHIKO_CPP_ROOT)/synchronization\include;$(ISHIKO_CPP_ROOT)/base-platform\include;$(ISHIKO_CPP_ROOT)/errors\include;$(FMT_ROOT)\include;$(ISHIKO_CPP_ROOT)/memory\include;$(BOOST_ROOT);$(ISHIKO_CPP_ROOT)/text\include;$(ISHIKO_CPP_ROOT)/configuration\include;$(ISHIKO_CPP_ROOT)/io\include;$(ISHIKO_CPP_ROOT)/filesystem\include;$(ISHIKO_CPP_ROOT)/types\include;$(ISHIKO_CPP_ROOT)/diff\include;$(PUGIXML_ROOT)\src;$(ISHIKO_CPP_ROOT)/xml\include;$(ISHIKO_CPP_ROOT)/process\include;$(ISHIKO_CPP_ROOT)/time\include;$(ISHIKO_CPP_ROOT)/test-framework\include;%(AdditionalIncludeDirectories) + $(ISHIKO_CPP_ROOT)/base-platform\include;$(ISHIKO_CPP_ROOT)/concurrency\include;$(ISHIKO_CPP_ROOT)/synchronization\include;$(ISHIKO_CPP_ROOT)/errors\include;$(FMT_ROOT)\include;$(ISHIKO_CPP_ROOT)/memory\include;$(BOOST_ROOT);$(ISHIKO_CPP_ROOT)/text\include;$(ISHIKO_CPP_ROOT)/configuration\include;$(ISHIKO_CPP_ROOT)/io\include;$(ISHIKO_CPP_ROOT)/filesystem\include;$(ISHIKO_CPP_ROOT)/types\include;$(ISHIKO_CPP_ROOT)/diff\include;$(PUGIXML_ROOT)\src;$(ISHIKO_CPP_ROOT)/xml\include;$(ISHIKO_CPP_ROOT)/process\include;$(ISHIKO_CPP_ROOT)/time\include;$(ISHIKO_CPP_ROOT)/test-framework\include;%(AdditionalIncludeDirectories) MultiThreadedDLL /utf-8 %(AdditionalOptions) @@ -133,7 +133,7 @@ true true true - $(ISHIKO_CPP_ROOT)/synchronization\lib\$(Platform);$(ISHIKO_CPP_ROOT)/base-platform\lib\$(Platform);$(ISHIKO_CPP_ROOT)/errors\lib\$(Platform);$(FMT_ROOT)\lib;$(ISHIKO_CPP_ROOT)/memory\lib\$(Platform);$(BOOST_ROOT)\stage\lib;$(ISHIKO_CPP_ROOT)/text\lib\$(Platform);$(ISHIKO_CPP_ROOT)/configuration\lib\$(Platform);$(ISHIKO_CPP_ROOT)/io\lib\$(Platform);$(ISHIKO_CPP_ROOT)/filesystem\lib\$(Platform);$(ISHIKO_CPP_ROOT)/types\lib\$(Platform);$(ISHIKO_CPP_ROOT)/diff\lib\$(Platform);$(ISHIKO_CPP_ROOT)/xml\lib\$(Platform);$(ISHIKO_CPP_ROOT)/process\lib\$(Platform);$(ISHIKO_CPP_ROOT)/time\lib\$(Platform);$(ISHIKO_CPP_ROOT)/test-framework\lib\$(Platform);%(AdditionalLibraryDirectories) + $(ISHIKO_CPP_ROOT)/base-platform\lib\$(Platform);$(ISHIKO_CPP_ROOT)/concurrency\lib\$(Platform);$(ISHIKO_CPP_ROOT)/synchronization\lib\$(Platform);$(ISHIKO_CPP_ROOT)/errors\lib\$(Platform);$(FMT_ROOT)\lib;$(ISHIKO_CPP_ROOT)/memory\lib\$(Platform);$(BOOST_ROOT)\stage\lib;$(ISHIKO_CPP_ROOT)/text\lib\$(Platform);$(ISHIKO_CPP_ROOT)/configuration\lib\$(Platform);$(ISHIKO_CPP_ROOT)/io\lib\$(Platform);$(ISHIKO_CPP_ROOT)/filesystem\lib\$(Platform);$(ISHIKO_CPP_ROOT)/types\lib\$(Platform);$(ISHIKO_CPP_ROOT)/diff\lib\$(Platform);$(ISHIKO_CPP_ROOT)/xml\lib\$(Platform);$(ISHIKO_CPP_ROOT)/process\lib\$(Platform);$(ISHIKO_CPP_ROOT)/time\lib\$(Platform);$(ISHIKO_CPP_ROOT)/test-framework\lib\$(Platform);%(AdditionalLibraryDirectories) fmt-d-x64.lib;%(AdditionalDependencies) @@ -146,7 +146,7 @@ PUGIXML_HEADER_ONLY;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) true false - $(ISHIKO_CPP_ROOT)/synchronization\include;$(ISHIKO_CPP_ROOT)/base-platform\include;$(ISHIKO_CPP_ROOT)/errors\include;$(FMT_ROOT)\include;$(ISHIKO_CPP_ROOT)/memory\include;$(BOOST_ROOT);$(ISHIKO_CPP_ROOT)/text\include;$(ISHIKO_CPP_ROOT)/configuration\include;$(ISHIKO_CPP_ROOT)/io\include;$(ISHIKO_CPP_ROOT)/filesystem\include;$(ISHIKO_CPP_ROOT)/types\include;$(ISHIKO_CPP_ROOT)/diff\include;$(PUGIXML_ROOT)\src;$(ISHIKO_CPP_ROOT)/xml\include;$(ISHIKO_CPP_ROOT)/process\include;$(ISHIKO_CPP_ROOT)/time\include;$(ISHIKO_CPP_ROOT)/test-framework\include;%(AdditionalIncludeDirectories) + $(ISHIKO_CPP_ROOT)/base-platform\include;$(ISHIKO_CPP_ROOT)/concurrency\include;$(ISHIKO_CPP_ROOT)/synchronization\include;$(ISHIKO_CPP_ROOT)/errors\include;$(FMT_ROOT)\include;$(ISHIKO_CPP_ROOT)/memory\include;$(BOOST_ROOT);$(ISHIKO_CPP_ROOT)/text\include;$(ISHIKO_CPP_ROOT)/configuration\include;$(ISHIKO_CPP_ROOT)/io\include;$(ISHIKO_CPP_ROOT)/filesystem\include;$(ISHIKO_CPP_ROOT)/types\include;$(ISHIKO_CPP_ROOT)/diff\include;$(PUGIXML_ROOT)\src;$(ISHIKO_CPP_ROOT)/xml\include;$(ISHIKO_CPP_ROOT)/process\include;$(ISHIKO_CPP_ROOT)/time\include;$(ISHIKO_CPP_ROOT)/test-framework\include;%(AdditionalIncludeDirectories) MultiThreadedDLL /utf-8 %(AdditionalOptions) @@ -155,7 +155,7 @@ true true true - $(ISHIKO_CPP_ROOT)/synchronization\lib\$(Platform);$(ISHIKO_CPP_ROOT)/base-platform\lib\$(Platform);$(ISHIKO_CPP_ROOT)/errors\lib\$(Platform);$(FMT_ROOT)\lib;$(ISHIKO_CPP_ROOT)/memory\lib\$(Platform);$(BOOST_ROOT)\stage\lib;$(ISHIKO_CPP_ROOT)/text\lib\$(Platform);$(ISHIKO_CPP_ROOT)/configuration\lib\$(Platform);$(ISHIKO_CPP_ROOT)/io\lib\$(Platform);$(ISHIKO_CPP_ROOT)/filesystem\lib\$(Platform);$(ISHIKO_CPP_ROOT)/types\lib\$(Platform);$(ISHIKO_CPP_ROOT)/diff\lib\$(Platform);$(ISHIKO_CPP_ROOT)/xml\lib\$(Platform);$(ISHIKO_CPP_ROOT)/process\lib\$(Platform);$(ISHIKO_CPP_ROOT)/time\lib\$(Platform);$(ISHIKO_CPP_ROOT)/test-framework\lib\$(Platform);%(AdditionalLibraryDirectories) + $(ISHIKO_CPP_ROOT)/base-platform\lib\$(Platform);$(ISHIKO_CPP_ROOT)/concurrency\lib\$(Platform);$(ISHIKO_CPP_ROOT)/synchronization\lib\$(Platform);$(ISHIKO_CPP_ROOT)/errors\lib\$(Platform);$(FMT_ROOT)\lib;$(ISHIKO_CPP_ROOT)/memory\lib\$(Platform);$(BOOST_ROOT)\stage\lib;$(ISHIKO_CPP_ROOT)/text\lib\$(Platform);$(ISHIKO_CPP_ROOT)/configuration\lib\$(Platform);$(ISHIKO_CPP_ROOT)/io\lib\$(Platform);$(ISHIKO_CPP_ROOT)/filesystem\lib\$(Platform);$(ISHIKO_CPP_ROOT)/types\lib\$(Platform);$(ISHIKO_CPP_ROOT)/diff\lib\$(Platform);$(ISHIKO_CPP_ROOT)/xml\lib\$(Platform);$(ISHIKO_CPP_ROOT)/process\lib\$(Platform);$(ISHIKO_CPP_ROOT)/time\lib\$(Platform);$(ISHIKO_CPP_ROOT)/test-framework\lib\$(Platform);%(AdditionalLibraryDirectories) fmt-d-x64.lib;%(AdditionalDependencies) diff --git a/tests/build-files/vc17/IshikoSynchronizationTests.vcxproj b/tests/build-files/vc17/IshikoSynchronizationTests.vcxproj index cb5f281..0d46c45 100644 --- a/tests/build-files/vc17/IshikoSynchronizationTests.vcxproj +++ b/tests/build-files/vc17/IshikoSynchronizationTests.vcxproj @@ -86,14 +86,14 @@ PUGIXML_HEADER_ONLY;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) true false - $(ISHIKO_CPP_ROOT)/synchronization\include;$(ISHIKO_CPP_ROOT)/base-platform\include;$(ISHIKO_CPP_ROOT)/errors\include;$(FMT_ROOT)\include;$(ISHIKO_CPP_ROOT)/memory\include;$(BOOST_ROOT);$(ISHIKO_CPP_ROOT)/text\include;$(ISHIKO_CPP_ROOT)/configuration\include;$(ISHIKO_CPP_ROOT)/io\include;$(ISHIKO_CPP_ROOT)/filesystem\include;$(ISHIKO_CPP_ROOT)/types\include;$(ISHIKO_CPP_ROOT)/diff\include;$(PUGIXML_ROOT)\src;$(ISHIKO_CPP_ROOT)/xml\include;$(ISHIKO_CPP_ROOT)/process\include;$(ISHIKO_CPP_ROOT)/time\include;$(ISHIKO_CPP_ROOT)/test-framework\include;%(AdditionalIncludeDirectories) + $(ISHIKO_CPP_ROOT)/base-platform\include;$(ISHIKO_CPP_ROOT)/concurrency\include;$(ISHIKO_CPP_ROOT)/synchronization\include;$(ISHIKO_CPP_ROOT)/errors\include;$(FMT_ROOT)\include;$(ISHIKO_CPP_ROOT)/memory\include;$(BOOST_ROOT);$(ISHIKO_CPP_ROOT)/text\include;$(ISHIKO_CPP_ROOT)/configuration\include;$(ISHIKO_CPP_ROOT)/io\include;$(ISHIKO_CPP_ROOT)/filesystem\include;$(ISHIKO_CPP_ROOT)/types\include;$(ISHIKO_CPP_ROOT)/diff\include;$(PUGIXML_ROOT)\src;$(ISHIKO_CPP_ROOT)/xml\include;$(ISHIKO_CPP_ROOT)/process\include;$(ISHIKO_CPP_ROOT)/time\include;$(ISHIKO_CPP_ROOT)/test-framework\include;%(AdditionalIncludeDirectories) MultiThreadedDebugDLL /utf-8 %(AdditionalOptions) Console true - $(ISHIKO_CPP_ROOT)/synchronization\lib\$(Platform);$(ISHIKO_CPP_ROOT)/base-platform\lib\$(Platform);$(ISHIKO_CPP_ROOT)/errors\lib\$(Platform);$(FMT_ROOT)\lib;$(ISHIKO_CPP_ROOT)/memory\lib\$(Platform);$(BOOST_ROOT)\stage\lib;$(ISHIKO_CPP_ROOT)/text\lib\$(Platform);$(ISHIKO_CPP_ROOT)/configuration\lib\$(Platform);$(ISHIKO_CPP_ROOT)/io\lib\$(Platform);$(ISHIKO_CPP_ROOT)/filesystem\lib\$(Platform);$(ISHIKO_CPP_ROOT)/types\lib\$(Platform);$(ISHIKO_CPP_ROOT)/diff\lib\$(Platform);$(ISHIKO_CPP_ROOT)/xml\lib\$(Platform);$(ISHIKO_CPP_ROOT)/process\lib\$(Platform);$(ISHIKO_CPP_ROOT)/time\lib\$(Platform);$(ISHIKO_CPP_ROOT)/test-framework\lib\$(Platform);%(AdditionalLibraryDirectories) + $(ISHIKO_CPP_ROOT)/base-platform\lib\$(Platform);$(ISHIKO_CPP_ROOT)/concurrency\lib\$(Platform);$(ISHIKO_CPP_ROOT)/synchronization\lib\$(Platform);$(ISHIKO_CPP_ROOT)/errors\lib\$(Platform);$(FMT_ROOT)\lib;$(ISHIKO_CPP_ROOT)/memory\lib\$(Platform);$(BOOST_ROOT)\stage\lib;$(ISHIKO_CPP_ROOT)/text\lib\$(Platform);$(ISHIKO_CPP_ROOT)/configuration\lib\$(Platform);$(ISHIKO_CPP_ROOT)/io\lib\$(Platform);$(ISHIKO_CPP_ROOT)/filesystem\lib\$(Platform);$(ISHIKO_CPP_ROOT)/types\lib\$(Platform);$(ISHIKO_CPP_ROOT)/diff\lib\$(Platform);$(ISHIKO_CPP_ROOT)/xml\lib\$(Platform);$(ISHIKO_CPP_ROOT)/process\lib\$(Platform);$(ISHIKO_CPP_ROOT)/time\lib\$(Platform);$(ISHIKO_CPP_ROOT)/test-framework\lib\$(Platform);%(AdditionalLibraryDirectories) fmt-d-x64.lib;%(AdditionalDependencies) @@ -104,14 +104,14 @@ PUGIXML_HEADER_ONLY;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) true false - $(ISHIKO_CPP_ROOT)/synchronization\include;$(ISHIKO_CPP_ROOT)/base-platform\include;$(ISHIKO_CPP_ROOT)/errors\include;$(FMT_ROOT)\include;$(ISHIKO_CPP_ROOT)/memory\include;$(BOOST_ROOT);$(ISHIKO_CPP_ROOT)/text\include;$(ISHIKO_CPP_ROOT)/configuration\include;$(ISHIKO_CPP_ROOT)/io\include;$(ISHIKO_CPP_ROOT)/filesystem\include;$(ISHIKO_CPP_ROOT)/types\include;$(ISHIKO_CPP_ROOT)/diff\include;$(PUGIXML_ROOT)\src;$(ISHIKO_CPP_ROOT)/xml\include;$(ISHIKO_CPP_ROOT)/process\include;$(ISHIKO_CPP_ROOT)/time\include;$(ISHIKO_CPP_ROOT)/test-framework\include;%(AdditionalIncludeDirectories) + $(ISHIKO_CPP_ROOT)/base-platform\include;$(ISHIKO_CPP_ROOT)/concurrency\include;$(ISHIKO_CPP_ROOT)/synchronization\include;$(ISHIKO_CPP_ROOT)/errors\include;$(FMT_ROOT)\include;$(ISHIKO_CPP_ROOT)/memory\include;$(BOOST_ROOT);$(ISHIKO_CPP_ROOT)/text\include;$(ISHIKO_CPP_ROOT)/configuration\include;$(ISHIKO_CPP_ROOT)/io\include;$(ISHIKO_CPP_ROOT)/filesystem\include;$(ISHIKO_CPP_ROOT)/types\include;$(ISHIKO_CPP_ROOT)/diff\include;$(PUGIXML_ROOT)\src;$(ISHIKO_CPP_ROOT)/xml\include;$(ISHIKO_CPP_ROOT)/process\include;$(ISHIKO_CPP_ROOT)/time\include;$(ISHIKO_CPP_ROOT)/test-framework\include;%(AdditionalIncludeDirectories) MultiThreadedDebugDLL /utf-8 %(AdditionalOptions) Console true - $(ISHIKO_CPP_ROOT)/synchronization\lib\$(Platform);$(ISHIKO_CPP_ROOT)/base-platform\lib\$(Platform);$(ISHIKO_CPP_ROOT)/errors\lib\$(Platform);$(FMT_ROOT)\lib;$(ISHIKO_CPP_ROOT)/memory\lib\$(Platform);$(BOOST_ROOT)\stage\lib;$(ISHIKO_CPP_ROOT)/text\lib\$(Platform);$(ISHIKO_CPP_ROOT)/configuration\lib\$(Platform);$(ISHIKO_CPP_ROOT)/io\lib\$(Platform);$(ISHIKO_CPP_ROOT)/filesystem\lib\$(Platform);$(ISHIKO_CPP_ROOT)/types\lib\$(Platform);$(ISHIKO_CPP_ROOT)/diff\lib\$(Platform);$(ISHIKO_CPP_ROOT)/xml\lib\$(Platform);$(ISHIKO_CPP_ROOT)/process\lib\$(Platform);$(ISHIKO_CPP_ROOT)/time\lib\$(Platform);$(ISHIKO_CPP_ROOT)/test-framework\lib\$(Platform);%(AdditionalLibraryDirectories) + $(ISHIKO_CPP_ROOT)/base-platform\lib\$(Platform);$(ISHIKO_CPP_ROOT)/concurrency\lib\$(Platform);$(ISHIKO_CPP_ROOT)/synchronization\lib\$(Platform);$(ISHIKO_CPP_ROOT)/errors\lib\$(Platform);$(FMT_ROOT)\lib;$(ISHIKO_CPP_ROOT)/memory\lib\$(Platform);$(BOOST_ROOT)\stage\lib;$(ISHIKO_CPP_ROOT)/text\lib\$(Platform);$(ISHIKO_CPP_ROOT)/configuration\lib\$(Platform);$(ISHIKO_CPP_ROOT)/io\lib\$(Platform);$(ISHIKO_CPP_ROOT)/filesystem\lib\$(Platform);$(ISHIKO_CPP_ROOT)/types\lib\$(Platform);$(ISHIKO_CPP_ROOT)/diff\lib\$(Platform);$(ISHIKO_CPP_ROOT)/xml\lib\$(Platform);$(ISHIKO_CPP_ROOT)/process\lib\$(Platform);$(ISHIKO_CPP_ROOT)/time\lib\$(Platform);$(ISHIKO_CPP_ROOT)/test-framework\lib\$(Platform);%(AdditionalLibraryDirectories) fmt-d-x64.lib;%(AdditionalDependencies) @@ -124,7 +124,7 @@ PUGIXML_HEADER_ONLY;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) true false - $(ISHIKO_CPP_ROOT)/synchronization\include;$(ISHIKO_CPP_ROOT)/base-platform\include;$(ISHIKO_CPP_ROOT)/errors\include;$(FMT_ROOT)\include;$(ISHIKO_CPP_ROOT)/memory\include;$(BOOST_ROOT);$(ISHIKO_CPP_ROOT)/text\include;$(ISHIKO_CPP_ROOT)/configuration\include;$(ISHIKO_CPP_ROOT)/io\include;$(ISHIKO_CPP_ROOT)/filesystem\include;$(ISHIKO_CPP_ROOT)/types\include;$(ISHIKO_CPP_ROOT)/diff\include;$(PUGIXML_ROOT)\src;$(ISHIKO_CPP_ROOT)/xml\include;$(ISHIKO_CPP_ROOT)/process\include;$(ISHIKO_CPP_ROOT)/time\include;$(ISHIKO_CPP_ROOT)/test-framework\include;%(AdditionalIncludeDirectories) + $(ISHIKO_CPP_ROOT)/base-platform\include;$(ISHIKO_CPP_ROOT)/concurrency\include;$(ISHIKO_CPP_ROOT)/synchronization\include;$(ISHIKO_CPP_ROOT)/errors\include;$(FMT_ROOT)\include;$(ISHIKO_CPP_ROOT)/memory\include;$(BOOST_ROOT);$(ISHIKO_CPP_ROOT)/text\include;$(ISHIKO_CPP_ROOT)/configuration\include;$(ISHIKO_CPP_ROOT)/io\include;$(ISHIKO_CPP_ROOT)/filesystem\include;$(ISHIKO_CPP_ROOT)/types\include;$(ISHIKO_CPP_ROOT)/diff\include;$(PUGIXML_ROOT)\src;$(ISHIKO_CPP_ROOT)/xml\include;$(ISHIKO_CPP_ROOT)/process\include;$(ISHIKO_CPP_ROOT)/time\include;$(ISHIKO_CPP_ROOT)/test-framework\include;%(AdditionalIncludeDirectories) MultiThreadedDLL /utf-8 %(AdditionalOptions) @@ -133,7 +133,7 @@ true true true - $(ISHIKO_CPP_ROOT)/synchronization\lib\$(Platform);$(ISHIKO_CPP_ROOT)/base-platform\lib\$(Platform);$(ISHIKO_CPP_ROOT)/errors\lib\$(Platform);$(FMT_ROOT)\lib;$(ISHIKO_CPP_ROOT)/memory\lib\$(Platform);$(BOOST_ROOT)\stage\lib;$(ISHIKO_CPP_ROOT)/text\lib\$(Platform);$(ISHIKO_CPP_ROOT)/configuration\lib\$(Platform);$(ISHIKO_CPP_ROOT)/io\lib\$(Platform);$(ISHIKO_CPP_ROOT)/filesystem\lib\$(Platform);$(ISHIKO_CPP_ROOT)/types\lib\$(Platform);$(ISHIKO_CPP_ROOT)/diff\lib\$(Platform);$(ISHIKO_CPP_ROOT)/xml\lib\$(Platform);$(ISHIKO_CPP_ROOT)/process\lib\$(Platform);$(ISHIKO_CPP_ROOT)/time\lib\$(Platform);$(ISHIKO_CPP_ROOT)/test-framework\lib\$(Platform);%(AdditionalLibraryDirectories) + $(ISHIKO_CPP_ROOT)/base-platform\lib\$(Platform);$(ISHIKO_CPP_ROOT)/concurrency\lib\$(Platform);$(ISHIKO_CPP_ROOT)/synchronization\lib\$(Platform);$(ISHIKO_CPP_ROOT)/errors\lib\$(Platform);$(FMT_ROOT)\lib;$(ISHIKO_CPP_ROOT)/memory\lib\$(Platform);$(BOOST_ROOT)\stage\lib;$(ISHIKO_CPP_ROOT)/text\lib\$(Platform);$(ISHIKO_CPP_ROOT)/configuration\lib\$(Platform);$(ISHIKO_CPP_ROOT)/io\lib\$(Platform);$(ISHIKO_CPP_ROOT)/filesystem\lib\$(Platform);$(ISHIKO_CPP_ROOT)/types\lib\$(Platform);$(ISHIKO_CPP_ROOT)/diff\lib\$(Platform);$(ISHIKO_CPP_ROOT)/xml\lib\$(Platform);$(ISHIKO_CPP_ROOT)/process\lib\$(Platform);$(ISHIKO_CPP_ROOT)/time\lib\$(Platform);$(ISHIKO_CPP_ROOT)/test-framework\lib\$(Platform);%(AdditionalLibraryDirectories) fmt-d-x64.lib;%(AdditionalDependencies) @@ -146,7 +146,7 @@ PUGIXML_HEADER_ONLY;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) true false - $(ISHIKO_CPP_ROOT)/synchronization\include;$(ISHIKO_CPP_ROOT)/base-platform\include;$(ISHIKO_CPP_ROOT)/errors\include;$(FMT_ROOT)\include;$(ISHIKO_CPP_ROOT)/memory\include;$(BOOST_ROOT);$(ISHIKO_CPP_ROOT)/text\include;$(ISHIKO_CPP_ROOT)/configuration\include;$(ISHIKO_CPP_ROOT)/io\include;$(ISHIKO_CPP_ROOT)/filesystem\include;$(ISHIKO_CPP_ROOT)/types\include;$(ISHIKO_CPP_ROOT)/diff\include;$(PUGIXML_ROOT)\src;$(ISHIKO_CPP_ROOT)/xml\include;$(ISHIKO_CPP_ROOT)/process\include;$(ISHIKO_CPP_ROOT)/time\include;$(ISHIKO_CPP_ROOT)/test-framework\include;%(AdditionalIncludeDirectories) + $(ISHIKO_CPP_ROOT)/base-platform\include;$(ISHIKO_CPP_ROOT)/concurrency\include;$(ISHIKO_CPP_ROOT)/synchronization\include;$(ISHIKO_CPP_ROOT)/errors\include;$(FMT_ROOT)\include;$(ISHIKO_CPP_ROOT)/memory\include;$(BOOST_ROOT);$(ISHIKO_CPP_ROOT)/text\include;$(ISHIKO_CPP_ROOT)/configuration\include;$(ISHIKO_CPP_ROOT)/io\include;$(ISHIKO_CPP_ROOT)/filesystem\include;$(ISHIKO_CPP_ROOT)/types\include;$(ISHIKO_CPP_ROOT)/diff\include;$(PUGIXML_ROOT)\src;$(ISHIKO_CPP_ROOT)/xml\include;$(ISHIKO_CPP_ROOT)/process\include;$(ISHIKO_CPP_ROOT)/time\include;$(ISHIKO_CPP_ROOT)/test-framework\include;%(AdditionalIncludeDirectories) MultiThreadedDLL /utf-8 %(AdditionalOptions) @@ -155,7 +155,7 @@ true true true - $(ISHIKO_CPP_ROOT)/synchronization\lib\$(Platform);$(ISHIKO_CPP_ROOT)/base-platform\lib\$(Platform);$(ISHIKO_CPP_ROOT)/errors\lib\$(Platform);$(FMT_ROOT)\lib;$(ISHIKO_CPP_ROOT)/memory\lib\$(Platform);$(BOOST_ROOT)\stage\lib;$(ISHIKO_CPP_ROOT)/text\lib\$(Platform);$(ISHIKO_CPP_ROOT)/configuration\lib\$(Platform);$(ISHIKO_CPP_ROOT)/io\lib\$(Platform);$(ISHIKO_CPP_ROOT)/filesystem\lib\$(Platform);$(ISHIKO_CPP_ROOT)/types\lib\$(Platform);$(ISHIKO_CPP_ROOT)/diff\lib\$(Platform);$(ISHIKO_CPP_ROOT)/xml\lib\$(Platform);$(ISHIKO_CPP_ROOT)/process\lib\$(Platform);$(ISHIKO_CPP_ROOT)/time\lib\$(Platform);$(ISHIKO_CPP_ROOT)/test-framework\lib\$(Platform);%(AdditionalLibraryDirectories) + $(ISHIKO_CPP_ROOT)/base-platform\lib\$(Platform);$(ISHIKO_CPP_ROOT)/concurrency\lib\$(Platform);$(ISHIKO_CPP_ROOT)/synchronization\lib\$(Platform);$(ISHIKO_CPP_ROOT)/errors\lib\$(Platform);$(FMT_ROOT)\lib;$(ISHIKO_CPP_ROOT)/memory\lib\$(Platform);$(BOOST_ROOT)\stage\lib;$(ISHIKO_CPP_ROOT)/text\lib\$(Platform);$(ISHIKO_CPP_ROOT)/configuration\lib\$(Platform);$(ISHIKO_CPP_ROOT)/io\lib\$(Platform);$(ISHIKO_CPP_ROOT)/filesystem\lib\$(Platform);$(ISHIKO_CPP_ROOT)/types\lib\$(Platform);$(ISHIKO_CPP_ROOT)/diff\lib\$(Platform);$(ISHIKO_CPP_ROOT)/xml\lib\$(Platform);$(ISHIKO_CPP_ROOT)/process\lib\$(Platform);$(ISHIKO_CPP_ROOT)/time\lib\$(Platform);$(ISHIKO_CPP_ROOT)/test-framework\lib\$(Platform);%(AdditionalLibraryDirectories) fmt-d-x64.lib;%(AdditionalDependencies) diff --git a/tests/src/SpinlockTests.cpp b/tests/src/SpinlockTests.cpp index 326b4e7..50ba65b 100644 --- a/tests/src/SpinlockTests.cpp +++ b/tests/src/SpinlockTests.cpp @@ -3,7 +3,7 @@ #include "SpinlockTests.hpp" #include "Ishiko/Synchronization/Spinlock.hpp" -#include +#include using namespace Ishiko; @@ -60,12 +60,13 @@ void SpinlockTests::AcquireTest2(Test& test) { int result = 0; - std::thread thread1(SpinlockAcquireTest2Helper, &result); - std::thread thread2(SpinlockAcquireTest2Helper, &result); + Thread thread1(SpinlockAcquireTest2Helper, &result); + Thread thread2(SpinlockAcquireTest2Helper, &result); thread1.resume(); thread2.resume(); thread1.join(); thread2.join(); ISHIKO_TEST_FAIL_IF_NEQ(result, 40000); + ISHIKO_TEST_PASS(); }