Added the shader compiler to the fastbuild pipeline.

2026-01-09 14:07:36 -05:00
parent 71a78863b7
commit bd45cacc6c
16 changed files with 398 additions and 233 deletions
--- a/External/SDK/Clang/Windows/Clang.bff
+++ b/External/SDK/Clang/Windows/Clang.bff
@@ -151,6 +151,11 @@ Compiler( 'Compiler-Clang19-NonCL' )
    .Compiler                       = 'Compiler-Clang19'
    .CommonCompilerOptions          = ' -c'                             // Compile only
                                    + ' /Z7'                            // Include debug info
                                    + ' -D_CRT_SECURE_NO_WARNINGS'
                                    // Unicode
                                    + ' /utf-8'
                                    + ' /D "_UNICODE" /D "UNICODE"'
                                    // Include paths
                                    + ' -I"./"'
@@ -186,6 +191,11 @@ Compiler( 'Compiler-Clang19-NonCL' )
    .Compiler                       = 'Compiler-Clang19-NonCL'
    .CommonCompilerOptions          = ' -c'                             // Compile only
                                    + ' -g'                             // Include debug info
                                    + ' -D_CRT_SECURE_NO_WARNINGS'
                                    // Unicode
                                    + ' /utf-8'
                                    + ' /D "_UNICODE" /D "UNICODE"'
                                    // Include paths
                                    + ' "-I./"'
--- a/External/SDK/VisualStudio/VS2022.bff
+++ b/External/SDK/VisualStudio/VS2022.bff
@@ -145,6 +145,11 @@ Compiler( 'Compiler-VS2022-ARM64' )
                                    + ' /GR-'               // No RTTI
                                    + ' /EHs-c-'            // No exceptions
                                    + ' -D_CRT_SECURE_NO_WARNINGS'
                                    + ' /utf-8'
                                    + ' /D "_UNICODE" /D "UNICODE"'
                                    // Warnings
                                    + ' /Wall'              // Enable all warnings (we'll disable those that are not useful)
                                    + ' /WX'                // Warnings as errors
--- a/Game/Game.vcxproj
+++ b/Game/Game.vcxproj
@@ -177,8 +177,8 @@
  </ImportGroup>
  <PropertyGroup Label="UserMacros" />
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='x64-Debug|x64'">
-    <NMakeBuildCommandLine>cd $(SolutionDir) &amp; misc\fbuild -vs -dist -monitor -cache $(ProjectName)-$(Configuration)</NMakeBuildCommandLine>
+    <NMakeBuildCommandLine>cd $(SolutionDir) &amp; misc\fbuild -ide -dist -monitor -cache $(ProjectName)-$(Configuration)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>cd $(SolutionDir) &amp; mics\fbuild -vs -dist -monitor -cache -clean $(ProjectName)-$(Configuration)</NMakeReBuildCommandLine>
+    <NMakeReBuildCommandLine>cd $(SolutionDir) &amp; mics\fbuild -ide -dist -monitor -cache -clean $(ProjectName)-$(Configuration)</NMakeReBuildCommandLine>
    <NMakePreprocessorDefinitions>WIN32_LEAN_AND_MEAN;WIN32;_WIN32;__WINDOWS__;_HAS_EXCEPTIONS=0;WIN64;DEBUG;PROFILING_ENABLED;JULIET_EXPORT;JULIET_WIN32;</NMakePreprocessorDefinitions>
    <NMakeIncludeSearchPath>..\;..\Juliet\include;..\Juliet\src;C:\Program Files\Microsoft Visual Studio\2022\Community\VC\Tools\MSVC\14.44.35207\include\;C:\Program Files (x86)\Windows Kits\10\Include\10.0.26100.0\ucrt;C:\Program Files (x86)\Windows Kits\10\Include\10.0.26100.0\um;C:\Program Files (x86)\Windows Kits\10\Include\10.0.26100.0\shared;</NMakeIncludeSearchPath>
    <AdditionalOptions>/std:c++20 /wd5267 /wd4061 /wd4505 /wd4514 /wd4577 /wd4625 /wd4710 /wd4711 /wd4746 /wd4820 /wd5045 /wd5220 /wd5245 </AdditionalOptions>
@@ -187,8 +187,8 @@
    <OutDir>$(SolutionDir)\bin</OutDir>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='x64-Profile|x64'">
-    <NMakeBuildCommandLine>cd $(SolutionDir) &amp; misc\fbuild -vs -dist -monitor -cache $(ProjectName)-$(Configuration)</NMakeBuildCommandLine>
+    <NMakeBuildCommandLine>cd $(SolutionDir) &amp; misc\fbuild -ide -dist -monitor -cache $(ProjectName)-$(Configuration)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>cd $(SolutionDir) &amp; mics\fbuild -vs -dist -monitor -cache -clean $(ProjectName)-$(Configuration)</NMakeReBuildCommandLine>
+    <NMakeReBuildCommandLine>cd $(SolutionDir) &amp; mics\fbuild -ide -dist -monitor -cache -clean $(ProjectName)-$(Configuration)</NMakeReBuildCommandLine>
    <NMakePreprocessorDefinitions>WIN32_LEAN_AND_MEAN;WIN32;_WIN32;__WINDOWS__;_HAS_EXCEPTIONS=0;WIN64;RELEASE;PROFILING_ENABLED;JULIET_EXPORT;JULIET_WIN32;</NMakePreprocessorDefinitions>
    <NMakeIncludeSearchPath>..\;..\Juliet\include;..\Juliet\src;C:\Program Files\Microsoft Visual Studio\2022\Community\VC\Tools\MSVC\14.44.35207\include\;C:\Program Files (x86)\Windows Kits\10\Include\10.0.26100.0\ucrt;C:\Program Files (x86)\Windows Kits\10\Include\10.0.26100.0\um;C:\Program Files (x86)\Windows Kits\10\Include\10.0.26100.0\shared;</NMakeIncludeSearchPath>
    <AdditionalOptions>/std:c++20 /wd5267 /wd4061 /wd4505 /wd4514 /wd4577 /wd4625 /wd4710 /wd4711 /wd4746 /wd4820 /wd5045 /wd5220 /wd5245 </AdditionalOptions>
@@ -197,8 +197,8 @@
    <OutDir>$(SolutionDir)\bin</OutDir>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='x64-Release|x64'">
-    <NMakeBuildCommandLine>cd $(SolutionDir) &amp; misc\fbuild -vs -dist -monitor -cache $(ProjectName)-$(Configuration)</NMakeBuildCommandLine>
+    <NMakeBuildCommandLine>cd $(SolutionDir) &amp; misc\fbuild -ide -dist -monitor -cache $(ProjectName)-$(Configuration)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>cd $(SolutionDir) &amp; mics\fbuild -vs -dist -monitor -cache -clean $(ProjectName)-$(Configuration)</NMakeReBuildCommandLine>
+    <NMakeReBuildCommandLine>cd $(SolutionDir) &amp; mics\fbuild -ide -dist -monitor -cache -clean $(ProjectName)-$(Configuration)</NMakeReBuildCommandLine>
    <NMakePreprocessorDefinitions>WIN32_LEAN_AND_MEAN;WIN32;_WIN32;__WINDOWS__;_HAS_EXCEPTIONS=0;WIN64;RELEASE;JULIET_EXPORT;JULIET_WIN32;</NMakePreprocessorDefinitions>
    <NMakeIncludeSearchPath>..\;..\Juliet\include;..\Juliet\src;C:\Program Files\Microsoft Visual Studio\2022\Community\VC\Tools\MSVC\14.44.35207\include\;C:\Program Files (x86)\Windows Kits\10\Include\10.0.26100.0\ucrt;C:\Program Files (x86)\Windows Kits\10\Include\10.0.26100.0\um;C:\Program Files (x86)\Windows Kits\10\Include\10.0.26100.0\shared;</NMakeIncludeSearchPath>
    <AdditionalOptions>/std:c++20 /wd5267 /wd4061 /wd4505 /wd4514 /wd4577 /wd4625 /wd4710 /wd4711 /wd4746 /wd4820 /wd5045 /wd5220 /wd5245 </AdditionalOptions>
@@ -207,8 +207,8 @@
    <OutDir>$(SolutionDir)\bin</OutDir>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='x64Clang-Debug|x64'">
-    <NMakeBuildCommandLine>cd $(SolutionDir) &amp; misc\fbuild -vs -dist -monitor -cache $(ProjectName)-$(Configuration)</NMakeBuildCommandLine>
+    <NMakeBuildCommandLine>cd $(SolutionDir) &amp; misc\fbuild -ide -dist -monitor -cache $(ProjectName)-$(Configuration)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>cd $(SolutionDir) &amp; mics\fbuild -vs -dist -monitor -cache -clean $(ProjectName)-$(Configuration)</NMakeReBuildCommandLine>
+    <NMakeReBuildCommandLine>cd $(SolutionDir) &amp; mics\fbuild -ide -dist -monitor -cache -clean $(ProjectName)-$(Configuration)</NMakeReBuildCommandLine>
    <NMakePreprocessorDefinitions>WIN32_LEAN_AND_MEAN;WIN32;_WIN32;__WINDOWS__;_HAS_EXCEPTIONS=0;WIN64;DEBUG;PROFILING_ENABLED;JULIET_EXPORT;JULIET_WIN32;</NMakePreprocessorDefinitions>
    <NMakeIncludeSearchPath>..\;..\Juliet\include;..\Juliet\src;C:\Program Files\Microsoft Visual Studio\2022\Community\VC\Tools\MSVC\14.44.35207\include\;C:\Program Files (x86)\Windows Kits\10\Include\10.0.26100.0\ucrt;C:\Program Files (x86)\Windows Kits\10\Include\10.0.26100.0\um;C:\Program Files (x86)\Windows Kits\10\Include\10.0.26100.0\shared;</NMakeIncludeSearchPath>
    <AdditionalOptions>/std:c++20 /wd5267 /wd4061 /wd4505 /wd4514 /wd4577 /wd4625 /wd4710 /wd4711 /wd4746 /wd4820 /wd5045 /wd5220 /wd5245 </AdditionalOptions>
@@ -217,8 +217,8 @@
    <OutDir>$(SolutionDir)\bin</OutDir>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='x64Clang-Profile|x64'">
-    <NMakeBuildCommandLine>cd $(SolutionDir) &amp; misc\fbuild -vs -dist -monitor -cache $(ProjectName)-$(Configuration)</NMakeBuildCommandLine>
+    <NMakeBuildCommandLine>cd $(SolutionDir) &amp; misc\fbuild -ide -dist -monitor -cache $(ProjectName)-$(Configuration)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>cd $(SolutionDir) &amp; mics\fbuild -vs -dist -monitor -cache -clean $(ProjectName)-$(Configuration)</NMakeReBuildCommandLine>
+    <NMakeReBuildCommandLine>cd $(SolutionDir) &amp; mics\fbuild -ide -dist -monitor -cache -clean $(ProjectName)-$(Configuration)</NMakeReBuildCommandLine>
    <NMakePreprocessorDefinitions>WIN32_LEAN_AND_MEAN;WIN32;_WIN32;__WINDOWS__;_HAS_EXCEPTIONS=0;WIN64;RELEASE;PROFILING_ENABLED;JULIET_EXPORT;JULIET_WIN32;</NMakePreprocessorDefinitions>
    <NMakeIncludeSearchPath>..\;..\Juliet\include;..\Juliet\src;C:\Program Files\Microsoft Visual Studio\2022\Community\VC\Tools\MSVC\14.44.35207\include\;C:\Program Files (x86)\Windows Kits\10\Include\10.0.26100.0\ucrt;C:\Program Files (x86)\Windows Kits\10\Include\10.0.26100.0\um;C:\Program Files (x86)\Windows Kits\10\Include\10.0.26100.0\shared;</NMakeIncludeSearchPath>
    <AdditionalOptions>/std:c++20 /wd5267 /wd4061 /wd4505 /wd4514 /wd4577 /wd4625 /wd4710 /wd4711 /wd4746 /wd4820 /wd5045 /wd5220 /wd5245 </AdditionalOptions>
@@ -227,8 +227,8 @@
    <OutDir>$(SolutionDir)\bin</OutDir>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='x64Clang-Release|x64'">
-    <NMakeBuildCommandLine>cd $(SolutionDir) &amp; misc\fbuild -vs -dist -monitor -cache $(ProjectName)-$(Configuration)</NMakeBuildCommandLine>
+    <NMakeBuildCommandLine>cd $(SolutionDir) &amp; misc\fbuild -ide -dist -monitor -cache $(ProjectName)-$(Configuration)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>cd $(SolutionDir) &amp; mics\fbuild -vs -dist -monitor -cache -clean $(ProjectName)-$(Configuration)</NMakeReBuildCommandLine>
+    <NMakeReBuildCommandLine>cd $(SolutionDir) &amp; mics\fbuild -ide -dist -monitor -cache -clean $(ProjectName)-$(Configuration)</NMakeReBuildCommandLine>
    <NMakePreprocessorDefinitions>WIN32_LEAN_AND_MEAN;WIN32;_WIN32;__WINDOWS__;_HAS_EXCEPTIONS=0;WIN64;RELEASE;JULIET_EXPORT;JULIET_WIN32;</NMakePreprocessorDefinitions>
    <NMakeIncludeSearchPath>..\;..\Juliet\include;..\Juliet\src;C:\Program Files\Microsoft Visual Studio\2022\Community\VC\Tools\MSVC\14.44.35207\include\;C:\Program Files (x86)\Windows Kits\10\Include\10.0.26100.0\ucrt;C:\Program Files (x86)\Windows Kits\10\Include\10.0.26100.0\um;C:\Program Files (x86)\Windows Kits\10\Include\10.0.26100.0\shared;</NMakeIncludeSearchPath>
    <AdditionalOptions>/std:c++20 /wd5267 /wd4061 /wd4505 /wd4514 /wd4577 /wd4625 /wd4710 /wd4711 /wd4746 /wd4820 /wd5045 /wd5220 /wd5245 </AdditionalOptions>
@@ -237,8 +237,8 @@
    <OutDir>$(SolutionDir)\bin</OutDir>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='x64-Debug|x64'">
-    <NMakeBuildCommandLine>cd $(SolutionDir) &amp; misc\fbuild -vs -dist -monitor -cache $(ProjectName)-$(Configuration)</NMakeBuildCommandLine>
+    <NMakeBuildCommandLine>cd $(SolutionDir) &amp; misc\fbuild -ide -dist -monitor -cache $(ProjectName)-$(Configuration)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>cd $(SolutionDir) &amp; mics\fbuild -vs -dist -monitor -cache -clean $(ProjectName)-$(Configuration)</NMakeReBuildCommandLine>
+    <NMakeReBuildCommandLine>cd $(SolutionDir) &amp; mics\fbuild -ide -dist -monitor -cache -clean $(ProjectName)-$(Configuration)</NMakeReBuildCommandLine>
    <NMakePreprocessorDefinitions>WIN32_LEAN_AND_MEAN;WIN32;_WIN32;__WINDOWS__;_HAS_EXCEPTIONS=0;WIN64;DEBUG;PROFILING_ENABLED;JULIET_WIN32;</NMakePreprocessorDefinitions>
    <NMakeIncludeSearchPath>..\;..\Juliet\include;..\Game;C:\Program Files\Microsoft Visual Studio\2022\Community\VC\Tools\MSVC\14.44.35207\include\;C:\Program Files (x86)\Windows Kits\10\Include\10.0.26100.0\ucrt;C:\Program Files (x86)\Windows Kits\10\Include\10.0.26100.0\um;C:\Program Files (x86)\Windows Kits\10\Include\10.0.26100.0\shared;</NMakeIncludeSearchPath>
    <AdditionalOptions>/std:c++20 /wd5267 /wd4061 /wd4505 /wd4514 /wd4577 /wd4625 /wd4710 /wd4711 /wd4746 /wd4820 /wd5045 /wd5220 /wd5245 </AdditionalOptions>
@@ -247,8 +247,8 @@
    <OutDir>$(SolutionDir)\bin</OutDir>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='x64-Profile|x64'">
-    <NMakeBuildCommandLine>cd $(SolutionDir) &amp; misc\fbuild -vs -dist -monitor -cache $(ProjectName)-$(Configuration)</NMakeBuildCommandLine>
+    <NMakeBuildCommandLine>cd $(SolutionDir) &amp; misc\fbuild -ide -dist -monitor -cache $(ProjectName)-$(Configuration)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>cd $(SolutionDir) &amp; mics\fbuild -vs -dist -monitor -cache -clean $(ProjectName)-$(Configuration)</NMakeReBuildCommandLine>
+    <NMakeReBuildCommandLine>cd $(SolutionDir) &amp; mics\fbuild -ide -dist -monitor -cache -clean $(ProjectName)-$(Configuration)</NMakeReBuildCommandLine>
    <NMakePreprocessorDefinitions>WIN32_LEAN_AND_MEAN;WIN32;_WIN32;__WINDOWS__;_HAS_EXCEPTIONS=0;WIN64;RELEASE;PROFILING_ENABLED;JULIET_WIN32;</NMakePreprocessorDefinitions>
    <NMakeIncludeSearchPath>..\;..\Juliet\include;..\Game;C:\Program Files\Microsoft Visual Studio\2022\Community\VC\Tools\MSVC\14.44.35207\include\;C:\Program Files (x86)\Windows Kits\10\Include\10.0.26100.0\ucrt;C:\Program Files (x86)\Windows Kits\10\Include\10.0.26100.0\um;C:\Program Files (x86)\Windows Kits\10\Include\10.0.26100.0\shared;</NMakeIncludeSearchPath>
    <AdditionalOptions>/std:c++20 /wd5267 /wd4061 /wd4505 /wd4514 /wd4577 /wd4625 /wd4710 /wd4711 /wd4746 /wd4820 /wd5045 /wd5220 /wd5245 </AdditionalOptions>
@@ -257,8 +257,8 @@
    <OutDir>$(SolutionDir)\bin</OutDir>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='x64-Release|x64'">
-    <NMakeBuildCommandLine>cd $(SolutionDir) &amp; misc\fbuild -vs -dist -monitor -cache $(ProjectName)-$(Configuration)</NMakeBuildCommandLine>
+    <NMakeBuildCommandLine>cd $(SolutionDir) &amp; misc\fbuild -ide -dist -monitor -cache $(ProjectName)-$(Configuration)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>cd $(SolutionDir) &amp; mics\fbuild -vs -dist -monitor -cache -clean $(ProjectName)-$(Configuration)</NMakeReBuildCommandLine>
+    <NMakeReBuildCommandLine>cd $(SolutionDir) &amp; mics\fbuild -ide -dist -monitor -cache -clean $(ProjectName)-$(Configuration)</NMakeReBuildCommandLine>
    <NMakePreprocessorDefinitions>WIN32_LEAN_AND_MEAN;WIN32;_WIN32;__WINDOWS__;_HAS_EXCEPTIONS=0;WIN64;RELEASE;JULIET_WIN32;</NMakePreprocessorDefinitions>
    <NMakeIncludeSearchPath>..\;..\Juliet\include;..\Game;C:\Program Files\Microsoft Visual Studio\2022\Community\VC\Tools\MSVC\14.44.35207\include\;C:\Program Files (x86)\Windows Kits\10\Include\10.0.26100.0\ucrt;C:\Program Files (x86)\Windows Kits\10\Include\10.0.26100.0\um;C:\Program Files (x86)\Windows Kits\10\Include\10.0.26100.0\shared;</NMakeIncludeSearchPath>
    <AdditionalOptions>/std:c++20 /wd5267 /wd4061 /wd4505 /wd4514 /wd4577 /wd4625 /wd4710 /wd4711 /wd4746 /wd4820 /wd5045 /wd5220 /wd5245 </AdditionalOptions>
@@ -267,8 +267,8 @@
    <OutDir>$(SolutionDir)\bin</OutDir>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='x64Clang-Debug|x64'">
-    <NMakeBuildCommandLine>cd $(SolutionDir) &amp; misc\fbuild -vs -dist -monitor -cache $(ProjectName)-$(Configuration)</NMakeBuildCommandLine>
+    <NMakeBuildCommandLine>cd $(SolutionDir) &amp; misc\fbuild -ide -dist -monitor -cache $(ProjectName)-$(Configuration)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>cd $(SolutionDir) &amp; mics\fbuild -vs -dist -monitor -cache -clean $(ProjectName)-$(Configuration)</NMakeReBuildCommandLine>
+    <NMakeReBuildCommandLine>cd $(SolutionDir) &amp; mics\fbuild -ide -dist -monitor -cache -clean $(ProjectName)-$(Configuration)</NMakeReBuildCommandLine>
    <NMakePreprocessorDefinitions>WIN32_LEAN_AND_MEAN;WIN32;_WIN32;__WINDOWS__;_HAS_EXCEPTIONS=0;WIN64;DEBUG;PROFILING_ENABLED;JULIET_WIN32;</NMakePreprocessorDefinitions>
    <NMakeIncludeSearchPath>..\;..\Juliet\include;..\Game;C:\Program Files\Microsoft Visual Studio\2022\Community\VC\Tools\MSVC\14.44.35207\include\;C:\Program Files (x86)\Windows Kits\10\Include\10.0.26100.0\ucrt;C:\Program Files (x86)\Windows Kits\10\Include\10.0.26100.0\um;C:\Program Files (x86)\Windows Kits\10\Include\10.0.26100.0\shared;</NMakeIncludeSearchPath>
    <AdditionalOptions>/std:c++20 /wd5267 /wd4061 /wd4505 /wd4514 /wd4577 /wd4625 /wd4710 /wd4711 /wd4746 /wd4820 /wd5045 /wd5220 /wd5245 </AdditionalOptions>
@@ -277,8 +277,8 @@
    <OutDir>$(SolutionDir)\bin</OutDir>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='x64Clang-Profile|x64'">
-    <NMakeBuildCommandLine>cd $(SolutionDir) &amp; misc\fbuild -vs -dist -monitor -cache $(ProjectName)-$(Configuration)</NMakeBuildCommandLine>
+    <NMakeBuildCommandLine>cd $(SolutionDir) &amp; misc\fbuild -ide -dist -monitor -cache $(ProjectName)-$(Configuration)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>cd $(SolutionDir) &amp; mics\fbuild -vs -dist -monitor -cache -clean $(ProjectName)-$(Configuration)</NMakeReBuildCommandLine>
+    <NMakeReBuildCommandLine>cd $(SolutionDir) &amp; mics\fbuild -ide -dist -monitor -cache -clean $(ProjectName)-$(Configuration)</NMakeReBuildCommandLine>
    <NMakePreprocessorDefinitions>WIN32_LEAN_AND_MEAN;WIN32;_WIN32;__WINDOWS__;_HAS_EXCEPTIONS=0;WIN64;RELEASE;PROFILING_ENABLED;JULIET_WIN32;</NMakePreprocessorDefinitions>
    <NMakeIncludeSearchPath>..\;..\Juliet\include;..\Game;C:\Program Files\Microsoft Visual Studio\2022\Community\VC\Tools\MSVC\14.44.35207\include\;C:\Program Files (x86)\Windows Kits\10\Include\10.0.26100.0\ucrt;C:\Program Files (x86)\Windows Kits\10\Include\10.0.26100.0\um;C:\Program Files (x86)\Windows Kits\10\Include\10.0.26100.0\shared;</NMakeIncludeSearchPath>
    <AdditionalOptions>/std:c++20 /wd5267 /wd4061 /wd4505 /wd4514 /wd4577 /wd4625 /wd4710 /wd4711 /wd4746 /wd4820 /wd5045 /wd5220 /wd5245 </AdditionalOptions>
@@ -287,8 +287,8 @@
    <OutDir>$(SolutionDir)\bin</OutDir>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='x64Clang-Release|x64'">
-    <NMakeBuildCommandLine>cd $(SolutionDir) &amp; misc\fbuild -vs -dist -monitor -cache $(ProjectName)-$(Configuration)</NMakeBuildCommandLine>
+    <NMakeBuildCommandLine>cd $(SolutionDir) &amp; misc\fbuild -ide -dist -monitor -cache $(ProjectName)-$(Configuration)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>cd $(SolutionDir) &amp; mics\fbuild -vs -dist -monitor -cache -clean $(ProjectName)-$(Configuration)</NMakeReBuildCommandLine>
+    <NMakeReBuildCommandLine>cd $(SolutionDir) &amp; mics\fbuild -ide -dist -monitor -cache -clean $(ProjectName)-$(Configuration)</NMakeReBuildCommandLine>
    <NMakePreprocessorDefinitions>WIN32_LEAN_AND_MEAN;WIN32;_WIN32;__WINDOWS__;_HAS_EXCEPTIONS=0;WIN64;RELEASE;JULIET_WIN32;</NMakePreprocessorDefinitions>
    <NMakeIncludeSearchPath>..\;..\Juliet\include;..\Game;C:\Program Files\Microsoft Visual Studio\2022\Community\VC\Tools\MSVC\14.44.35207\include\;C:\Program Files (x86)\Windows Kits\10\Include\10.0.26100.0\ucrt;C:\Program Files (x86)\Windows Kits\10\Include\10.0.26100.0\um;C:\Program Files (x86)\Windows Kits\10\Include\10.0.26100.0\shared;</NMakeIncludeSearchPath>
    <AdditionalOptions>/std:c++20 /wd5267 /wd4061 /wd4505 /wd4514 /wd4577 /wd4625 /wd4710 /wd4711 /wd4746 /wd4820 /wd5045 /wd5220 /wd5245 </AdditionalOptions>
--- a/Juliet/Juliet.vcxproj
+++ b/Juliet/Juliet.vcxproj
@@ -235,9 +235,9 @@
  </ImportGroup>
  <PropertyGroup Label="UserMacros" />
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='x64-Debug|x64'">
-    <NMakeBuildCommandLine>cd $(SolutionDir) &amp; misc\fbuild -vs -dist -monitor -cache $(ProjectName)-$(Configuration)</NMakeBuildCommandLine>
+    <NMakeBuildCommandLine>cd $(SolutionDir) &amp; misc\fbuild -ide -dist -monitor -cache $(ProjectName)-$(Configuration)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>cd $(SolutionDir) &amp; mics\fbuild -vs -dist -monitor -cache -clean $(ProjectName)-$(Configuration)</NMakeReBuildCommandLine>
+    <NMakeReBuildCommandLine>cd $(SolutionDir) &amp; misc\fbuild -ide -dist -monitor -cache -clean $(ProjectName)-$(Configuration)</NMakeReBuildCommandLine>
-    <NMakePreprocessorDefinitions>WIN32_LEAN_AND_MEAN;WIN32;_WIN32;__WINDOWS__;_HAS_EXCEPTIONS=0;WIN64;DEBUG;PROFILING_ENABLED;JULIET_EXPORT;JULIET_WIN32;</NMakePreprocessorDefinitions>
+    <NMakePreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;_UNICODE;UNICODE;WIN32_LEAN_AND_MEAN;WIN32;_WIN32;__WINDOWS__;_HAS_EXCEPTIONS=0;WIN64;DEBUG;PROFILING_ENABLED;JULIET_EXPORT;JULIET_WIN32;</NMakePreprocessorDefinitions>
    <NMakeIncludeSearchPath>..\;include;src;C:\Program Files\Microsoft Visual Studio\2022\Community\VC\Tools\MSVC\14.44.35207\include\;C:\Program Files (x86)\Windows Kits\10\Include\10.0.26100.0\ucrt;C:\Program Files (x86)\Windows Kits\10\Include\10.0.26100.0\um;C:\Program Files (x86)\Windows Kits\10\Include\10.0.26100.0\shared;</NMakeIncludeSearchPath>
    <AdditionalOptions>/std:c++20 /wd5267 /wd4061 /wd4505 /wd4514 /wd4577 /wd4625 /wd4710 /wd4711 /wd4746 /wd4820 /wd5045 /wd5220 /wd5245 </AdditionalOptions>
    <LocalDebuggerWorkingDirectory>$(SolutionDir)\bin\$(Configuration)\</LocalDebuggerWorkingDirectory>
@@ -245,9 +245,9 @@
    <OutDir>$(SolutionDir)\bin</OutDir>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='x64-Profile|x64'">
-    <NMakeBuildCommandLine>cd $(SolutionDir) &amp; misc\fbuild -vs -dist -monitor -cache $(ProjectName)-$(Configuration)</NMakeBuildCommandLine>
+    <NMakeBuildCommandLine>cd $(SolutionDir) &amp; misc\fbuild -ide -dist -monitor -cache $(ProjectName)-$(Configuration)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>cd $(SolutionDir) &amp; mics\fbuild -vs -dist -monitor -cache -clean $(ProjectName)-$(Configuration)</NMakeReBuildCommandLine>
+    <NMakeReBuildCommandLine>cd $(SolutionDir) &amp; misc\fbuild -ide -dist -monitor -cache -clean $(ProjectName)-$(Configuration)</NMakeReBuildCommandLine>
-    <NMakePreprocessorDefinitions>WIN32_LEAN_AND_MEAN;WIN32;_WIN32;__WINDOWS__;_HAS_EXCEPTIONS=0;WIN64;RELEASE;PROFILING_ENABLED;JULIET_EXPORT;JULIET_WIN32;</NMakePreprocessorDefinitions>
+    <NMakePreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;_UNICODE;UNICODE;WIN32_LEAN_AND_MEAN;WIN32;_WIN32;__WINDOWS__;_HAS_EXCEPTIONS=0;WIN64;RELEASE;PROFILING_ENABLED;JULIET_EXPORT;JULIET_WIN32;</NMakePreprocessorDefinitions>
    <NMakeIncludeSearchPath>..\;include;src;C:\Program Files\Microsoft Visual Studio\2022\Community\VC\Tools\MSVC\14.44.35207\include\;C:\Program Files (x86)\Windows Kits\10\Include\10.0.26100.0\ucrt;C:\Program Files (x86)\Windows Kits\10\Include\10.0.26100.0\um;C:\Program Files (x86)\Windows Kits\10\Include\10.0.26100.0\shared;</NMakeIncludeSearchPath>
    <AdditionalOptions>/std:c++20 /wd5267 /wd4061 /wd4505 /wd4514 /wd4577 /wd4625 /wd4710 /wd4711 /wd4746 /wd4820 /wd5045 /wd5220 /wd5245 </AdditionalOptions>
    <LocalDebuggerWorkingDirectory>$(SolutionDir)\bin\$(Configuration)\</LocalDebuggerWorkingDirectory>
@@ -255,9 +255,9 @@
    <OutDir>$(SolutionDir)\bin</OutDir>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='x64-Release|x64'">
-    <NMakeBuildCommandLine>cd $(SolutionDir) &amp; misc\fbuild -vs -dist -monitor -cache $(ProjectName)-$(Configuration)</NMakeBuildCommandLine>
+    <NMakeBuildCommandLine>cd $(SolutionDir) &amp; misc\fbuild -ide -dist -monitor -cache $(ProjectName)-$(Configuration)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>cd $(SolutionDir) &amp; mics\fbuild -vs -dist -monitor -cache -clean $(ProjectName)-$(Configuration)</NMakeReBuildCommandLine>
+    <NMakeReBuildCommandLine>cd $(SolutionDir) &amp; misc\fbuild -ide -dist -monitor -cache -clean $(ProjectName)-$(Configuration)</NMakeReBuildCommandLine>
-    <NMakePreprocessorDefinitions>WIN32_LEAN_AND_MEAN;WIN32;_WIN32;__WINDOWS__;_HAS_EXCEPTIONS=0;WIN64;RELEASE;JULIET_EXPORT;JULIET_WIN32;</NMakePreprocessorDefinitions>
+    <NMakePreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;_UNICODE;UNICODE;WIN32_LEAN_AND_MEAN;WIN32;_WIN32;__WINDOWS__;_HAS_EXCEPTIONS=0;WIN64;RELEASE;JULIET_EXPORT;JULIET_WIN32;</NMakePreprocessorDefinitions>
    <NMakeIncludeSearchPath>..\;include;src;C:\Program Files\Microsoft Visual Studio\2022\Community\VC\Tools\MSVC\14.44.35207\include\;C:\Program Files (x86)\Windows Kits\10\Include\10.0.26100.0\ucrt;C:\Program Files (x86)\Windows Kits\10\Include\10.0.26100.0\um;C:\Program Files (x86)\Windows Kits\10\Include\10.0.26100.0\shared;</NMakeIncludeSearchPath>
    <AdditionalOptions>/std:c++20 /wd5267 /wd4061 /wd4505 /wd4514 /wd4577 /wd4625 /wd4710 /wd4711 /wd4746 /wd4820 /wd5045 /wd5220 /wd5245 </AdditionalOptions>
    <LocalDebuggerWorkingDirectory>$(SolutionDir)\bin\$(Configuration)\</LocalDebuggerWorkingDirectory>
@@ -265,9 +265,9 @@
    <OutDir>$(SolutionDir)\bin</OutDir>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='x64Clang-Debug|x64'">
-    <NMakeBuildCommandLine>cd $(SolutionDir) &amp; misc\fbuild -vs -dist -monitor -cache $(ProjectName)-$(Configuration)</NMakeBuildCommandLine>
+    <NMakeBuildCommandLine>cd $(SolutionDir) &amp; misc\fbuild -ide -dist -monitor -cache $(ProjectName)-$(Configuration)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>cd $(SolutionDir) &amp; mics\fbuild -vs -dist -monitor -cache -clean $(ProjectName)-$(Configuration)</NMakeReBuildCommandLine>
+    <NMakeReBuildCommandLine>cd $(SolutionDir) &amp; misc\fbuild -ide -dist -monitor -cache -clean $(ProjectName)-$(Configuration)</NMakeReBuildCommandLine>
-    <NMakePreprocessorDefinitions>WIN32_LEAN_AND_MEAN;WIN32;_WIN32;__WINDOWS__;_HAS_EXCEPTIONS=0;WIN64;DEBUG;PROFILING_ENABLED;JULIET_EXPORT;JULIET_WIN32;</NMakePreprocessorDefinitions>
+    <NMakePreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;_UNICODE;UNICODE;WIN32_LEAN_AND_MEAN;WIN32;_WIN32;__WINDOWS__;_HAS_EXCEPTIONS=0;WIN64;DEBUG;PROFILING_ENABLED;JULIET_EXPORT;JULIET_WIN32;</NMakePreprocessorDefinitions>
    <NMakeIncludeSearchPath>..\;include;src;C:\Program Files\Microsoft Visual Studio\2022\Community\VC\Tools\MSVC\14.44.35207\include\;C:\Program Files (x86)\Windows Kits\10\Include\10.0.26100.0\ucrt;C:\Program Files (x86)\Windows Kits\10\Include\10.0.26100.0\um;C:\Program Files (x86)\Windows Kits\10\Include\10.0.26100.0\shared;</NMakeIncludeSearchPath>
    <AdditionalOptions>/std:c++20 /wd5267 /wd4061 /wd4505 /wd4514 /wd4577 /wd4625 /wd4710 /wd4711 /wd4746 /wd4820 /wd5045 /wd5220 /wd5245 </AdditionalOptions>
    <LocalDebuggerWorkingDirectory>$(SolutionDir)\bin\$(Configuration)\</LocalDebuggerWorkingDirectory>
@@ -275,9 +275,9 @@
    <OutDir>$(SolutionDir)\bin</OutDir>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='x64Clang-Profile|x64'">
-    <NMakeBuildCommandLine>cd $(SolutionDir) &amp; misc\fbuild -vs -dist -monitor -cache $(ProjectName)-$(Configuration)</NMakeBuildCommandLine>
+    <NMakeBuildCommandLine>cd $(SolutionDir) &amp; misc\fbuild -ide -dist -monitor -cache $(ProjectName)-$(Configuration)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>cd $(SolutionDir) &amp; mics\fbuild -vs -dist -monitor -cache -clean $(ProjectName)-$(Configuration)</NMakeReBuildCommandLine>
+    <NMakeReBuildCommandLine>cd $(SolutionDir) &amp; misc\fbuild -ide -dist -monitor -cache -clean $(ProjectName)-$(Configuration)</NMakeReBuildCommandLine>
-    <NMakePreprocessorDefinitions>WIN32_LEAN_AND_MEAN;WIN32;_WIN32;__WINDOWS__;_HAS_EXCEPTIONS=0;WIN64;RELEASE;PROFILING_ENABLED;JULIET_EXPORT;JULIET_WIN32;</NMakePreprocessorDefinitions>
+    <NMakePreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;_UNICODE;UNICODE;WIN32_LEAN_AND_MEAN;WIN32;_WIN32;__WINDOWS__;_HAS_EXCEPTIONS=0;WIN64;RELEASE;PROFILING_ENABLED;JULIET_EXPORT;JULIET_WIN32;</NMakePreprocessorDefinitions>
    <NMakeIncludeSearchPath>..\;include;src;C:\Program Files\Microsoft Visual Studio\2022\Community\VC\Tools\MSVC\14.44.35207\include\;C:\Program Files (x86)\Windows Kits\10\Include\10.0.26100.0\ucrt;C:\Program Files (x86)\Windows Kits\10\Include\10.0.26100.0\um;C:\Program Files (x86)\Windows Kits\10\Include\10.0.26100.0\shared;</NMakeIncludeSearchPath>
    <AdditionalOptions>/std:c++20 /wd5267 /wd4061 /wd4505 /wd4514 /wd4577 /wd4625 /wd4710 /wd4711 /wd4746 /wd4820 /wd5045 /wd5220 /wd5245 </AdditionalOptions>
    <LocalDebuggerWorkingDirectory>$(SolutionDir)\bin\$(Configuration)\</LocalDebuggerWorkingDirectory>
@@ -285,9 +285,9 @@
    <OutDir>$(SolutionDir)\bin</OutDir>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='x64Clang-Release|x64'">
-    <NMakeBuildCommandLine>cd $(SolutionDir) &amp; misc\fbuild -vs -dist -monitor -cache $(ProjectName)-$(Configuration)</NMakeBuildCommandLine>
+    <NMakeBuildCommandLine>cd $(SolutionDir) &amp; misc\fbuild -ide -dist -monitor -cache $(ProjectName)-$(Configuration)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>cd $(SolutionDir) &amp; mics\fbuild -vs -dist -monitor -cache -clean $(ProjectName)-$(Configuration)</NMakeReBuildCommandLine>
+    <NMakeReBuildCommandLine>cd $(SolutionDir) &amp; misc\fbuild -ide -dist -monitor -cache -clean $(ProjectName)-$(Configuration)</NMakeReBuildCommandLine>
-    <NMakePreprocessorDefinitions>WIN32_LEAN_AND_MEAN;WIN32;_WIN32;__WINDOWS__;_HAS_EXCEPTIONS=0;WIN64;RELEASE;JULIET_EXPORT;JULIET_WIN32;</NMakePreprocessorDefinitions>
+    <NMakePreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;_UNICODE;UNICODE;WIN32_LEAN_AND_MEAN;WIN32;_WIN32;__WINDOWS__;_HAS_EXCEPTIONS=0;WIN64;RELEASE;JULIET_EXPORT;JULIET_WIN32;</NMakePreprocessorDefinitions>
    <NMakeIncludeSearchPath>..\;include;src;C:\Program Files\Microsoft Visual Studio\2022\Community\VC\Tools\MSVC\14.44.35207\include\;C:\Program Files (x86)\Windows Kits\10\Include\10.0.26100.0\ucrt;C:\Program Files (x86)\Windows Kits\10\Include\10.0.26100.0\um;C:\Program Files (x86)\Windows Kits\10\Include\10.0.26100.0\shared;</NMakeIncludeSearchPath>
    <AdditionalOptions>/std:c++20 /wd5267 /wd4061 /wd4505 /wd4514 /wd4577 /wd4625 /wd4710 /wd4711 /wd4746 /wd4820 /wd5045 /wd5220 /wd5245 </AdditionalOptions>
    <LocalDebuggerWorkingDirectory>$(SolutionDir)\bin\$(Configuration)\</LocalDebuggerWorkingDirectory>
--- a/Juliet/include/Core/Common/String.h
+++ b/Juliet/include/Core/Common/String.h
@@ -137,8 +137,8 @@ namespace Juliet
    // src and dst will be casted based on the encoding.
    // size will correspond to the number of characters
    // Will convert \0 character if present.
-    extern JULIET_API bool ConvertString(StringEncoding from, StringEncoding to, String src, StringBuffer& dst);
+    extern JULIET_API bool ConvertString(StringEncoding from, StringEncoding to, String src, StringBuffer& dst, bool nullTerminate);
-    extern JULIET_API bool ConvertString(String from, String to, String src, StringBuffer& dst);
+    extern JULIET_API bool ConvertString(String from, String to, String src, StringBuffer& dst, bool nullTerminate);
 } // namespace Juliet
--- a/Juliet/src/Core/Common/String.cpp
+++ b/Juliet/src/Core/Common/String.cpp
@@ -249,7 +249,7 @@ namespace Juliet
        return 0;
    }
-    bool ConvertString(StringEncoding from, StringEncoding to, String src, StringBuffer& dst)
+    bool ConvertString(StringEncoding from, StringEncoding to, String src, StringBuffer& dst, bool nullTerminate)
    {
        Assert(IsValid(src));
@@ -421,10 +421,38 @@ namespace Juliet
            case StringEncoding::UCS4: Assert(false, "ConvertString: Unsupported Destination Format"); break;
            }
        }
        if (nullTerminate)
        {
            switch (to)
            {
            case StringEncoding::UTF16:
                {
                    if (remainingCapacity < 2)
                    {
                        Log(LogLevel::Error, LogCategory::Core,
                            "ConvertString: Destination buffer too short to add null terminator into UTF16 buffer");
                        return false;
                    }
                    dstStr[0] = 0;
                    dstStr[1] = 0;
                    remainingCapacity -= 2;
                    break;
                }
            case StringEncoding::Unknown: Assert(false, "ConvertString: Invalid Source Format: Unknown"); break;
            case StringEncoding::ASCII:
            case StringEncoding::LATIN1:
            case StringEncoding::UTF8:
            case StringEncoding::UTF32:
            case StringEncoding::UCS2:
            case StringEncoding::UCS4: Assert(false, "ConvertString: Unsupported Destination Format"); break;
            }
        }
        return true;
    }
-    bool ConvertString(String from, String to, String src, StringBuffer& dst)
+    bool ConvertString(String from, String to, String src, StringBuffer& dst, bool nullTerminate)
    {
        Assert(IsValid(from));
        Assert(IsValid(to));
@@ -457,6 +485,6 @@ namespace Juliet
            return false;
        }
-        return ConvertString(sourceFormat, destFormat, src, dst);
+        return ConvertString(sourceFormat, destFormat, src, dst, nullTerminate);
    }
 } // namespace Juliet
--- a/JulietApp/JulietApp.bff
+++ b/JulietApp/JulietApp.bff
@@ -11,6 +11,7 @@
    ForEach( .BuildConfig in .BuildConfigs )
    {
        Using( .BuildConfig )
        .OutputBase + '\$Platform$-$BuildConfigName$'
        // Unity
@@ -84,9 +85,14 @@
        Alias( '$ProjectName$-$Platform$-$BuildConfigName$' ) { .Targets = '$ProjectName$-Exe-$Platform$-$BuildConfigName$' }
        ^'Targets_$Platform$_$BuildConfigName$' + { '$ProjectName$-$Platform$-$BuildConfigName$' }
        #if __WINDOWS__
-            .ProjectConfig              = [ Using( .'Project_$Platform$_$BuildConfigName$' ) .Target = '$ProjectName$-$Platform$-$BuildConfigName$' ]
+            .ProjectConfig              = 
            [
                Using( .'Project_$Platform$_$BuildConfigName$' )
                .Target = '$ProjectName$-$Config$'
            ]
            ^ProjectConfigs             + .ProjectConfig
        #endif
    }
--- a/JulietApp/JulietApp.vcxproj
+++ b/JulietApp/JulietApp.vcxproj
@@ -253,8 +253,8 @@
  </ImportGroup>
  <PropertyGroup Label="UserMacros" />
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='x64-Debug|x64'">
-    <NMakeBuildCommandLine>cd $(SolutionDir) &amp; misc\fbuild -vs -dist -monitor -cache $(ProjectName)-$(Configuration)</NMakeBuildCommandLine>
+    <NMakeBuildCommandLine>cd $(SolutionDir) &amp; misc\fbuild -ide -dist -monitor -cache $(ProjectName)-$(Configuration)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>cd $(SolutionDir) &amp; mics\fbuild -vs -dist -monitor -cache -clean $(ProjectName)-$(Configuration)</NMakeReBuildCommandLine>
+    <NMakeReBuildCommandLine>cd $(SolutionDir) &amp; mics\fbuild -ide -dist -monitor -cache -clean $(ProjectName)-$(Configuration)</NMakeReBuildCommandLine>
    <NMakePreprocessorDefinitions>WIN32_LEAN_AND_MEAN;WIN32;_WIN32;__WINDOWS__;_HAS_EXCEPTIONS=0;WIN64;DEBUG;PROFILING_ENABLED;JULIET_EXPORT;JULIET_WIN32;</NMakePreprocessorDefinitions>
    <NMakeIncludeSearchPath>..\;..\Juliet\include;..\Juliet\src;C:\Program Files\Microsoft Visual Studio\2022\Community\VC\Tools\MSVC\14.44.35207\include\;C:\Program Files (x86)\Windows Kits\10\Include\10.0.26100.0\ucrt;C:\Program Files (x86)\Windows Kits\10\Include\10.0.26100.0\um;C:\Program Files (x86)\Windows Kits\10\Include\10.0.26100.0\shared;</NMakeIncludeSearchPath>
    <AdditionalOptions>/std:c++20 /wd5267 /wd4061 /wd4505 /wd4514 /wd4577 /wd4625 /wd4710 /wd4711 /wd4746 /wd4820 /wd5045 /wd5220 /wd5245 </AdditionalOptions>
@@ -263,8 +263,8 @@
    <OutDir>$(SolutionDir)\bin</OutDir>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='x64-Profile|x64'">
-    <NMakeBuildCommandLine>cd $(SolutionDir) &amp; misc\fbuild -vs -dist -monitor -cache $(ProjectName)-$(Configuration)</NMakeBuildCommandLine>
+    <NMakeBuildCommandLine>cd $(SolutionDir) &amp; misc\fbuild -ide -dist -monitor -cache $(ProjectName)-$(Configuration)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>cd $(SolutionDir) &amp; mics\fbuild -vs -dist -monitor -cache -clean $(ProjectName)-$(Configuration)</NMakeReBuildCommandLine>
+    <NMakeReBuildCommandLine>cd $(SolutionDir) &amp; mics\fbuild -ide -dist -monitor -cache -clean $(ProjectName)-$(Configuration)</NMakeReBuildCommandLine>
    <NMakePreprocessorDefinitions>WIN32_LEAN_AND_MEAN;WIN32;_WIN32;__WINDOWS__;_HAS_EXCEPTIONS=0;WIN64;RELEASE;PROFILING_ENABLED;JULIET_EXPORT;JULIET_WIN32;</NMakePreprocessorDefinitions>
    <NMakeIncludeSearchPath>..\;..\Juliet\include;..\Juliet\src;C:\Program Files\Microsoft Visual Studio\2022\Community\VC\Tools\MSVC\14.44.35207\include\;C:\Program Files (x86)\Windows Kits\10\Include\10.0.26100.0\ucrt;C:\Program Files (x86)\Windows Kits\10\Include\10.0.26100.0\um;C:\Program Files (x86)\Windows Kits\10\Include\10.0.26100.0\shared;</NMakeIncludeSearchPath>
    <AdditionalOptions>/std:c++20 /wd5267 /wd4061 /wd4505 /wd4514 /wd4577 /wd4625 /wd4710 /wd4711 /wd4746 /wd4820 /wd5045 /wd5220 /wd5245 </AdditionalOptions>
@@ -273,8 +273,8 @@
    <OutDir>$(SolutionDir)\bin</OutDir>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='x64-Release|x64'">
-    <NMakeBuildCommandLine>cd $(SolutionDir) &amp; misc\fbuild -vs -dist -monitor -cache $(ProjectName)-$(Configuration)</NMakeBuildCommandLine>
+    <NMakeBuildCommandLine>cd $(SolutionDir) &amp; misc\fbuild -ide -dist -monitor -cache $(ProjectName)-$(Configuration)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>cd $(SolutionDir) &amp; mics\fbuild -vs -dist -monitor -cache -clean $(ProjectName)-$(Configuration)</NMakeReBuildCommandLine>
+    <NMakeReBuildCommandLine>cd $(SolutionDir) &amp; mics\fbuild -ide -dist -monitor -cache -clean $(ProjectName)-$(Configuration)</NMakeReBuildCommandLine>
    <NMakePreprocessorDefinitions>WIN32_LEAN_AND_MEAN;WIN32;_WIN32;__WINDOWS__;_HAS_EXCEPTIONS=0;WIN64;RELEASE;JULIET_EXPORT;JULIET_WIN32;</NMakePreprocessorDefinitions>
    <NMakeIncludeSearchPath>..\;..\Juliet\include;..\Juliet\src;C:\Program Files\Microsoft Visual Studio\2022\Community\VC\Tools\MSVC\14.44.35207\include\;C:\Program Files (x86)\Windows Kits\10\Include\10.0.26100.0\ucrt;C:\Program Files (x86)\Windows Kits\10\Include\10.0.26100.0\um;C:\Program Files (x86)\Windows Kits\10\Include\10.0.26100.0\shared;</NMakeIncludeSearchPath>
    <AdditionalOptions>/std:c++20 /wd5267 /wd4061 /wd4505 /wd4514 /wd4577 /wd4625 /wd4710 /wd4711 /wd4746 /wd4820 /wd5045 /wd5220 /wd5245 </AdditionalOptions>
@@ -283,8 +283,8 @@
    <OutDir>$(SolutionDir)\bin</OutDir>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='x64Clang-Debug|x64'">
-    <NMakeBuildCommandLine>cd $(SolutionDir) &amp; misc\fbuild -vs -dist -monitor -cache $(ProjectName)-$(Configuration)</NMakeBuildCommandLine>
+    <NMakeBuildCommandLine>cd $(SolutionDir) &amp; misc\fbuild -ide -dist -monitor -cache $(ProjectName)-$(Configuration)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>cd $(SolutionDir) &amp; mics\fbuild -vs -dist -monitor -cache -clean $(ProjectName)-$(Configuration)</NMakeReBuildCommandLine>
+    <NMakeReBuildCommandLine>cd $(SolutionDir) &amp; mics\fbuild -ide -dist -monitor -cache -clean $(ProjectName)-$(Configuration)</NMakeReBuildCommandLine>
    <NMakePreprocessorDefinitions>WIN32_LEAN_AND_MEAN;WIN32;_WIN32;__WINDOWS__;_HAS_EXCEPTIONS=0;WIN64;DEBUG;PROFILING_ENABLED;JULIET_EXPORT;JULIET_WIN32;</NMakePreprocessorDefinitions>
    <NMakeIncludeSearchPath>..\;..\Juliet\include;..\Juliet\src;C:\Program Files\Microsoft Visual Studio\2022\Community\VC\Tools\MSVC\14.44.35207\include\;C:\Program Files (x86)\Windows Kits\10\Include\10.0.26100.0\ucrt;C:\Program Files (x86)\Windows Kits\10\Include\10.0.26100.0\um;C:\Program Files (x86)\Windows Kits\10\Include\10.0.26100.0\shared;</NMakeIncludeSearchPath>
    <AdditionalOptions>/std:c++20 /wd5267 /wd4061 /wd4505 /wd4514 /wd4577 /wd4625 /wd4710 /wd4711 /wd4746 /wd4820 /wd5045 /wd5220 /wd5245 </AdditionalOptions>
@@ -293,8 +293,8 @@
    <OutDir>$(SolutionDir)\bin</OutDir>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='x64Clang-Profile|x64'">
-    <NMakeBuildCommandLine>cd $(SolutionDir) &amp; misc\fbuild -vs -dist -monitor -cache $(ProjectName)-$(Configuration)</NMakeBuildCommandLine>
+    <NMakeBuildCommandLine>cd $(SolutionDir) &amp; misc\fbuild -ide -dist -monitor -cache $(ProjectName)-$(Configuration)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>cd $(SolutionDir) &amp; mics\fbuild -vs -dist -monitor -cache -clean $(ProjectName)-$(Configuration)</NMakeReBuildCommandLine>
+    <NMakeReBuildCommandLine>cd $(SolutionDir) &amp; mics\fbuild -ide -dist -monitor -cache -clean $(ProjectName)-$(Configuration)</NMakeReBuildCommandLine>
    <NMakePreprocessorDefinitions>WIN32_LEAN_AND_MEAN;WIN32;_WIN32;__WINDOWS__;_HAS_EXCEPTIONS=0;WIN64;RELEASE;PROFILING_ENABLED;JULIET_EXPORT;JULIET_WIN32;</NMakePreprocessorDefinitions>
    <NMakeIncludeSearchPath>..\;..\Juliet\include;..\Juliet\src;C:\Program Files\Microsoft Visual Studio\2022\Community\VC\Tools\MSVC\14.44.35207\include\;C:\Program Files (x86)\Windows Kits\10\Include\10.0.26100.0\ucrt;C:\Program Files (x86)\Windows Kits\10\Include\10.0.26100.0\um;C:\Program Files (x86)\Windows Kits\10\Include\10.0.26100.0\shared;</NMakeIncludeSearchPath>
    <AdditionalOptions>/std:c++20 /wd5267 /wd4061 /wd4505 /wd4514 /wd4577 /wd4625 /wd4710 /wd4711 /wd4746 /wd4820 /wd5045 /wd5220 /wd5245 </AdditionalOptions>
@@ -303,8 +303,8 @@
    <OutDir>$(SolutionDir)\bin</OutDir>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='x64Clang-Release|x64'">
-    <NMakeBuildCommandLine>cd $(SolutionDir) &amp; misc\fbuild -vs -dist -monitor -cache $(ProjectName)-$(Configuration)</NMakeBuildCommandLine>
+    <NMakeBuildCommandLine>cd $(SolutionDir) &amp; misc\fbuild -ide -dist -monitor -cache $(ProjectName)-$(Configuration)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>cd $(SolutionDir) &amp; mics\fbuild -vs -dist -monitor -cache -clean $(ProjectName)-$(Configuration)</NMakeReBuildCommandLine>
+    <NMakeReBuildCommandLine>cd $(SolutionDir) &amp; mics\fbuild -ide -dist -monitor -cache -clean $(ProjectName)-$(Configuration)</NMakeReBuildCommandLine>
    <NMakePreprocessorDefinitions>WIN32_LEAN_AND_MEAN;WIN32;_WIN32;__WINDOWS__;_HAS_EXCEPTIONS=0;WIN64;RELEASE;JULIET_EXPORT;JULIET_WIN32;</NMakePreprocessorDefinitions>
    <NMakeIncludeSearchPath>..\;..\Juliet\include;..\Juliet\src;C:\Program Files\Microsoft Visual Studio\2022\Community\VC\Tools\MSVC\14.44.35207\include\;C:\Program Files (x86)\Windows Kits\10\Include\10.0.26100.0\ucrt;C:\Program Files (x86)\Windows Kits\10\Include\10.0.26100.0\um;C:\Program Files (x86)\Windows Kits\10\Include\10.0.26100.0\shared;</NMakeIncludeSearchPath>
    <AdditionalOptions>/std:c++20 /wd5267 /wd4061 /wd4505 /wd4514 /wd4577 /wd4625 /wd4710 /wd4711 /wd4746 /wd4820 /wd5045 /wd5220 /wd5245 </AdditionalOptions>
@@ -313,8 +313,8 @@
    <OutDir>$(SolutionDir)\bin</OutDir>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='x64-Debug|x64'">
-    <NMakeBuildCommandLine>cd $(SolutionDir) &amp; misc\fbuild -vs -dist -monitor -cache $(ProjectName)-$(Configuration)</NMakeBuildCommandLine>
+    <NMakeBuildCommandLine>cd $(SolutionDir) &amp; misc\fbuild -ide -dist -monitor -cache $(ProjectName)-$(Configuration)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>cd $(SolutionDir) &amp; mics\fbuild -vs -dist -monitor -cache -clean $(ProjectName)-$(Configuration)</NMakeReBuildCommandLine>
+    <NMakeReBuildCommandLine>cd $(SolutionDir) &amp; mics\fbuild -ide -dist -monitor -cache -clean $(ProjectName)-$(Configuration)</NMakeReBuildCommandLine>
    <NMakePreprocessorDefinitions>WIN32_LEAN_AND_MEAN;WIN32;_WIN32;__WINDOWS__;_HAS_EXCEPTIONS=0;WIN64;DEBUG;PROFILING_ENABLED;JULIET_WIN32;</NMakePreprocessorDefinitions>
    <NMakeIncludeSearchPath>..\;..\Juliet\include;..\Game;C:\Program Files\Microsoft Visual Studio\2022\Community\VC\Tools\MSVC\14.44.35207\include\;C:\Program Files (x86)\Windows Kits\10\Include\10.0.26100.0\ucrt;C:\Program Files (x86)\Windows Kits\10\Include\10.0.26100.0\um;C:\Program Files (x86)\Windows Kits\10\Include\10.0.26100.0\shared;</NMakeIncludeSearchPath>
    <AdditionalOptions>/std:c++20 /wd5267 /wd4061 /wd4505 /wd4514 /wd4577 /wd4625 /wd4710 /wd4711 /wd4746 /wd4820 /wd5045 /wd5220 /wd5245 </AdditionalOptions>
@@ -323,8 +323,8 @@
    <OutDir>$(SolutionDir)\bin</OutDir>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='x64-Profile|x64'">
-    <NMakeBuildCommandLine>cd $(SolutionDir) &amp; misc\fbuild -vs -dist -monitor -cache $(ProjectName)-$(Configuration)</NMakeBuildCommandLine>
+    <NMakeBuildCommandLine>cd $(SolutionDir) &amp; misc\fbuild -ide -dist -monitor -cache $(ProjectName)-$(Configuration)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>cd $(SolutionDir) &amp; mics\fbuild -vs -dist -monitor -cache -clean $(ProjectName)-$(Configuration)</NMakeReBuildCommandLine>
+    <NMakeReBuildCommandLine>cd $(SolutionDir) &amp; mics\fbuild -ide -dist -monitor -cache -clean $(ProjectName)-$(Configuration)</NMakeReBuildCommandLine>
    <NMakePreprocessorDefinitions>WIN32_LEAN_AND_MEAN;WIN32;_WIN32;__WINDOWS__;_HAS_EXCEPTIONS=0;WIN64;RELEASE;PROFILING_ENABLED;JULIET_WIN32;</NMakePreprocessorDefinitions>
    <NMakeIncludeSearchPath>..\;..\Juliet\include;..\Game;C:\Program Files\Microsoft Visual Studio\2022\Community\VC\Tools\MSVC\14.44.35207\include\;C:\Program Files (x86)\Windows Kits\10\Include\10.0.26100.0\ucrt;C:\Program Files (x86)\Windows Kits\10\Include\10.0.26100.0\um;C:\Program Files (x86)\Windows Kits\10\Include\10.0.26100.0\shared;</NMakeIncludeSearchPath>
    <AdditionalOptions>/std:c++20 /wd5267 /wd4061 /wd4505 /wd4514 /wd4577 /wd4625 /wd4710 /wd4711 /wd4746 /wd4820 /wd5045 /wd5220 /wd5245 </AdditionalOptions>
@@ -333,8 +333,8 @@
    <OutDir>$(SolutionDir)\bin</OutDir>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='x64-Release|x64'">
-    <NMakeBuildCommandLine>cd $(SolutionDir) &amp; misc\fbuild -vs -dist -monitor -cache $(ProjectName)-$(Configuration)</NMakeBuildCommandLine>
+    <NMakeBuildCommandLine>cd $(SolutionDir) &amp; misc\fbuild -ide -dist -monitor -cache $(ProjectName)-$(Configuration)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>cd $(SolutionDir) &amp; mics\fbuild -vs -dist -monitor -cache -clean $(ProjectName)-$(Configuration)</NMakeReBuildCommandLine>
+    <NMakeReBuildCommandLine>cd $(SolutionDir) &amp; mics\fbuild -ide -dist -monitor -cache -clean $(ProjectName)-$(Configuration)</NMakeReBuildCommandLine>
    <NMakePreprocessorDefinitions>WIN32_LEAN_AND_MEAN;WIN32;_WIN32;__WINDOWS__;_HAS_EXCEPTIONS=0;WIN64;RELEASE;JULIET_WIN32;</NMakePreprocessorDefinitions>
    <NMakeIncludeSearchPath>..\;..\Juliet\include;..\Game;C:\Program Files\Microsoft Visual Studio\2022\Community\VC\Tools\MSVC\14.44.35207\include\;C:\Program Files (x86)\Windows Kits\10\Include\10.0.26100.0\ucrt;C:\Program Files (x86)\Windows Kits\10\Include\10.0.26100.0\um;C:\Program Files (x86)\Windows Kits\10\Include\10.0.26100.0\shared;</NMakeIncludeSearchPath>
    <AdditionalOptions>/std:c++20 /wd5267 /wd4061 /wd4505 /wd4514 /wd4577 /wd4625 /wd4710 /wd4711 /wd4746 /wd4820 /wd5045 /wd5220 /wd5245 </AdditionalOptions>
@@ -343,8 +343,8 @@
    <OutDir>$(SolutionDir)\bin</OutDir>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='x64Clang-Debug|x64'">
-    <NMakeBuildCommandLine>cd $(SolutionDir) &amp; misc\fbuild -vs -dist -monitor -cache $(ProjectName)-$(Configuration)</NMakeBuildCommandLine>
+    <NMakeBuildCommandLine>cd $(SolutionDir) &amp; misc\fbuild -ide -dist -monitor -cache $(ProjectName)-$(Configuration)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>cd $(SolutionDir) &amp; mics\fbuild -vs -dist -monitor -cache -clean $(ProjectName)-$(Configuration)</NMakeReBuildCommandLine>
+    <NMakeReBuildCommandLine>cd $(SolutionDir) &amp; mics\fbuild -ide -dist -monitor -cache -clean $(ProjectName)-$(Configuration)</NMakeReBuildCommandLine>
    <NMakePreprocessorDefinitions>WIN32_LEAN_AND_MEAN;WIN32;_WIN32;__WINDOWS__;_HAS_EXCEPTIONS=0;WIN64;DEBUG;PROFILING_ENABLED;JULIET_WIN32;</NMakePreprocessorDefinitions>
    <NMakeIncludeSearchPath>..\;..\Juliet\include;..\Game;C:\Program Files\Microsoft Visual Studio\2022\Community\VC\Tools\MSVC\14.44.35207\include\;C:\Program Files (x86)\Windows Kits\10\Include\10.0.26100.0\ucrt;C:\Program Files (x86)\Windows Kits\10\Include\10.0.26100.0\um;C:\Program Files (x86)\Windows Kits\10\Include\10.0.26100.0\shared;</NMakeIncludeSearchPath>
    <AdditionalOptions>/std:c++20 /wd5267 /wd4061 /wd4505 /wd4514 /wd4577 /wd4625 /wd4710 /wd4711 /wd4746 /wd4820 /wd5045 /wd5220 /wd5245 </AdditionalOptions>
@@ -353,8 +353,8 @@
    <OutDir>$(SolutionDir)\bin</OutDir>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='x64Clang-Profile|x64'">
-    <NMakeBuildCommandLine>cd $(SolutionDir) &amp; misc\fbuild -vs -dist -monitor -cache $(ProjectName)-$(Configuration)</NMakeBuildCommandLine>
+    <NMakeBuildCommandLine>cd $(SolutionDir) &amp; misc\fbuild -ide -dist -monitor -cache $(ProjectName)-$(Configuration)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>cd $(SolutionDir) &amp; mics\fbuild -vs -dist -monitor -cache -clean $(ProjectName)-$(Configuration)</NMakeReBuildCommandLine>
+    <NMakeReBuildCommandLine>cd $(SolutionDir) &amp; mics\fbuild -ide -dist -monitor -cache -clean $(ProjectName)-$(Configuration)</NMakeReBuildCommandLine>
    <NMakePreprocessorDefinitions>WIN32_LEAN_AND_MEAN;WIN32;_WIN32;__WINDOWS__;_HAS_EXCEPTIONS=0;WIN64;RELEASE;PROFILING_ENABLED;JULIET_WIN32;</NMakePreprocessorDefinitions>
    <NMakeIncludeSearchPath>..\;..\Juliet\include;..\Game;C:\Program Files\Microsoft Visual Studio\2022\Community\VC\Tools\MSVC\14.44.35207\include\;C:\Program Files (x86)\Windows Kits\10\Include\10.0.26100.0\ucrt;C:\Program Files (x86)\Windows Kits\10\Include\10.0.26100.0\um;C:\Program Files (x86)\Windows Kits\10\Include\10.0.26100.0\shared;</NMakeIncludeSearchPath>
    <AdditionalOptions>/std:c++20 /wd5267 /wd4061 /wd4505 /wd4514 /wd4577 /wd4625 /wd4710 /wd4711 /wd4746 /wd4820 /wd5045 /wd5220 /wd5245 </AdditionalOptions>
@@ -363,8 +363,8 @@
    <OutDir>$(SolutionDir)\bin</OutDir>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='x64Clang-Release|x64'">
-    <NMakeBuildCommandLine>cd $(SolutionDir) &amp; misc\fbuild -vs -dist -monitor -cache $(ProjectName)-$(Configuration)</NMakeBuildCommandLine>
+    <NMakeBuildCommandLine>cd $(SolutionDir) &amp; misc\fbuild -ide -dist -monitor -cache $(ProjectName)-$(Configuration)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>cd $(SolutionDir) &amp; mics\fbuild -vs -dist -monitor -cache -clean $(ProjectName)-$(Configuration)</NMakeReBuildCommandLine>
+    <NMakeReBuildCommandLine>cd $(SolutionDir) &amp; mics\fbuild -ide -dist -monitor -cache -clean $(ProjectName)-$(Configuration)</NMakeReBuildCommandLine>
    <NMakePreprocessorDefinitions>WIN32_LEAN_AND_MEAN;WIN32;_WIN32;__WINDOWS__;_HAS_EXCEPTIONS=0;WIN64;RELEASE;JULIET_WIN32;</NMakePreprocessorDefinitions>
    <NMakeIncludeSearchPath>..\;..\Juliet\include;..\Game;C:\Program Files\Microsoft Visual Studio\2022\Community\VC\Tools\MSVC\14.44.35207\include\;C:\Program Files (x86)\Windows Kits\10\Include\10.0.26100.0\ucrt;C:\Program Files (x86)\Windows Kits\10\Include\10.0.26100.0\um;C:\Program Files (x86)\Windows Kits\10\Include\10.0.26100.0\shared;</NMakeIncludeSearchPath>
    <AdditionalOptions>/std:c++20 /wd5267 /wd4061 /wd4505 /wd4514 /wd4577 /wd4625 /wd4710 /wd4711 /wd4746 /wd4820 /wd5045 /wd5220 /wd5245 </AdditionalOptions>
@@ -373,8 +373,8 @@
    <OutDir>$(SolutionDir)\bin</OutDir>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='x64-Debug|x64'">
-    <NMakeBuildCommandLine>cd $(SolutionDir) &amp; misc\fbuild -vs -dist -monitor -cache $(ProjectName)-$(Configuration)</NMakeBuildCommandLine>
+    <NMakeBuildCommandLine>cd $(SolutionDir) &amp; misc\fbuild -ide -dist -monitor -cache $(ProjectName)-$(Configuration)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>cd $(SolutionDir) &amp; mics\fbuild -vs -dist -monitor -cache -clean $(ProjectName)-$(Configuration)</NMakeReBuildCommandLine>
+    <NMakeReBuildCommandLine>cd $(SolutionDir) &amp; mics\fbuild -ide -dist -monitor -cache -clean $(ProjectName)-$(Configuration)</NMakeReBuildCommandLine>
    <NMakePreprocessorDefinitions>WIN32_LEAN_AND_MEAN;WIN32;_WIN32;__WINDOWS__;_HAS_EXCEPTIONS=0;WIN64;DEBUG;PROFILING_ENABLED;JULIET_WIN32;</NMakePreprocessorDefinitions>
    <NMakeIncludeSearchPath>..\;..\Juliet\include;C:\Program Files\Microsoft Visual Studio\2022\Community\VC\Tools\MSVC\14.44.35207\include\;C:\Program Files (x86)\Windows Kits\10\Include\10.0.26100.0\ucrt;C:\Program Files (x86)\Windows Kits\10\Include\10.0.26100.0\um;C:\Program Files (x86)\Windows Kits\10\Include\10.0.26100.0\shared;</NMakeIncludeSearchPath>
    <AdditionalOptions>/std:c++20 /wd5267 /wd4061 /wd4505 /wd4514 /wd4577 /wd4625 /wd4710 /wd4711 /wd4746 /wd4820 /wd5045 /wd5220 /wd5245 </AdditionalOptions>
@@ -383,8 +383,8 @@
    <OutDir>$(SolutionDir)\bin</OutDir>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='x64-Profile|x64'">
-    <NMakeBuildCommandLine>cd $(SolutionDir) &amp; misc\fbuild -vs -dist -monitor -cache $(ProjectName)-$(Configuration)</NMakeBuildCommandLine>
+    <NMakeBuildCommandLine>cd $(SolutionDir) &amp; misc\fbuild -ide -dist -monitor -cache $(ProjectName)-$(Configuration)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>cd $(SolutionDir) &amp; mics\fbuild -vs -dist -monitor -cache -clean $(ProjectName)-$(Configuration)</NMakeReBuildCommandLine>
+    <NMakeReBuildCommandLine>cd $(SolutionDir) &amp; mics\fbuild -ide -dist -monitor -cache -clean $(ProjectName)-$(Configuration)</NMakeReBuildCommandLine>
    <NMakePreprocessorDefinitions>WIN32_LEAN_AND_MEAN;WIN32;_WIN32;__WINDOWS__;_HAS_EXCEPTIONS=0;WIN64;RELEASE;PROFILING_ENABLED;JULIET_WIN32;</NMakePreprocessorDefinitions>
    <NMakeIncludeSearchPath>..\;..\Juliet\include;C:\Program Files\Microsoft Visual Studio\2022\Community\VC\Tools\MSVC\14.44.35207\include\;C:\Program Files (x86)\Windows Kits\10\Include\10.0.26100.0\ucrt;C:\Program Files (x86)\Windows Kits\10\Include\10.0.26100.0\um;C:\Program Files (x86)\Windows Kits\10\Include\10.0.26100.0\shared;</NMakeIncludeSearchPath>
    <AdditionalOptions>/std:c++20 /wd5267 /wd4061 /wd4505 /wd4514 /wd4577 /wd4625 /wd4710 /wd4711 /wd4746 /wd4820 /wd5045 /wd5220 /wd5245 </AdditionalOptions>
@@ -393,8 +393,8 @@
    <OutDir>$(SolutionDir)\bin</OutDir>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='x64-Release|x64'">
-    <NMakeBuildCommandLine>cd $(SolutionDir) &amp; misc\fbuild -vs -dist -monitor -cache $(ProjectName)-$(Configuration)</NMakeBuildCommandLine>
+    <NMakeBuildCommandLine>cd $(SolutionDir) &amp; misc\fbuild -ide -dist -monitor -cache $(ProjectName)-$(Configuration)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>cd $(SolutionDir) &amp; mics\fbuild -vs -dist -monitor -cache -clean $(ProjectName)-$(Configuration)</NMakeReBuildCommandLine>
+    <NMakeReBuildCommandLine>cd $(SolutionDir) &amp; mics\fbuild -ide -dist -monitor -cache -clean $(ProjectName)-$(Configuration)</NMakeReBuildCommandLine>
    <NMakePreprocessorDefinitions>WIN32_LEAN_AND_MEAN;WIN32;_WIN32;__WINDOWS__;_HAS_EXCEPTIONS=0;WIN64;RELEASE;JULIET_WIN32;</NMakePreprocessorDefinitions>
    <NMakeIncludeSearchPath>..\;..\Juliet\include;C:\Program Files\Microsoft Visual Studio\2022\Community\VC\Tools\MSVC\14.44.35207\include\;C:\Program Files (x86)\Windows Kits\10\Include\10.0.26100.0\ucrt;C:\Program Files (x86)\Windows Kits\10\Include\10.0.26100.0\um;C:\Program Files (x86)\Windows Kits\10\Include\10.0.26100.0\shared;</NMakeIncludeSearchPath>
    <AdditionalOptions>/std:c++20 /wd5267 /wd4061 /wd4505 /wd4514 /wd4577 /wd4625 /wd4710 /wd4711 /wd4746 /wd4820 /wd5045 /wd5220 /wd5245 </AdditionalOptions>
@@ -403,31 +403,31 @@
    <OutDir>$(SolutionDir)\bin</OutDir>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='x64Clang-Debug|x64'">
-    <NMakeBuildCommandLine>cd $(SolutionDir) &amp; misc\fbuild -vs -dist -monitor -cache $(ProjectName)-$(Configuration)</NMakeBuildCommandLine>
+    <NMakeBuildCommandLine>cd $(SolutionDir) &amp; misc\fbuild -ide -dist -monitor -cache $(ProjectName)-$(Configuration)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>cd $(SolutionDir) &amp; mics\fbuild -vs -dist -monitor -cache -clean $(ProjectName)-$(Configuration)</NMakeReBuildCommandLine>
+    <NMakeReBuildCommandLine>cd $(SolutionDir) &amp; mics\fbuild -ide -dist -monitor -cache -clean $(ProjectName)-$(Configuration)</NMakeReBuildCommandLine>
    <NMakePreprocessorDefinitions>WIN32_LEAN_AND_MEAN;WIN32;_WIN32;__WINDOWS__;_HAS_EXCEPTIONS=0;WIN64;DEBUG;PROFILING_ENABLED;JULIET_WIN32;</NMakePreprocessorDefinitions>
    <NMakeIncludeSearchPath>..\;..\Juliet\include;C:\Program Files\Microsoft Visual Studio\2022\Community\VC\Tools\MSVC\14.44.35207\include\;C:\Program Files (x86)\Windows Kits\10\Include\10.0.26100.0\ucrt;C:\Program Files (x86)\Windows Kits\10\Include\10.0.26100.0\um;C:\Program Files (x86)\Windows Kits\10\Include\10.0.26100.0\shared;</NMakeIncludeSearchPath>
-    <AdditionalOptions>/std:c++20 /wd5267 /wd4061 /wd4505 /wd4514 /wd4577 /wd4625 /wd4710 /wd4711 /wd4746 /wd4820 /wd5045 /wd5220 /wd5245 </AdditionalOptions>
+    <AdditionalOptions>/std:c++20 </AdditionalOptions>
    <LocalDebuggerWorkingDirectory>$(SolutionDir)\bin\$(Configuration)\</LocalDebuggerWorkingDirectory>
    <IntDir>$(SolutionDir)\Intermediate</IntDir>
    <OutDir>$(SolutionDir)\bin</OutDir>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='x64Clang-Profile|x64'">
-    <NMakeBuildCommandLine>cd $(SolutionDir) &amp; misc\fbuild -vs -dist -monitor -cache $(ProjectName)-$(Configuration)</NMakeBuildCommandLine>
+    <NMakeBuildCommandLine>cd $(SolutionDir) &amp; misc\fbuild -ide -dist -monitor -cache $(ProjectName)-$(Configuration)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>cd $(SolutionDir) &amp; mics\fbuild -vs -dist -monitor -cache -clean $(ProjectName)-$(Configuration)</NMakeReBuildCommandLine>
+    <NMakeReBuildCommandLine>cd $(SolutionDir) &amp; mics\fbuild -ide -dist -monitor -cache -clean $(ProjectName)-$(Configuration)</NMakeReBuildCommandLine>
    <NMakePreprocessorDefinitions>WIN32_LEAN_AND_MEAN;WIN32;_WIN32;__WINDOWS__;_HAS_EXCEPTIONS=0;WIN64;RELEASE;PROFILING_ENABLED;JULIET_WIN32;</NMakePreprocessorDefinitions>
    <NMakeIncludeSearchPath>..\;..\Juliet\include;C:\Program Files\Microsoft Visual Studio\2022\Community\VC\Tools\MSVC\14.44.35207\include\;C:\Program Files (x86)\Windows Kits\10\Include\10.0.26100.0\ucrt;C:\Program Files (x86)\Windows Kits\10\Include\10.0.26100.0\um;C:\Program Files (x86)\Windows Kits\10\Include\10.0.26100.0\shared;</NMakeIncludeSearchPath>
-    <AdditionalOptions>/std:c++20 /wd5267 /wd4061 /wd4505 /wd4514 /wd4577 /wd4625 /wd4710 /wd4711 /wd4746 /wd4820 /wd5045 /wd5220 /wd5245 </AdditionalOptions>
+    <AdditionalOptions>/std:c++20 </AdditionalOptions>
    <LocalDebuggerWorkingDirectory>$(SolutionDir)\bin\$(Configuration)\</LocalDebuggerWorkingDirectory>
    <IntDir>$(SolutionDir)\Intermediate</IntDir>
    <OutDir>$(SolutionDir)\bin</OutDir>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='x64Clang-Release|x64'">
-    <NMakeBuildCommandLine>cd $(SolutionDir) &amp; misc\fbuild -vs -dist -monitor -cache $(ProjectName)-$(Configuration)</NMakeBuildCommandLine>
+    <NMakeBuildCommandLine>cd $(SolutionDir) &amp; misc\fbuild -ide -dist -monitor -cache $(ProjectName)-$(Configuration)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>cd $(SolutionDir) &amp; mics\fbuild -vs -dist -monitor -cache -clean $(ProjectName)-$(Configuration)</NMakeReBuildCommandLine>
+    <NMakeReBuildCommandLine>cd $(SolutionDir) &amp; mics\fbuild -ide -dist -monitor -cache -clean $(ProjectName)-$(Configuration)</NMakeReBuildCommandLine>
    <NMakePreprocessorDefinitions>WIN32_LEAN_AND_MEAN;WIN32;_WIN32;__WINDOWS__;_HAS_EXCEPTIONS=0;WIN64;RELEASE;JULIET_WIN32;</NMakePreprocessorDefinitions>
    <NMakeIncludeSearchPath>..\;..\Juliet\include;C:\Program Files\Microsoft Visual Studio\2022\Community\VC\Tools\MSVC\14.44.35207\include\;C:\Program Files (x86)\Windows Kits\10\Include\10.0.26100.0\ucrt;C:\Program Files (x86)\Windows Kits\10\Include\10.0.26100.0\um;C:\Program Files (x86)\Windows Kits\10\Include\10.0.26100.0\shared;</NMakeIncludeSearchPath>
-    <AdditionalOptions>/std:c++20 /wd5267 /wd4061 /wd4505 /wd4514 /wd4577 /wd4625 /wd4710 /wd4711 /wd4746 /wd4820 /wd5045 /wd5220 /wd5245 </AdditionalOptions>
+    <AdditionalOptions>/std:c++20 </AdditionalOptions>
    <LocalDebuggerWorkingDirectory>$(SolutionDir)\bin\$(Configuration)\</LocalDebuggerWorkingDirectory>
    <IntDir>$(SolutionDir)\Intermediate</IntDir>
    <OutDir>$(SolutionDir)\bin</OutDir>
--- a/JulietShaderCompiler.sln
+++ b/JulietShaderCompiler.sln
@@ -0,0 +1,25 @@
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 14
 VisualStudioVersion = 14.0.22823.1
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "JulietShaderCompiler", "JulietShaderCompiler\JulietShaderCompiler.vcxproj", "{534B94ED-6C94-4F93-BC2A-7F5284B7D434}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Juliet", "Juliet\Juliet.vcxproj", "{AB9C7E88-6C94-4F93-BC2A-7F5284B7D434}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|x64Clang = Debug|x64Clang
 		Release|x64Clang = Release|x64Clang
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
 		{534B94ED-6C94-4F93-BC2A-7F5284B7D434}.Debug|x64Clang.ActiveCfg = x64Clang-Debug|x64
 		{534B94ED-6C94-4F93-BC2A-7F5284B7D434}.Debug|x64Clang.Build.0 = x64Clang-Debug|x64
 		{534B94ED-6C94-4F93-BC2A-7F5284B7D434}.Release|x64Clang.ActiveCfg = x64Clang-Release|x64
 		{534B94ED-6C94-4F93-BC2A-7F5284B7D434}.Release|x64Clang.Build.0 = x64Clang-Release|x64
 		{AB9C7E88-6C94-4F93-BC2A-7F5284B7D434}.Debug|x64Clang.ActiveCfg = x64Clang-Debug|x64
 		{AB9C7E88-6C94-4F93-BC2A-7F5284B7D434}.Release|x64Clang.ActiveCfg = x64Clang-Release|x64
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
 EndGlobal
--- a/JulietShaderCompiler/JulietShaderCompiler.bff
+++ b/JulietShaderCompiler/JulietShaderCompiler.bff
@@ -0,0 +1,100 @@
 .ProjectName = 'JulietShaderCompiler'
 .ProjectPath = 'JulietShaderCompiler'
 // 1. Define the configurations and a container for the VS Project
 .ShaderCompilerConfigs = { .X64ClangDebugConfig, .X64ClangReleaseConfig }
 .ProjectConfigsShader = {} 
 .DXCSourcePath = '$ProjectPath$/DXShaderCompiler'
 ForEach( .BuildConfig in .ShaderCompilerConfigs )
 {
    Using( .BuildConfig )
    .OutputBase + '\$Platform$-$BuildConfigName$'
    // 2. Define the Build Targets for this specific configuration
    ObjectList( '$ProjectName$-Obs-$Platform$-$BuildConfigName$' )
    {
        .CompilerInputPath  = '$ProjectPath$/'
        .CompilerOutputPath = '$OutputBase$/$ProjectPath$/'
        .CompilerOptions    + ' "-IJuliet/include"'
                            + ' "-IJulietShaderCompiler"'
        #if __WINDOWS__
            .CompilerOptions + ' -DJULIET_WIN32'
        #endif
    }
 #if __WINDOWS__
    Copy( '$ProjectName$-CopyDeps-$Platform$-$BuildConfigName$' )
    {
        .Source = { 
                    '$DXCSourcePath$/dxcompiler.dll',
                    '$DXCSourcePath$/dxil.dll' 
                  }
        .Dest   = '$BinPath$/$Platform$-$BuildConfigName$/'
    }
 #endif
    Executable( '$ProjectName$-Exe-$Platform$-$BuildConfigName$' )
    {
        .Libraries      = { 
                            'Juliet-Lib-$Platform$-$BuildConfigName$',
                            '$ProjectName$-Obs-$Platform$-$BuildConfigName$'
                          }
        .LinkerOutput               = '$BinPath$/$Platform$-$BuildConfigName$/$ProjectName$$ExeExtension$'
        #if __WINDOWS__
            .CRTLibs = .CRTLibs_Dynamic
            If ( .BuildConfigName == 'Debug' )
            {
                ^CRTLibs = .CRTLibs_DynamicDebug
            }
            .LinkerOptions               + .CRTLibs
            .LinkerOptions + .CommonWinLibs + ' dxcompiler.lib'
        #endif
        #if __WINDOWS__
            .PreBuildDependencies = { '$ProjectName$-CopyDeps-$Platform$-$BuildConfigName$' }
        #endif
    }
    Alias( '$ProjectName$-$Platform$-$BuildConfigName$' ) { .Targets = '$ProjectName$-Exe-$Platform$-$BuildConfigName$' }
    ^'Targets_$Platform$_$BuildConfigName$' + { '$ProjectName$-$Platform$-$BuildConfigName$' }
    #if __WINDOWS__
        .ConfigInfo = 
        [
            Using( .'Project_$Platform$_$BuildConfigName$' )
            .LocalDebuggerCommandArguments = '..\..\Assets\source\SolidColor.frag.hlsl -o ..\..\Assets\compiled\SolidColor.frag.dxil'
            .Target = '$ProjectName$-$Config$'
        ]
        ^ProjectConfigsShader + .ConfigInfo
    #endif
 }
 // 4. Create the Project and Solution using the generated list
 VCXProject( '$ProjectName$-Proj' )
 {
    .ProjectOutput   = '$ProjectPath$/$ProjectName$.vcxproj'
    .ProjectBasePath = '$ProjectPath$/'
    .ProjectInputPaths = { .ProjectBasePath } 
    .ProjectConfigs  = .ProjectConfigsShader
 }
 VSSolution( 'ShaderCompiler-Solution' )
 {
    .SolutionOutput       = 'JulietShaderCompiler.sln' 
    .SolutionProjects     = { '$ProjectName$-Proj' , 'Juliet' } 
    .SolutionConfigs      = .ProjectConfigsShader
    .SolutionBuildProject = '$ProjectName$-Proj' 
 }
 // 5. Global Aliases
 Alias( 'gen-shader' ) { .Targets = 'ShaderCompiler-Solution' }
 Alias( 'shader' )     { .Targets = { '$ProjectName$-x64Clang-Release' } }
 Alias( 'shader-debug' )     { .Targets = { '$ProjectName$-x64Clang-Debug',  } }
--- a/JulietShaderCompiler/JulietShaderCompiler.vcxproj
+++ b/JulietShaderCompiler/JulietShaderCompiler.vcxproj
@@ -1,119 +1,86 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-    <ItemGroup Label="ProjectConfigurations">
+  <ItemGroup Label="ProjectConfigurations">
-        <ProjectConfiguration Include="Debug|x64">
+    <ProjectConfiguration Include="x64Clang-Debug|x64">
-            <Configuration>Debug</Configuration>
+      <Configuration>x64Clang-Debug</Configuration>
-            <Platform>x64</Platform>
+      <Platform>x64</Platform>
-        </ProjectConfiguration>
+    </ProjectConfiguration>
-        <ProjectConfiguration Include="Release|x64">
+    <ProjectConfiguration Include="x64Clang-Release|x64">
-            <Configuration>Release</Configuration>
+      <Configuration>x64Clang-Release</Configuration>
-            <Platform>x64</Platform>
+      <Platform>x64</Platform>
-        </ProjectConfiguration>
+    </ProjectConfiguration>
-    </ItemGroup>
+  </ItemGroup>
-    <PropertyGroup Label="Globals">
+  <ItemGroup>
-        <VCProjectVersion>15.0</VCProjectVersion>
+    <CustomBuild Include="DXShaderCompiler\DXCompiler.h" />
-        <ProjectGuid>{26880364-45F4-4817-BFD3-0ACC0958757D}</ProjectGuid>
+    <CustomBuild Include="JulietShaderCompiler.bff" />
-        <Keyword>Win32Proj</Keyword>
+    <CustomBuild Include="main.cpp" />
-        <RootNamespace>JulietShaderCompiler</RootNamespace>
+    <CustomBuild Include="ShaderCompiler.cpp" />
-        <WindowsTargetPlatformVersion>10.0.26100.0</WindowsTargetPlatformVersion>
+    <CustomBuild Include="ShaderCompiler.h" />
-    </PropertyGroup>
+  </ItemGroup>
-    <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props"/>
+  <ItemGroup>
-    <PropertyGroup>
+  </ItemGroup>
-        <PreferredToolArchitecture>x64</PreferredToolArchitecture>
+  <PropertyGroup Label="Globals">
-    </PropertyGroup>
+    <ProjectGuid>{534b94ed-6c94-4f93-bc2a-7f5284b7d434}</ProjectGuid>
-    <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <Keyword>MakeFileProj</Keyword>
-        <ConfigurationType>Application</ConfigurationType>
+  </PropertyGroup>
-        <UseDebugLibraries>true</UseDebugLibraries>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-        <PlatformToolset>ClangCL</PlatformToolset>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='x64Clang-Debug|x64'" Label="Configuration">
-        <CharacterSet>Unicode</CharacterSet>
+    <ConfigurationType>Makefile</ConfigurationType>
-    </PropertyGroup>
+    <UseDebugLibraries>false</UseDebugLibraries>
-    <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <PlatformToolset>v143</PlatformToolset>
-        <ConfigurationType>Application</ConfigurationType>
+    <LocalDebuggerCommandArguments>..\..\Assets\source\SolidColor.frag.hlsl -o ..\..\Assets\compiled\SolidColor.frag.dxil</LocalDebuggerCommandArguments>
-        <UseDebugLibraries>false</UseDebugLibraries>
+    <LocalDebuggerCommand>$(SolutionDir)\bin\$(Configuration)\$(ProjectName).exe</LocalDebuggerCommand>
-        <PlatformToolset>ClangCL</PlatformToolset>
+  </PropertyGroup>
-        <WholeProgramOptimization>true</WholeProgramOptimization>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='x64Clang-Release|x64'" Label="Configuration">
-        <CharacterSet>Unicode</CharacterSet>
+    <ConfigurationType>Makefile</ConfigurationType>
-    </PropertyGroup>
+    <UseDebugLibraries>false</UseDebugLibraries>
-    <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props"/>
+    <PlatformToolset>v143</PlatformToolset>
-    <ImportGroup Label="ExtensionSettings">
+    <LocalDebuggerCommandArguments>..\..\Assets\source\SolidColor.frag.hlsl -o ..\..\Assets\compiled\SolidColor.frag.dxil</LocalDebuggerCommandArguments>
-    </ImportGroup>
+    <LocalDebuggerCommand>$(SolutionDir)\bin\$(Configuration)\$(ProjectName).exe</LocalDebuggerCommand>
-    <ImportGroup Label="Shared">
+  </PropertyGroup>
-    </ImportGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-    <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+  <ImportGroup Label="ExtensionSettings">
-        <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform"/>
+  </ImportGroup>
-    </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='x64Clang-Debug|x64'">
-    <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-        <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform"/>
+  </ImportGroup>
-    </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='x64Clang-Release|x64'">
-    <PropertyGroup Label="UserMacros"/>
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+  </ImportGroup>
-        <LinkIncremental>true</LinkIncremental>
+  <PropertyGroup Label="UserMacros" />
-        <OutDir>$(SolutionDir)\bin\$(Platform)\$(Configuration)\</OutDir>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='x64Clang-Debug|x64'">
-        <IntDir>$(SolutionDir)Intermediate\$(ProjectName)\$(Platform)\$(Configuration)\</IntDir>
+    <NMakeBuildCommandLine>cd $(SolutionDir) &amp; misc\fbuild -ide -dist -monitor -cache $(ProjectName)-$(Configuration)</NMakeBuildCommandLine>
-    </PropertyGroup>
+    <NMakeReBuildCommandLine>cd $(SolutionDir) &amp; misc\fbuild -ide -dist -monitor -cache -clean $(ProjectName)-$(Configuration)</NMakeReBuildCommandLine>
-    <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <NMakePreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;_UNICODE;UNICODE;WIN32_LEAN_AND_MEAN;WIN32;_WIN32;__WINDOWS__;_HAS_EXCEPTIONS=0;WIN64;DEBUG;PROFILING_ENABLED;JULIET_EXPORT;JULIET_WIN32;</NMakePreprocessorDefinitions>
-        <LinkIncremental>false</LinkIncremental>
+    <NMakeIncludeSearchPath>..\;..\Juliet\include;..\Juliet\src;C:\Program Files\Microsoft Visual Studio\2022\Community\VC\Tools\MSVC\14.44.35207\include\;C:\Program Files (x86)\Windows Kits\10\Include\10.0.26100.0\ucrt;C:\Program Files (x86)\Windows Kits\10\Include\10.0.26100.0\um;C:\Program Files (x86)\Windows Kits\10\Include\10.0.26100.0\shared;</NMakeIncludeSearchPath>
-        <OutDir>$(SolutionDir)\bin\$(Platform)\$(Configuration)\</OutDir>
+    <AdditionalOptions>/std:c++20 </AdditionalOptions>
-        <IntDir>$(SolutionDir)Intermediate\$(ProjectName)\$(Platform)\$(Configuration)\</IntDir>
+    <LocalDebuggerWorkingDirectory>$(SolutionDir)\bin\$(Configuration)\</LocalDebuggerWorkingDirectory>
-    </PropertyGroup>
+    <IntDir>$(SolutionDir)\Intermediate</IntDir>
-    <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <OutDir>$(SolutionDir)\bin</OutDir>
-        <ClCompile>
+  </PropertyGroup>
-            <PrecompiledHeader>NotUsing</PrecompiledHeader>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='x64Clang-Release|x64'">
-            <WarningLevel>Level3</WarningLevel>
+    <NMakeBuildCommandLine>cd $(SolutionDir) &amp; misc\fbuild -ide -dist -monitor -cache $(ProjectName)-$(Configuration)</NMakeBuildCommandLine>
-            <Optimization>Disabled</Optimization>
+    <NMakeReBuildCommandLine>cd $(SolutionDir) &amp; misc\fbuild -ide -dist -monitor -cache -clean $(ProjectName)-$(Configuration)</NMakeReBuildCommandLine>
-            <SDLCheck>true</SDLCheck>
+    <NMakePreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;_UNICODE;UNICODE;WIN32_LEAN_AND_MEAN;WIN32;_WIN32;__WINDOWS__;_HAS_EXCEPTIONS=0;WIN64;RELEASE;JULIET_EXPORT;JULIET_WIN32;</NMakePreprocessorDefinitions>
-            <PreprocessorDefinitions>_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    <NMakeIncludeSearchPath>..\;..\Juliet\include;..\Juliet\src;C:\Program Files\Microsoft Visual Studio\2022\Community\VC\Tools\MSVC\14.44.35207\include\;C:\Program Files (x86)\Windows Kits\10\Include\10.0.26100.0\ucrt;C:\Program Files (x86)\Windows Kits\10\Include\10.0.26100.0\um;C:\Program Files (x86)\Windows Kits\10\Include\10.0.26100.0\shared;</NMakeIncludeSearchPath>
-            <ConformanceMode>true</ConformanceMode>
+    <AdditionalOptions>/std:c++20 </AdditionalOptions>
-            <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
+    <LocalDebuggerWorkingDirectory>$(SolutionDir)\bin\$(Configuration)\</LocalDebuggerWorkingDirectory>
-            <AdditionalIncludeDirectories>$(SolutionDir)Juliet\include\;$(SolutionDir)JulietShaderCompiler;</AdditionalIncludeDirectories>
+    <IntDir>$(SolutionDir)\Intermediate</IntDir>
-            <LanguageStandard>stdcpp20</LanguageStandard>
+    <OutDir>$(SolutionDir)\bin</OutDir>
-        </ClCompile>
+  </PropertyGroup>
-        <Link>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='x64Clang-Debug|x64'">
-            <SubSystem>Console</SubSystem>
+    <BuildLog>
-            <GenerateDebugInformation>true</GenerateDebugInformation>
+    <Path>$(SolutionDir)\Intermediate\$(ProjectName)-$(Configuration).log</Path>
-            <AdditionalLibraryDirectories>$(SolutionDir)\lib\$(Platform)\$(Configuration)\</AdditionalLibraryDirectories>
+    </BuildLog>
-            <AdditionalDependencies>Juliet.lib; $(CoreLibraryDependencies);%(AdditionalDependencies)</AdditionalDependencies>
+  </ItemDefinitionGroup>
-        </Link>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='x64Clang-Release|x64'">
-    </ItemDefinitionGroup>
+    <BuildLog>
-    <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <Path>$(SolutionDir)\Intermediate\$(ProjectName)-$(Configuration).log</Path>
-        <ClCompile>
+    </BuildLog>
-            <PrecompiledHeader>NotUsing</PrecompiledHeader>
+  </ItemDefinitionGroup>
-            <WarningLevel>Level3</WarningLevel>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-            <Optimization>MaxSpeed</Optimization>
+  <ImportGroup Label="ExtensionTargets">
-            <FunctionLevelLinking>true</FunctionLevelLinking>
+  </ImportGroup>
-            <IntrinsicFunctions>true</IntrinsicFunctions>
+  <Import Condition="'$(ConfigurationType)' == 'Makefile' and Exists('$(VCTargetsPath)\Platforms\$(Platform)\SCE.Makefile.$(Platform).targets')" Project="$(VCTargetsPath)\Platforms\$(Platform)\SCE.Makefile.$(Platform).targets" />
-            <SDLCheck>true</SDLCheck>
+  <Import Condition="'$(ConfigurationType)' == 'Makefile' and '$(AndroidAPILevel)' != '' and Exists('$(VCTargetsPath)\Application Type\$(ApplicationType)\$(ApplicationTypeRevision)\Android.Common.targets')" Project="$(VCTargetsPath)\Application Type\$(ApplicationType)\$(ApplicationTypeRevision)\Android.Common.targets" />
            <PreprocessorDefinitions>NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
            <ConformanceMode>true</ConformanceMode>
            <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
            <LanguageStandard>stdcpp20</LanguageStandard>
        </ClCompile>
        <Link>
            <SubSystem>Console</SubSystem>
            <EnableCOMDATFolding>true</EnableCOMDATFolding>
            <OptimizeReferences>true</OptimizeReferences>
            <GenerateDebugInformation>true</GenerateDebugInformation>
            <AdditionalLibraryDirectories>$(SolutionDir)\lib\$(Platform)\$(Configuration)\;</AdditionalLibraryDirectories>
            <AdditionalDependencies>Juliet.lib; $(CoreLibraryDependencies);%(AdditionalDependencies)</AdditionalDependencies>
        </Link>
    </ItemDefinitionGroup>
    <ItemGroup>
        <ClCompile Include="main.cpp"/>
        <ClCompile Include="ShaderCompiler.cpp" />
    </ItemGroup>
    <ItemGroup>
        <CopyFileToFolders Include="DXShaderCompiler\dxcompiler.dll">
            <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
        </CopyFileToFolders>
        <CopyFileToFolders Include="DXShaderCompiler\dxil.dll">
            <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
        </CopyFileToFolders>
    </ItemGroup>
    <ItemGroup>
      <ClInclude Include="DXShaderCompiler\DXCompiler.h" />
      <ClInclude Include="ShaderCompiler.h" />
    </ItemGroup>
    <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets"/>
    <ImportGroup Label="ExtensionTargets">
    </ImportGroup>
 </Project>
--- a/JulietShaderCompiler/JulietShaderCompiler.vcxproj.filters
+++ b/JulietShaderCompiler/JulietShaderCompiler.vcxproj.filters
@@ -1,22 +1,21 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <ItemGroup>
-    <Filter Include="Source Files">
+    <CustomBuild Include="DXShaderCompiler\DXCompiler.h">
-      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
+      <Filter>DXShaderCompiler</Filter>
-      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
+    </CustomBuild>
-    </Filter>
+    <CustomBuild Include="JulietShaderCompiler.bff">
-    <Filter Include="Header Files">
+    </CustomBuild>
-      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
+    <CustomBuild Include="main.cpp">
-      <Extensions>h;hh;hpp;hxx;hm;inl;inc;ipp;xsd</Extensions>
+    </CustomBuild>
-    </Filter>
+    <CustomBuild Include="ShaderCompiler.cpp">
-    <Filter Include="Resource Files">
+    </CustomBuild>
-      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
+    <CustomBuild Include="ShaderCompiler.h">
-      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
+    </CustomBuild>
    </Filter>
  </ItemGroup>
  <ItemGroup>
-    <ClCompile Include="JulietShaderCompiler.cpp">
+    <Filter Include="DXShaderCompiler">
-      <Filter>Source Files</Filter>
+      <UniqueIdentifier>{9f537123-6c94-4f93-bc2a-7f5284b7d434}</UniqueIdentifier>
-    </ClCompile>
+    </Filter>
  </ItemGroup>
 </Project>
--- a/JulietShaderCompiler/ShaderCompiler.cpp
+++ b/JulietShaderCompiler/ShaderCompiler.cpp
@@ -6,8 +6,6 @@
 #include <Core/Memory/Allocator.h>
 #include <DXShaderCompiler/DXCompiler.h>
 #pragma comment(lib, "dxcompiler.lib")
 using namespace Juliet;
 namespace
@@ -66,7 +64,8 @@ namespace
        char         inplaceBuffer[1024];
        convertedBuffer.Data     = inplaceBuffer;
        convertedBuffer.Capacity = sizeof(inplaceBuffer);
-        if (!ConvertString(StringEncoding::UTF8, StringEncoding::UTF16, info.EntryPoint, convertedBuffer))
+        constexpr bool kAddNullTerminator = true;
        if (!ConvertString(StringEncoding::UTF8, StringEncoding::UTF16, info.EntryPoint, convertedBuffer, kAddNullTerminator))
        {
            LogError(LogCategory::Tool, "Cannot convert entry point string to utf16");
            return {};
@@ -130,7 +129,7 @@ namespace
            StringBuffer nameUtf16 = {};
            nameUtf16.Data         = nameInplaceBuffer;
            nameUtf16.Capacity     = sizeof(nameInplaceBuffer);
-            if (ConvertString(StringEncoding::UTF8, StringEncoding::UTF16, info.Name, nameUtf16))
+            if (ConvertString(StringEncoding::UTF8, StringEncoding::UTF16, info.Name, nameUtf16, kAddNullTerminator))
            {
                args[argCount++] = reinterpret_cast<LPCWSTR>(nameInplaceBuffer);
            }
--- a/JulietShaderCompiler/ShaderCompiler.h
+++ b/JulietShaderCompiler/ShaderCompiler.h
@@ -39,4 +39,4 @@ struct HLSLShaderInfo : ShaderInfo
    // TODO Defines and includes
 };
-ByteBuffer CompileDXIL(HLSLShaderInfo& info);
+ByteBuffer CompileDXIL(HLSLShaderInfo& info);
--- a/fbuild.bff
+++ b/fbuild.bff
@@ -140,8 +140,8 @@ Settings
 #if __WINDOWS__
    .ProjectCommon =
    [
-        .ProjectBuildCommand            = 'cd ^$(SolutionDir) & misc\fbuild -vs -dist -monitor -cache ^$(ProjectName)-^$(Configuration)'
+        .ProjectBuildCommand            = 'cd ^$(SolutionDir) & misc\fbuild -ide -dist -monitor -cache ^$(ProjectName)-^$(Configuration)'
-        .ProjectRebuildCommand          = 'cd ^$(SolutionDir) & mics\fbuild -vs -dist -monitor -cache -clean ^$(ProjectName)-^$(Configuration)'
+        .ProjectRebuildCommand          = 'cd ^$(SolutionDir) & misc\fbuild -ide -dist -monitor -cache -clean ^$(ProjectName)-^$(Configuration)'
        .OutputDirectory                = '^$(SolutionDir)\bin'
        .IntermediateDirectory          = '^$(SolutionDir)\Intermediate'
        .BuildLogFile                   = '^$(SolutionDir)\Intermediate\^$(ProjectName)-^$(Configuration).log'
@@ -177,6 +177,7 @@ Settings
 #include "Juliet/Juliet.bff"
 #include "Game/Game.bff"
 #include "JulietApp/JulietApp.Bff"
 #include "JulietShaderCompiler/JulietShaderCompiler.Bff"
 // Aliases : All-$Platform$-$Config$
 //------------------------------------------------------------------------------
@@ -256,4 +257,4 @@ VSSolution( 'GenerateSolution' )
    .SolutionConfigs  = .ProjectConfigs
    .SolutionBuildProject = 'JulietApp'
 }
-Alias( 'gen' ) { .Targets = 'GenerateSolution' }
+Alias( 'gen' ) { .Targets = 'GenerateSolution' }
--- a/misc/recompile_shaders.bat
+++ b/misc/recompile_shaders.bat
@@ -1,18 +1,35 @@
@echo off
 setlocal enabledelayedexpansion
-set TARGET=x64\Debug
+set TARGET=x64Clang-Release
 REM Chemin relatif vers JulietShaderCompiler.exe
-set COMPILER_PATH=..\bin\%TARGET%\JulietShaderCompiler.exe
+set COMPILER_PATH=bin\%TARGET%\JulietShaderCompiler.exe
 echo Compiler Path: !COMPILER_PATH!
 REM --- GESTION D'ERREUR : Vérification du compilateur ---
 if not exist "!COMPILER_PATH!" (
    echo.
    echo ERREUR : Le compilateur est introuvable au chemin : !COMPILER_PATH!
    echo Assurez-vous d'avoir bien bati le projet JulietShaderCompiler.
    pause
    exit /b 1
 )
 REM Dossier source contenant les fichiers .frag.hlsl et .vert.hlsl
-set SOURCE_DIR=..\Assets\source
+set SOURCE_DIR=Assets\source
 echo Source Dir: !SOURCE_DIR!
 REM --- GESTION D'ERREUR : Vérification du dossier source ---
 if not exist "!SOURCE_DIR!" (
    echo.
    echo ERREUR : Le dossier source est introuvable : !SOURCE_DIR!
    pause
    exit /b 1
 )
 REM Dossier de sortie pour les fichiers compilés
-set OUTPUT_DIR=..\Assets\compiled
+set OUTPUT_DIR=Assets\compiled
 echo Output Dir: !OUTPUT_DIR!
 REM Créer le dossier de sortie s'il n'existe pas
@@ -32,10 +49,18 @@ for %%F in ("%SOURCE_DIR%\*.frag.hlsl" "%SOURCE_DIR%\*.vert.hlsl") do (
    )
    REM Construire la ligne de commande
    set "COMMAND=%COMPILER_PATH% %SOURCE_DIR%\!FILENAME!!EXTENSION! -o %OUTPUT_DIR%\!FILENAME!!SHORT_EXTENSION!.dxil"
    REM Afficher la ligne de commande pour le débogage
    echo !COMMAND!
-    REM Appeler JulietShaderCompiler.exe avec les arguments spécifiés
+    REM Afficher la ligne de commande pour le débogage
    echo Compiling: !FILENAME!!EXTENSION!
    REM Appeler JulietShaderCompiler.exe avec les arguments spécifiés 
    !COMMAND!
    if !ERRORLEVEL! NEQ 0 (
        echo ERREUR lors de la compilation de %%F
    )
 )
 echo.
 echo Operation terminee.
 pause
 endlocal