Commit Graph

28 Commits

Author SHA1 Message Date
5b8c81dfac Support compiling third party library C files as C code 2025-01-28 22:10:42 +02:00
d2d2297dc7 Support ARM64 architecture under Windows 2024-06-01 23:23:24 +03:00
Wojtek Figat
859c420d76 Update year in copyright note 2024-02-26 19:00:48 +01:00
a8913d89ac Fix C++ Intellisense not working with latest version of Rider
Project `IncludePath` doesn't seem to include NMake include paths
anymore in Rider, populate the property with same paths to work around
the issue.
2024-01-01 17:47:04 +02:00
Wojtek Figat
40d6e18e7e Add -dotnet=ver command arg to Flax.Build to specify .NET SDK version to use for build 2023-11-25 12:16:13 +01:00
22e5afdb6f Fix Visual Studio project GUIDs getting randomized during regeneration 2023-09-27 20:17:19 +03:00
Wojtek Figat
5ae27a0e92 Code style fix 2023-08-14 15:25:12 +02:00
e6878942f9 Fix missing C++ standard version in VC++ projects intellisense options 2023-08-13 21:33:17 +03:00
Wojtek Figat
5f019dc79f Improve Visual Studio solution generation with nested C# project cross-references to properly place projects in group folders 2023-06-16 13:45:54 +02:00
Wojtek Figat
0cf40729fa Merge remote-tracking branch 'origin/master' into dotnet7 2023-02-19 15:04:02 +01:00
847a28d133 Fix running VC++-project build commands with Rider on Linux 2023-02-03 22:37:31 +02:00
Wojciech Figat
7b20bc38a4 Merge branch '1.5' into dotnet7
# Conflicts:
#	Content/Shaders/GI/DDGI.flax
#	Content/Shaders/GI/GlobalSurfaceAtlas.flax
#	Content/Shaders/TAA.flax
#	Content/Shaders/VolumetricFog.flax
#	Source/Tools/Flax.Build/Projects/VisualStudio/VCProjectGenerator.cs
2023-01-17 11:52:52 +01:00
Wojciech Figat
99ce5cd4d4 Fix for Visual Studio projects when using vs2022 2023-01-16 13:33:36 +01:00
Wojciech Figat
eebc4951de Merge branch '1.5' into dotnet7
# Conflicts:
#	Source/Platforms/DotNet/NUnit/agents/net40/nunit-agent.exe
#	Source/Platforms/DotNet/NUnit/agents/net40/nunit.engine.api.dll
#	Source/Platforms/DotNet/NUnit/agents/net40/nunit.engine.core.dll
#	Source/Platforms/DotNet/NUnit/agents/net7.0/nunit.agent.addins
#	Source/Platforms/DotNet/NUnit/nunit.engine.api.dll
#	Source/Platforms/DotNet/NUnit/nunit.engine.core.dll
#	Source/Platforms/DotNet/NUnit/nunit.engine.dll
#	Source/Platforms/DotNet/NUnit/nunit3-console.exe
#	Source/Platforms/DotNet/NUnit/nunit3-console.exe.config
#	Source/Platforms/DotNet/NUnit/testcentric.engine.metadata.dll
#	Source/Tools/Flax.Build/Deps/Downloader.cs
#	Source/Tools/Flax.Stats/CodeFrame.cs
#	Source/Tools/Flax.Stats/CodeFrameNode.cs
#	Source/Tools/Flax.Stats/Flax.Stats.Build.cs
#	Source/Tools/Flax.Stats/Languages.cs
#	Source/Tools/Flax.Stats/Program.cs
#	Source/Tools/Flax.Stats/TaskType.cs
#	Source/Tools/Flax.Stats/Tools.cs
#	Source/Tools/FlaxEngine.Tests/TestEditorUtils.cs
2023-01-10 15:49:44 +01:00
Wojciech Figat
a7e428a21c Merge branch 'master' into 1.5
# Conflicts:
#	Content/Shaders/GI/DDGI.flax
#	Content/Shaders/GI/GlobalSurfaceAtlas.flax
#	Content/Shaders/TAA.flax
#	Content/Shaders/VolumetricFog.flax
#	Source/Editor/CustomEditors/Editors/ActorTagEditor.cs
#	Source/Engine/Core/Config/GraphicsSettings.cpp
#	Source/Engine/Engine/PostProcessEffect.cs
#	Source/Engine/Graphics/GPUResourcesCollection.cpp
#	Source/Engine/Graphics/GPUResourcesCollection.h
#	Source/Engine/Graphics/PostProcessBase.h
#	Source/FlaxEngine.Gen.cs
2023-01-10 15:37:55 +01:00
Wojciech Figat
9626e9bbb6 Update copyright year 2023-01-10 15:29:37 +01:00
bf190810dd Fix building VC++-projects 2022-11-27 15:49:39 +02:00
76ee695a59 Cleanup and minor fixes 2022-11-27 14:45:55 +02:00
fe943ca010 Temporary fix to build errors in VC++ projects 2022-11-26 13:55:19 +02:00
cb09fb570d Change build scripts to call build tool with dotnet 2022-11-26 13:50:32 +02:00
Wojtek Figat
a006fcec40 Fix overlapping VC++ and CSharp projects in Visual Studio solution 2022-09-12 20:17:52 +02:00
Wojciech Figat
8c2241c6dc Update copyright year 2022-01-14 13:31:12 +01:00
Wojtek Figat
13ab912bb4 Add support for Visual Studio 2022 in Flax.Build 2021-11-10 19:12:27 +01:00
Wojtek Figat
5a9ca6f130 Merge remote-tracking branch 'origin/1.1' into linux-editor
# Conflicts:
#	Source/Engine/Core/Math/BoundingSphere.cs
#	Source/Engine/Debug/DebugDraw.cpp
#	Source/Engine/Platform/Win32/Win32Platform.cpp
#	Source/Engine/Platform/Win32/Win32Platform.h
2021-02-23 22:32:17 +01:00
Wojtek Figat
3387da92ed Optimize 2021-02-23 18:17:18 +01:00
Wojtek Figat
c8a70ffda6 Add passing compiler to the build commands from generated projects 2021-02-17 15:58:52 +01:00
Jean-Baptiste Perrier
03eb39afe6 Bumping all copyright headers to 2021. 2021-01-02 14:28:49 +01:00
Wojtek Figat
6fb9eee74c You're breathtaking! 2020-12-07 23:40:54 +01:00