diff options
| author | Thaddeus Crews <repiteo@outlook.com> | 2024-11-13 08:34:13 -0600 |
|---|---|---|
| committer | Thaddeus Crews <repiteo@outlook.com> | 2024-11-13 08:34:13 -0600 |
| commit | 49023c0f7dee952e4e8fab59950eac724bc916a5 (patch) | |
| tree | ecc3c24f927a985634fdeb069f8595520d6249da | |
| parent | 8fd98b69d242d0d269607642645cf073e70cfabe (diff) | |
| parent | 216488ad9b717268d3c9cda1e410637b49b1e4ba (diff) | |
| download | redot-engine-49023c0f7dee952e4e8fab59950eac724bc916a5.tar.gz | |
Merge pull request #99138 from dustdfg/remove_old_vs_proj_code
Delete old unused code for VS project generation
| -rw-r--r-- | SConstruct | 4 | ||||
| -rw-r--r-- | methods.py | 21 | ||||
| -rw-r--r-- | platform/windows/SCsub | 10 |
3 files changed, 1 insertions, 34 deletions
diff --git a/SConstruct b/SConstruct index 3a01a3f41e..2ab9c1b580 100644 --- a/SConstruct +++ b/SConstruct @@ -1055,10 +1055,6 @@ if scons_cache_path is not None: CacheDir(scons_cache_path) print("Scons cache enabled... (path: '" + scons_cache_path + "')") -if env["vsproj"]: - env.vs_incs = [] - env.vs_srcs = [] - if env["compiledb"]: env.Tool("compilation_db") env.Alias("compiledb", env.CompilationDatabase()) diff --git a/methods.py b/methods.py index 1fb6f367b0..d89185f585 100644 --- a/methods.py +++ b/methods.py @@ -592,23 +592,6 @@ def glob_recursive(pattern, node="."): 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): program = env.ProgramOriginal(program, sources, **args) env.Precious(program) @@ -1111,9 +1094,7 @@ def generate_vs_project(env, original_args, project_name="godot"): import json md5 = hashlib.md5( - json.dumps(headers + headers_dirs + sources + sources_dirs + others + others_dirs, sort_keys=True).encode( - "utf-8" - ) + json.dumps(sorted(headers + headers_dirs + sources + sources_dirs + others + others_dirs)).encode("utf-8") ).hexdigest() if os.path.exists(f"{project_name}.vcxproj.filters"): diff --git a/platform/windows/SCsub b/platform/windows/SCsub index eaa5ceff88..1ddefb9c33 100644 --- a/platform/windows/SCsub +++ b/platform/windows/SCsub @@ -83,16 +83,6 @@ if env["windows_subsystem"] == "gui": env_wrap.Depends(prog_wrap, prog) 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"]: dxc_target_aliases = { "x86_32": "x86", |