godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Include .hpp files in VS scons builds. Fixed Typo.

This commit is contained in:
Will Nations 2018-01-18 21:13:48 -06:00
parent 9d98e6d2e4
commit a025ca5fc6
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
SConstruct
View File

@ -290,6 +290,8 @@ if selected_platform in platform_list:
basename = basename.replace('\\\\', '/') basename = basename.replace('\\\\', '/')
if os.path.isfile(basename + ".h"): if os.path.isfile(basename + ".h"):
env.vs_incs = env.vs_incs + [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"): if os.path.isfile(basename + ".c"):
env.vs_srcs = env.vs_srcs + [basename + ".c"] env.vs_srcs = env.vs_srcs + [basename + ".c"]
elif os.path.isfile(basename + ".cpp"): elif os.path.isfile(basename + ".cpp"):

2
methods.py
View File

@ -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 # 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 # 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 # 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() # 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: # is to check the PATH variable and figure out which one will be called first. Code bellow does that and returns: