Update VS project generation

[Listwon]

Update VS project generation and add num_jobs option (default value: 2 - the same as before) for parallel builds inside Visual Studio. Tested with SCons 3.0 and Visual Studio 2017.
[Edit]
SCons 3.0 is necessary to create proper vsproject for Visual Studio 2017 toolchain (earlier SCons version doesn't detect VS 2017 batch file).

[Zephilinox]

Aren't the parallel jobs broken with msvc? Something to do with race conditions.

[Listwon]

@Zephilinox I think it was, but now I'm building it on 4 cores (-j4) and it works flawlessly. Maybe it was the problem with older SCons? Also without my PR it generates project with -j2, so it is broken anyway if it really is.

[vexille]

I tested it out on my machine and for me it didn't really work using Scons 3.0.0. When trying to build from Visual Studio I got a "scons: *** No SConstruct file found" error.

Then I downgraded to Scons 2.5.1 as per the issue thread's recommendation and tried this branch again. This time the build actually started, but I'm getting some weird errors like "pow: ambiguous call to overloaded function" and "cast to type String () is not allowed".

Will keep testing.

[Listwon]

@vexille Thank you, it's really weird. You ran scons p=windows vsproj=yes first, right?

[vexille]

@Listwon yes. Actually running scons with multiple jobs on the command line before generating the vsproject always results in some error, but just a clean scons p=windows vsproj=yes works.

Just to make sure I'm not misleading anything though, this whole thing on godot's master branch doesn't work for me either, multithreaded or not.

And actually I went back to the issue page and the SCons version mentioned is the 2.4.1. I'll try that out in the master branch and in your branch and report back.

[Listwon]

@vexille AFAIK unfortunately the first run must be single threaded. I wonder if there is any workaround to apply in SConstruct. I'm also trying to fix the intellisense now (I know what and why is broken, but the problem is how to change it and not break the build ;) ).

[vexille]

@Listwon well it's not so bad if all the rest works fine, about the first single threaded run.

The intellisense thing for me is solved by adding the directories by hand in the includes section for the project, is that the direction you're going?

[Listwon]

@vexille Yeah, exactly! The problem is that it autogenerates directories from CPPPATH, which contains SCons specific '#' symbol. It should be ommited or changed to $(ProjectDir)\, but it's not that easy.

[Listwon]

@vexille I did it! I've just fixed the Intellisense 😍 Please check this.

[vexille]

Yep, it works, intellisense is working fine!

As for the actual build though, no such luck. But I'm getting the same problem on master, so it's nothing to do with your changes. Sorry I can't help you more with that :(

By the way, for what it's worth, I managed to do the first run of the scons call with -j6 without any problems. But I did downgrade to Scons 2.4.1, so maybe that's the magic version :P

[Listwon]

@vexille Thanks for your help :) I based my changes on master. I wonder what causes the problem. I'm so glad that Intellisense is working as intended now :)

[vexille]

For the record, I finally got everything to build! I had to change a couple of lines to add a float cast:

// script_debugger_remote.cpp
packet_peer_stream->set_input_buffer_max_size(pow((float) 2, (float) 20));

// script_editor_debugger.cpp
ppeer->set_input_buffer_max_size(pow((float)2, (float)20));

But actually those files are pretty different in master, so I guess they got changed quite a bit in branch 2.1 already. Anyway, I'll do a clean checkout of 2.1 and test it out, if I can solve the problem the same way, I'll open a PR of my own, I guess.

[Listwon]

Tested with SCons 2.5.1 - works. The caveat is it detects VS 2015 batch file (to append in build paths for NMake inside vsproject), not VS 2017. For VS 2017 toolchain SCons 3.0 is necessary.

[Grass-H0PEr]

@vexille
regarding

"scons: *** No SConstruct file found" error.

I had this happen too.

SCons 3.0.0
Python 2.7.14
VS Community 2017
Windows 7

VS 2017 -> Project Properties -> NMake -> Build Command Line :
$(ProjectDir)build.bat "$(VCInstallDir)\Auxiliary\Build\vcvars32.bat"

This build.bat script wasn't working :

set vc_path=%1

call %vc_path% & scons platform=windows

So. SCons was starting, but not seeing the SConstruct file.

Ran vcvars32.bat from Windows Command Prompt.
Found that after the command, my prompt was in a different directory.

So amending my build.bat script
fixed the error :

set vc_path=%1

set godot_path=%cd%

call %vc_path% && cd %godot_path% && scons platform=windows

Then VS 2017 could build Godot fine.

How it works :
Stores the build.bat folder location before it's changed,
then returns before calling scons.

Note : vcvars32.bat and vcvars64.bat are wrappers
for calling vcvarsall.bat with argument x86 or x64 respectively.

[Listwon]

@Grass-H0PEr Yeah, this is one of the possible solutions. In this PR I fixed it by passing source directory as an argument to scons:
scons --directory=$(ProjectDir)

[akien-mga]

That's a misleading option, as it's used only for vsproj. What it advertises is what the actual -j option does. Something like vsproj_jobs included below vsproj would be clearer.

[Listwon]

Roger, I will fix it.

[akien-mga]

That sounds like overkill and will make the command line length explode no?

[Listwon]

@akien-mga It was taken directly from master branch and it works. Maybe it needs optimisation.

[Listwon]

@akien-mga Sorry, it's not even usable on 2.1 branch. On master branch there is one SCsub with that. I removed this chunk.