Freeciv

I have split out the 3.1 version. It is much easier to review two patches that each are size x/2 than one patch size x, given that one patch is one logical change. Please read it yourself to see if you find more issues now that it is shorter.

• "IPv6 is not supported in Emscripten" printed when the server is requested to be built
• FC_LD_FLAGS([""], [], [LDFLAGS]) - overwrites for all kinds of builds
• not sure if this is an issue with the patch, with emscripten or expected and normal: a.out, a.out.js and a.out.wasm appears at the top in the build dir. Do you know why this happens?

3.0 version split out. Why are the changes to dependencies/tolua-5.2/src/Makefile.am needed in 3.0?

3.0 version split out.

for real this time

Zoltán Žarkov wrote:

Do you need help on this to get it ready to commit?

Yes. Sorry if I gave the wrong impression. Assigning to you.

I believe there has been a misunderstanding. I was only planning to review this. I split it because I wanted a smaller, self contained part to make it easier for me to review it.

The self contained part I aim at is "can compile at least /common/". Building libfreeciv or something like it (Feature #847678) is not required here.

You can add that to CXXFLAGS here, but I did not put them in the original patch because the SDL2 client does not build any C++.

The setting of the CXXFLAGS fragment it modifies comes from Feature #838867. I probably included to much of Feature #838867 when I split this out. You are the expert here. If other parts of the patch fragment is needed (or recommended) to properly compile /common/ my suggestion is that the patch fragment stays but that the -O3 change is added already here.

The tolua Makefile.am changes reflect not building the tolua binary.

Doesn't

if test "x$cross_compiling" = "xyes" || test "x$emscripten" = "xyes"; then
sys_tolua_cmd=true

handle that?

To me this patch seems to be rather dirty. It might be good for local use (so you got the emscripten client already to use), but it's not ready to go in mainline. I may split this even further, to reconstruct it piece by piece. Also, I'm happy if we find time to do this for 3.1, I don't plan to port the patches to S3_0 (but we can of course reconsider that once we have working system ready).