From 8b5d66dbec3507cb988afe72b5054d750f1f12f0 Mon Sep 17 00:00:00 2001
From: Patrick Wuttke <p.wuttke@dsfishlabs.com>
Date: Mon, 14 Jul 2025 18:51:41 +0200
Subject: [PATCH] Forward CCFLAGS to Visual Studio project for IntelliSense.

---
 SConscript                                                   | 5 ++++-
 .../vs_project_files/target.vcxproj.jinja                    | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/SConscript b/SConscript
index b729ae6..fb4383c 100644
--- a/SConscript
+++ b/SConscript
@@ -894,7 +894,10 @@ def _dump() -> None:
                 'args': target.args,
                 # 'kwargs': kwargs, <- circular dependency here and the json encoder doesn't like that
                 'CPPDEFINES': kwargs.get('CPPDEFINES', env['CPPDEFINES']),
-                'CPPPATH': kwargs.get('CPPPATH', env['CPPPATH'])
+                'CPPPATH': kwargs.get('CPPPATH', env['CPPPATH']),
+                'CFLAGS': kwargs.get('CFLAGS', env['CFLAGS']),
+                'CCFLAGS': kwargs.get('CCFLAGS', env['CCFLAGS']),
+                'CXXFLAGS': kwargs.get('CXXFLAGS', env['CXXFLAGS'])
             }
         return result
 
diff --git a/util/vs_project_template/vs_project_files/target.vcxproj.jinja b/util/vs_project_template/vs_project_files/target.vcxproj.jinja
index 8451865..f740dff 100644
--- a/util/vs_project_template/vs_project_files/target.vcxproj.jinja
+++ b/util/vs_project_template/vs_project_files/target.vcxproj.jinja
@@ -59,7 +59,7 @@
       <GenerateDebugInformation>{{ build_type != 'release' and 'true' or 'false' }}</GenerateDebugInformation>
       <AdditionalIncludeDirectories>{{ get_target_property(build_type, target.name, 'CPPPATH') | join(';') }};%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <MsExtensions>false</MsExtensions>
-      <AdditionalOptions>/std:{{ ms_cxx_standard }}</AdditionalOptions>
+      <AdditionalOptions>{{ get_target_property(build_type, target.name, 'CCFLAGS') | join(' ') }}</AdditionalOptions> {# + get_target_property(build_type, target.name, 'CXXFLAGS')) #}
     </ClCompile>
   </ItemDefinitionGroup>
   {%- endfor %}