File tree 3 files changed +1
-34
lines changed
3 files changed +1
-34
lines changed Original file line number Diff line number Diff line change @@ -1055,10 +1055,6 @@ if scons_cache_path is not None:
1055
1055
CacheDir (scons_cache_path )
1056
1056
print ("Scons cache enabled... (path: '" + scons_cache_path + "')" )
1057
1057
1058
- if env ["vsproj" ]:
1059
- env .vs_incs = []
1060
- env .vs_srcs = []
1061
-
1062
1058
if env ["compiledb" ]:
1063
1059
if env .scons_version < (4 , 0 , 0 ):
1064
1060
# Generating the compilation DB (`compile_commands.json`) requires SCons 4.0.0 or later.
Original file line number Diff line number Diff line change @@ -593,23 +593,6 @@ def glob_recursive(pattern, node="."):
593
593
return results
594
594
595
595
596
- def add_to_vs_project (env , sources ):
597
- for x in sources :
598
- fname = env .File (x ).path if isinstance (x , str ) else env .File (x )[0 ].path
599
- pieces = fname .split ("." )
600
- if len (pieces ) > 0 :
601
- basename = pieces [0 ]
602
- basename = basename .replace ("\\ \\ " , "/" )
603
- if os .path .isfile (basename + ".h" ):
604
- env .vs_incs += [basename + ".h" ]
605
- elif os .path .isfile (basename + ".hpp" ):
606
- env .vs_incs += [basename + ".hpp" ]
607
- if os .path .isfile (basename + ".c" ):
608
- env .vs_srcs += [basename + ".c" ]
609
- elif os .path .isfile (basename + ".cpp" ):
610
- env .vs_srcs += [basename + ".cpp" ]
611
-
612
-
613
596
def precious_program (env , program , sources , ** args ):
614
597
program = env .ProgramOriginal (program , sources , ** args )
615
598
env .Precious (program )
@@ -1112,9 +1095,7 @@ def format_key_value(v):
1112
1095
import json
1113
1096
1114
1097
md5 = hashlib .md5 (
1115
- json .dumps (headers + headers_dirs + sources + sources_dirs + others + others_dirs , sort_keys = True ).encode (
1116
- "utf-8"
1117
- )
1098
+ json .dumps (sorted (headers + headers_dirs + sources + sources_dirs + others + others_dirs )).encode ("utf-8" )
1118
1099
).hexdigest ()
1119
1100
1120
1101
if os .path .exists (f"{ project_name } .vcxproj.filters" ):
Original file line number Diff line number Diff line change @@ -83,16 +83,6 @@ if env["windows_subsystem"] == "gui":
83
83
env_wrap .Depends (prog_wrap , prog )
84
84
sources += common_win_wrap + res_wrap_obj
85
85
86
- # Microsoft Visual Studio Project Generation
87
- if env ["vsproj" ]:
88
- env .vs_srcs += ["platform/windows/" + res_file ]
89
- env .vs_srcs += ["platform/windows/godot.natvis" ]
90
- for x in common_win :
91
- env .vs_srcs += ["platform/windows/" + str (x )]
92
- if env ["windows_subsystem" ] == "gui" :
93
- for x in common_win_wrap :
94
- env .vs_srcs += ["platform/windows/" + str (x )]
95
-
96
86
if env ["d3d12" ]:
97
87
dxc_target_aliases = {
98
88
"x86_32" : "x86" ,
You can’t perform that action at this time.
0 commit comments