Generate project files for VS2017 #10727
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
This looks fine, but I wonder if we could move this logic out of SConstruct and put it instead in |
hoelzl
force-pushed
the
vs2017
branch
2 times, most recently
from
7ee3a66
to
0d327df
Compare
|
No problem, pushed an updated version. |
|
Actually I was thinking more to move everything after |
|
Ah, I see. I didn't want to change too much of the existing build file but I can try to see how it would work out. |
hoelzl
force-pushed
the
vs2017
branch
3 times, most recently
from
515ca16
to
c0f20d4
Compare
|
OK, everything (except for an old comment) is in |
akien-mga
reviewed
Aug 29, 2017
SConstruct
Outdated
| AddToVSProject(env.scene_sources) | ||
| AddToVSProject(env.servers_sources) | ||
| AddToVSProject(env.editor_sources) | ||
|
|
||
| # this env flag won't work, it needs to be set in env_base=Environment(MSVC_VERSION='9.0') |
hoelzl
force-pushed
the
vs2017
branch
2 times, most recently
from
530fccf
to
db0e9c6
Compare
|
Removed the comment, as requested in the review. |
akien-mga
approved these changes
Aug 29, 2017
hoelzl
added a commit
to hoelzl/godot
that referenced
this pull request
Oct 24, 2017
- Cherry picked godotengine#10662 and fixed merge conflicts. - Manualy merged the change from godotengine#11904. - Did not merge godotengine#12236 since I'm not sure whether the issue affects Godot 2.1 and I don't have VS2013 to test. - Did not merge godotengine#11843 since it doesn't seem relevant (the code is only needed for creating DONORS.md, etc.). - Did not merge godotengine#10727 and godotengine#11752 since they seem to be already included in godotengine#11742. - The Windows and Linux builds have been tested with Scons 3.0 using Python 3. - OSX and iOS should hopefully work but are not tested since I don't have a Mac. - Builds using SCons 2.5 and Python 2 should not be impacted.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This patch generates VS project files for the default version of Visual Studio that is installed on the build machine. It uses SCons functions to determine what the default version of VS/VC is. This means that SCons 2.5.* will not detect a VS2017 installation and fall back to VS2015. SCons 3.0 alpha generates projects for VS2017 if it is installed. (More precisely, if VS2017 is installed in such a way that it is recognized as the default, which should typically be the case even if both VS2015 and VS2017 are available).
Whereas previously the value of the
-jflag was hardcoded to 2, the VS build now uses the same number of threads as the SCons run that generated the solution files.Another change to the previous behavior is that the path to the batch file that sets up the VS environment is now generated when the
SConstructfile is run; previously it queried the value of the environment variableVCInstallDirwhen building Godot. I don't think this change matters, but it might impact people who have strange VS2015 setups.I've also refactored the code a bit to avoid the extremely long and repetitive strings in the source and fixed (what I believe was) a minor bug: one of the command lines used
&instead of^&in one place, and I could see no real reason for this difference.