Skip to content

Update build files #7

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 3 commits into
base: develop
Choose a base branch
from
Open

Update build files #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
37fff89
Update build files
xleclercq Oct 25, 2025
23c6803
Updates
xleclercq Oct 25, 2025
5742bd6
Updates
xleclercq Oct 25, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 11 additions & 11 deletions .circleci/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
7 changes: 4 additions & 3 deletions build-files/bakefile/IshikoSynchronization.bkl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
{
Expand All @@ -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);
}

Expand All @@ -31,6 +31,7 @@ library IshikoSynchronization
headers
{
../../include/Ishiko/Synchronization.hpp
../../include/Ishiko/Synchronization/linkoptions.hpp
../../include/Ishiko/Synchronization/Spinlock.hpp
}

Expand Down
2 changes: 1 addition & 1 deletion build-files/gnumake/GNUmakefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
28 changes: 0 additions & 28 deletions build-files/vc14/IshikoSynchronization.sln
View file
Open in desktop

This file was deleted.

162 changes: 0 additions & 162 deletions build-files/vc14/IshikoSynchronization.vcxproj
View file
Open in desktop

This file was deleted.

32 changes: 0 additions & 32 deletions build-files/vc14/IshikoSynchronization.vcxproj.filters
View file
Open in desktop

This file was deleted.

5 changes: 5 additions & 0 deletions build-files/vc15/IshikoSynchronization.vcxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,7 @@
<MinimalRebuild>false</MinimalRebuild>
<AdditionalIncludeDirectories>..\..\include\Ishiko\Synchronization;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
<AdditionalOptions>/utf-8 %(AdditionalOptions)</AdditionalOptions>
</ClCompile>
<Link>
<SubSystem>Windows</SubSystem>
Expand All @@ -105,6 +106,7 @@
<MinimalRebuild>false</MinimalRebuild>
<AdditionalIncludeDirectories>..\..\include\Ishiko\Synchronization;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
<AdditionalOptions>/utf-8 %(AdditionalOptions)</AdditionalOptions>
</ClCompile>
<Link>
<SubSystem>Windows</SubSystem>
Expand All @@ -122,6 +124,7 @@
<MinimalRebuild>false</MinimalRebuild>
<AdditionalIncludeDirectories>..\..\include\Ishiko\Synchronization;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
<AdditionalOptions>/utf-8 %(AdditionalOptions)</AdditionalOptions>
</ClCompile>
<Link>
<SubSystem>Windows</SubSystem>
Expand All @@ -141,6 +144,7 @@
<MinimalRebuild>false</MinimalRebuild>
<AdditionalIncludeDirectories>..\..\include\Ishiko\Synchronization;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
<AdditionalOptions>/utf-8 %(AdditionalOptions)</AdditionalOptions>
</ClCompile>
<Link>
<SubSystem>Windows</SubSystem>
Expand All @@ -154,6 +158,7 @@
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\..\include\Ishiko\Synchronization.hpp" />
<ClInclude Include="..\..\include\Ishiko\Synchronization\linkoptions.hpp" />
<ClInclude Include="..\..\include\Ishiko\Synchronization\Spinlock.hpp" />
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
Expand Down
3 changes: 3 additions & 0 deletions build-files/vc15/IshikoSynchronization.vcxproj.filters
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,9 @@
<ClInclude Include="..\..\include\Ishiko\Synchronization.hpp">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\include\Ishiko\Synchronization\linkoptions.hpp">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\include\Ishiko\Synchronization\Spinlock.hpp">
<Filter>Header Files</Filter>
</ClInclude>
Expand Down
Loading