Merge pull request #99138 from dustdfg/remove_old_vs_proj_code
Delete old unused code for VS project generation
This commit is contained in:
commit
49023c0f7d
@ -1055,10 +1055,6 @@ if scons_cache_path is not None:
|
|||||||
CacheDir(scons_cache_path)
|
CacheDir(scons_cache_path)
|
||||||
print("Scons cache enabled... (path: '" + scons_cache_path + "')")
|
print("Scons cache enabled... (path: '" + scons_cache_path + "')")
|
||||||
|
|
||||||
if env["vsproj"]:
|
|
||||||
env.vs_incs = []
|
|
||||||
env.vs_srcs = []
|
|
||||||
|
|
||||||
if env["compiledb"]:
|
if env["compiledb"]:
|
||||||
env.Tool("compilation_db")
|
env.Tool("compilation_db")
|
||||||
env.Alias("compiledb", env.CompilationDatabase())
|
env.Alias("compiledb", env.CompilationDatabase())
|
||||||
|
21
methods.py
21
methods.py
@ -592,23 +592,6 @@ def glob_recursive(pattern, node="."):
|
|||||||
return results
|
return results
|
||||||
|
|
||||||
|
|
||||||
def add_to_vs_project(env, sources):
|
|
||||||
for x in sources:
|
|
||||||
fname = env.File(x).path if isinstance(x, str) else env.File(x)[0].path
|
|
||||||
pieces = fname.split(".")
|
|
||||||
if len(pieces) > 0:
|
|
||||||
basename = pieces[0]
|
|
||||||
basename = basename.replace("\\\\", "/")
|
|
||||||
if os.path.isfile(basename + ".h"):
|
|
||||||
env.vs_incs += [basename + ".h"]
|
|
||||||
elif os.path.isfile(basename + ".hpp"):
|
|
||||||
env.vs_incs += [basename + ".hpp"]
|
|
||||||
if os.path.isfile(basename + ".c"):
|
|
||||||
env.vs_srcs += [basename + ".c"]
|
|
||||||
elif os.path.isfile(basename + ".cpp"):
|
|
||||||
env.vs_srcs += [basename + ".cpp"]
|
|
||||||
|
|
||||||
|
|
||||||
def precious_program(env, program, sources, **args):
|
def precious_program(env, program, sources, **args):
|
||||||
program = env.ProgramOriginal(program, sources, **args)
|
program = env.ProgramOriginal(program, sources, **args)
|
||||||
env.Precious(program)
|
env.Precious(program)
|
||||||
@ -1111,9 +1094,7 @@ def generate_vs_project(env, original_args, project_name="godot"):
|
|||||||
import json
|
import json
|
||||||
|
|
||||||
md5 = hashlib.md5(
|
md5 = hashlib.md5(
|
||||||
json.dumps(headers + headers_dirs + sources + sources_dirs + others + others_dirs, sort_keys=True).encode(
|
json.dumps(sorted(headers + headers_dirs + sources + sources_dirs + others + others_dirs)).encode("utf-8")
|
||||||
"utf-8"
|
|
||||||
)
|
|
||||||
).hexdigest()
|
).hexdigest()
|
||||||
|
|
||||||
if os.path.exists(f"{project_name}.vcxproj.filters"):
|
if os.path.exists(f"{project_name}.vcxproj.filters"):
|
||||||
|
@ -83,16 +83,6 @@ if env["windows_subsystem"] == "gui":
|
|||||||
env_wrap.Depends(prog_wrap, prog)
|
env_wrap.Depends(prog_wrap, prog)
|
||||||
sources += common_win_wrap + res_wrap_obj
|
sources += common_win_wrap + res_wrap_obj
|
||||||
|
|
||||||
# Microsoft Visual Studio Project Generation
|
|
||||||
if env["vsproj"]:
|
|
||||||
env.vs_srcs += ["platform/windows/" + res_file]
|
|
||||||
env.vs_srcs += ["platform/windows/godot.natvis"]
|
|
||||||
for x in common_win:
|
|
||||||
env.vs_srcs += ["platform/windows/" + str(x)]
|
|
||||||
if env["windows_subsystem"] == "gui":
|
|
||||||
for x in common_win_wrap:
|
|
||||||
env.vs_srcs += ["platform/windows/" + str(x)]
|
|
||||||
|
|
||||||
if env["d3d12"]:
|
if env["d3d12"]:
|
||||||
dxc_target_aliases = {
|
dxc_target_aliases = {
|
||||||
"x86_32": "x86",
|
"x86_32": "x86",
|
||||||
|
Loading…
x
Reference in New Issue
Block a user