diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2017-09-13 20:04:54 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-09-13 20:04:54 +0200 |
| commit | cc7c892bca3ed70d1ce41cb64e53a6e50da6d0be (patch) | |
| tree | 038b34f13dcc48376165cb8074a02dc482192f64 /SConstruct | |
| parent | 6ec93837067521dcf10493dcddd27d60a92376aa (diff) | |
| parent | e5f905a735866981c783c92c257bc104d395644b (diff) | |
| download | redot-engine-cc7c892bca3ed70d1ce41cb64e53a6e50da6d0be.tar.gz | |
Merge pull request #11160 from marcelofg55/drive_funcs_x11
Implemented DirAccess get_drive and get_drive_count for Linux
Diffstat (limited to 'SConstruct')
| -rw-r--r-- | SConstruct | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/SConstruct b/SConstruct index 0118563bc7..bc89aa7540 100644 --- a/SConstruct +++ b/SConstruct @@ -290,7 +290,9 @@ if selected_platform in platform_list: if (env["warnings"] == 'yes'): print("WARNING: warnings=yes is deprecated; assuming warnings=all") + env.msvc = 0 if (os.name == "nt" and os.getenv("VCINSTALLDIR") and (platform_arg == "windows" or platform_arg == "uwp")): # MSVC, needs to stand out of course + env.msvc = 1 disable_nonessential_warnings = ['/wd4267', '/wd4244', '/wd4305', '/wd4800'] # Truncations, narrowing conversions... if (env["warnings"] == 'extra'): env.Append(CCFLAGS=['/Wall']) # Implies /W4 @@ -423,6 +425,16 @@ if selected_platform in platform_list: if (env['vsproj']) == "yes": methods.generate_vs_project(env, GetOption("num_jobs")) + # Check for the existence of headers + conf = Configure(env) + if ("check_c_headers" in env): + for header in env["check_c_headers"]: + if (conf.CheckCHeader(header[0])): + if (env.msvc): + env.Append(CCFLAGS=['/D' + header[1]]) + else: + env.Append(CCFLAGS=['-D' + header[1]]) + else: print("No valid target platform selected.") |