diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2018-01-19 08:28:38 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-19 08:28:38 +0100 |
| commit | 0a469fc8ce67074296676c4d016cb68d46febb00 (patch) | |
| tree | db5520391e8e17c5a0dbdf6e91c0bf8a7a055348 | |
| parent | 1f1a38b5ec4a8160079d288d9ce65325d39b5bdb (diff) | |
| parent | a025ca5fc66ad897ac7a8ac9db1f79cb51026ebc (diff) | |
Merge pull request #15858 from willnationsdev/vs-hpp-support
Allow VS to include .hpp files in scons builds
| -rw-r--r-- | SConstruct | 2 | ||||
| -rw-r--r-- | methods.py | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/SConstruct b/SConstruct index 987fd561b3..f71c6a397c 100644 --- a/SConstruct +++ b/SConstruct @@ -290,6 +290,8 @@ if selected_platform in platform_list: basename = basename.replace('\\\\', '/') if os.path.isfile(basename + ".h"): env.vs_incs = env.vs_incs + [basename + ".h"] + elif os.path.isfile(basename + ".hpp"): + env.vs_incs = env.vs_incs + [basename + ".hpp"] if os.path.isfile(basename + ".c"): env.vs_srcs = env.vs_srcs + [basename + ".c"] elif os.path.isfile(basename + ".cpp"): diff --git a/methods.py b/methods.py index 892fa8cfc3..a8f1fb8a5d 100644 --- a/methods.py +++ b/methods.py @@ -1598,7 +1598,7 @@ def detect_visual_c_compiler_version(tools_env): # and not scons setup environment (env)... so make sure you call the right environment on it or it will fail to detect # the proper vc version that will be called - # These is no flag to give to visual c compilers to set the architecture, ie scons bits argument (32,64,ARM etc) + # There is no flag to give to visual c compilers to set the architecture, ie scons bits argument (32,64,ARM etc) # There are many different cl.exe files that are run, and each one compiles & links to a different architecture # As far as I know, the only way to figure out what compiler will be run when Scons calls cl.exe via Program() # is to check the PATH variable and figure out which one will be called first. Code bellow does that and returns: |