move from the project

van800 · Mar 3, 2025 · f7f76d6 · f7f76d6
1 parent 77989d9
commit f7f76d6
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 32 deletions.
diff --git a/methods.py b/methods.py
@@ -1235,6 +1235,7 @@ def get_dependencies(file, env, exts, headers, sources, others):
 
         proplist = [str(j) for j in env["CPPPATH"]]
         proplist += [str(j) for j in env.get("VSHINT_INCLUDES", [])]
+        proplist += [str(j) for j in get_default_include_paths(env)]
         props_template = props_template.replace("%%INCLUDES%%", ";".join(proplist))
 
         proplist = env["CCFLAGS"]
@@ -1394,16 +1395,6 @@ def get_dependencies(file, env, exts, headers, sources, others):
             toolset = "CLang"
         proj_template = proj_template.replace("%%PlatformToolset%%", toolset)
 
-        if not env.msvc:
-            proplist = [str(j) for j in env["CPPPATH"]]
-            proplist += [str(j) for j in env.get("VSHINT_INCLUDES", [])]
-            proplist += [str(j) for j in get_default_include_paths(env)]
-            proj_template = proj_template.replace("%%INCLUDES%%", ";".join(proplist))
-
-        proplist = [format_key_value(v) for v in list(env["CPPDEFINES"])]
-        proplist += [format_key_value(j) for j in env.get("VSHINT_DEFINES", [])]
-        proj_template = proj_template.replace("%%DEFINES%%", ";".join(proplist))
-
         with open(f"{project_name}.vcxproj", "w", encoding="utf-8", newline="\r\n") as f:
             f.write(proj_template)
 

diff --git a/misc/msvs/props.template b/misc/msvs/props.template
@@ -19,6 +19,27 @@
   <ItemGroup Condition="%%CONDITION%%">
     %%EXTRA_ITEMS%%
   </ItemGroup>
+
+  <Target Name="Build" Condition=" '$(PlatformToolset)' == 'Clang' ">
+    <Exec Command="scons vsproj=yes dev_build=yes" Condition="'$(OS)' != 'Windows_NT'"/>
+    <Exec Command="scons use_mingw=yes use_llvm=yes vsproj=yes dev_build=yes" Condition="'$(OS)' == 'Windows_NT'"/>
+  </Target>
+  <Target Name="Rebuild" DependsOnTargets="Clean;Build" Condition=" '$(PlatformToolset)' == 'Clang' "/>
+  <Target Name="Clean" Condition=" '$(PlatformToolset)' == 'Clang' ">
+    <Exec Command="scons --clean vsproj=yes dev_build=yes" Condition="'$(OS)' != 'Windows_NT'"/>
+    <Exec Command="scons --clean use_mingw=yes use_llvm=yes vsproj=yes dev_build=yes" Condition="'$(OS)' == 'Windows_NT'"/>
+  </Target>
+
+  <ItemDefinitionGroup Condition=" '$(PlatformToolset)' == 'Clang' ">
+    <ClCompile>
+      <AdditionalIncludeDirectories>
+        $(NMakeIncludeSearchPath)
+      </AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>
+        $(NMakePreprocessorDefinitions)
+      </PreprocessorDefinitions>
+    </ClCompile>
+  </ItemDefinitionGroup>
 </Project>
 <!-- CHECKSUM
 %%HASH%%

diff --git a/misc/msvs/vcxproj.template b/misc/msvs/vcxproj.template
@@ -38,28 +38,6 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" Condition=" '$(PlatformToolset)' != 'Clang' "/>
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-
-  <Target Name="Build" Condition=" '$(PlatformToolset)' == 'Clang' ">
-    <Exec Command="scons vsproj=yes dev_build=yes" Condition="'$(OS)' != 'Windows_NT'"/>
-    <Exec Command="scons use_mingw=yes use_llvm=yes vsproj=yes dev_build=yes" Condition="'$(OS)' == 'Windows_NT'"/>
-  </Target>
-  <Target Name="Rebuild" DependsOnTargets="Clean;Build" Condition=" '$(PlatformToolset)' == 'Clang' "/>
-  <Target Name="Clean" Condition=" '$(PlatformToolset)' == 'Clang' ">
-    <Exec Command="scons --clean vsproj=yes dev_build=yes" Condition="'$(OS)' != 'Windows_NT'"/>
-    <Exec Command="scons --clean use_mingw=yes use_llvm=yes vsproj=yes dev_build=yes" Condition="'$(OS)' == 'Windows_NT'"/>
-  </Target>
-
-  <ItemDefinitionGroup Condition=" '$(PlatformToolset)' == 'Clang' ">
-    <ClCompile>
-      <AdditionalIncludeDirectories>
-        %%INCLUDES%%;
-        %(AdditionalIncludeDirectories)
-      </AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>
-        %%DEFINES%%;%(PreprocessorDefinitions)
-      </PreprocessorDefinitions>
-    </ClCompile>
-  </ItemDefinitionGroup>
 </Project>
 <!-- CHECKSUM
 %%HASH%%