Merge branch 'master' of github.com:wesnoth/wesnoth

wesnoth · Jun 10, 2016 · 50e8fcd · 50e8fcd
2 parents 75e2608 + d625798
commit 50e8fcd
Show file tree

Hide file tree

Showing 11 changed files with 29 additions and 4 deletions.
diff --git a/data/campaigns/Legend_of_Wesmere/scenarios/chapter1/01_The_Uprooting.cfg b/data/campaigns/Legend_of_Wesmere/scenarios/chapter1/01_The_Uprooting.cfg
@@ -139,6 +139,7 @@ This is the story of Kalenz, Landar, and of the Elves in the first days of the h
     #### /Kalenz side ####
 
     #### Landar's side ####
+    # wmllint: skip-side
     {MP_SIDE 2 (
         {PLAYABLE}
         {LANDAR_YOUNG}

diff --git a/data/campaigns/Legend_of_Wesmere/scenarios/chapter1/02_Hostile_Mountains.cfg b/data/campaigns/Legend_of_Wesmere/scenarios/chapter1/02_Hostile_Mountains.cfg
@@ -70,6 +70,7 @@
     [/event]
     ### /Kalenz's code ###
 
+    # wmllint: skip-side
     {MP_SIDE 2 (
         x=20
         y=4

diff --git a/data/campaigns/Legend_of_Wesmere/scenarios/chapter1/03_Kalian_under_Attack.cfg b/data/campaigns/Legend_of_Wesmere/scenarios/chapter1/03_Kalian_under_Attack.cfg
@@ -80,6 +80,7 @@
         {PLAYER_GOLD}
     [/side]
 
+    # wmllint: skip-side
     {MP_SIDE 2 (
         no_leader=yes
         {PLAYABLE}
@@ -136,6 +137,7 @@
         # wmllint: recognize Galtrid
     [/side]
 
+    # wmllint: skip-side
     {MP_SIDE 4 (
         no_leader=yes
         previous_save_id=Landar

diff --git a/data/campaigns/Legend_of_Wesmere/scenarios/chapter2/04_The_Elvish_Treasury.cfg b/data/campaigns/Legend_of_Wesmere/scenarios/chapter2/04_The_Elvish_Treasury.cfg
@@ -76,13 +76,15 @@ Chapter Two"
 
     #Landar's side
 
+    # wmllint: skip-side
     {MP_SIDE 2 (
         {LANDAR}
         save_id=Landar
         {PLAYABLE}
         {PLAYER_GOLD}
     )}
 
+    # wmllint: skip-side
     {MP_SIDE 3 (
         no_leader=yes
         save_id=Cleodil

diff --git a/data/campaigns/Legend_of_Wesmere/scenarios/chapter2/05_The_Saurian_Treasury.cfg b/data/campaigns/Legend_of_Wesmere/scenarios/chapter2/05_The_Saurian_Treasury.cfg
@@ -86,6 +86,7 @@
 #endif
     [/side]
 
+    # wmllint: skip-side
     {MP_SIDE 2 (
         no_leader=yes
         {PLAYABLE}
@@ -98,6 +99,7 @@
         [/unit]
     )}
 
+    # wmllint: skip-side
     {MP_SIDE 3 (
         no_leader=yes
         {PLAYABLE}

diff --git a/data/campaigns/Legend_of_Wesmere/scenarios/chapter2/06_Acquaintance_in_Need.cfg b/data/campaigns/Legend_of_Wesmere/scenarios/chapter2/06_Acquaintance_in_Need.cfg
@@ -70,6 +70,7 @@
         {RECALL_LOYALS}
     [/event]
 
+    # wmllint: skip-side
     {MP_SIDE 2 (
         {PLAYABLE}
         save_id=Landar
@@ -81,6 +82,7 @@
         [/unit]
     )}
 
+    # wmllint: skip-side
     {MP_SIDE 3 (
         {PLAYABLE}
         save_id=Cleodil

diff --git a/data/campaigns/Legend_of_Wesmere/scenarios/chapter2/07_Elves_Last_Stand.cfg b/data/campaigns/Legend_of_Wesmere/scenarios/chapter2/07_Elves_Last_Stand.cfg
@@ -101,6 +101,7 @@
         {RECALL_LOYALS}
     [/event]
 
+    # wmllint: skip-side
     {MP_SIDE 2 (
         no_leader=yes
         {PLAYABLE}
@@ -114,6 +115,7 @@
         [/unit]
     )}
 
+    # wmllint: skip-side
     {MP_SIDE 3 (
         no_leader=yes
         {PLAYABLE}
@@ -163,6 +165,7 @@
 #endif
     [/side]
 
+    # wmllint: skip-side
     {MP_SIDE 5 (
         {PLAYABLE}
         {EL_ISOMITHIR}
@@ -173,6 +176,7 @@
         {GOLD 133 100 65}
     )}
 
+    # wmllint: skip-side
     {MP_SIDE 6 (
         {PLAYABLE}
         {ERADION}

diff --git a/data/campaigns/Legend_of_Wesmere/scenarios/chapter3/09_Bounty_Hunters.cfg b/data/campaigns/Legend_of_Wesmere/scenarios/chapter3/09_Bounty_Hunters.cfg
@@ -80,6 +80,7 @@ Chapter Three"
     [/side]
 
     #Landar's side
+    # wmllint: skip-side
     {MP_SIDE 2 (
         {PLAYABLE}
         save_id=Landar
@@ -93,6 +94,7 @@ Chapter Three"
     )}
 
     #Olurf's side
+    # wmllint: skip-side
     {MP_SIDE 3 (
         {PLAYABLE}
         save_id=Olurf
@@ -108,6 +110,7 @@ Chapter Three"
     )}
 
     #Cleodil's side
+    # wmllint: skip-side
     {MP_SIDE 4 (
         {PLAYABLE}
         save_id=Cleodil

diff --git a/data/campaigns/Legend_of_Wesmere/scenarios/chapter3/10_Cliffs_of_Thoria.cfg b/data/campaigns/Legend_of_Wesmere/scenarios/chapter3/10_Cliffs_of_Thoria.cfg
@@ -69,6 +69,7 @@
 #endif
     [/side]
 
+    # wmllint: skip-side
     {MP_SIDE 2 (
         no_leader=yes
         {MULTIPLAYER_GOLD}
@@ -80,6 +81,7 @@
         [/unit]
     )}
 
+    # wmllint: skip-side
     {MP_SIDE 3 (
         no_leader=yes
         {MULTIPLAYER_GOLD}
@@ -91,6 +93,7 @@
         [/unit]
     )}
 
+    # wmllint: skip-side
     {MP_SIDE 4 (
         no_leader=yes
         {MULTIPLAYER_GOLD}

diff --git a/data/campaigns/Legend_of_Wesmere/scenarios/chapter3/11_Battle_of_the_Book.cfg b/data/campaigns/Legend_of_Wesmere/scenarios/chapter3/11_Battle_of_the_Book.cfg
@@ -72,6 +72,7 @@
 #endif
     [/side]
 
+    # wmllint: skip-side
     {MP_SIDE 2 (
         {PLAYABLE}
         save_id=Landar
@@ -82,6 +83,7 @@
         [/unit]
     )}
 
+    # wmllint: skip-side
     {MP_SIDE 3 (
         {PLAYABLE}
         save_id=Olurf
@@ -92,6 +94,7 @@
         [/unit]
     )}
 
+    # wmllint: skip-side
     {MP_SIDE 4 (
         {PLAYABLE}
         save_id=Cleodil

diff --git a/scons/boost.py b/scons/boost.py
@@ -1,6 +1,7 @@
 # vi: syntax=python:et:ts=4
 from config_check_utils import find_include
 from os.path import join, dirname, basename
+import sys, os.path
 from glob import glob
 import re
 
@@ -69,10 +70,11 @@ def CheckBoost(context, boost_lib, require_version = None, header_only = False):
     header_name = boost_headers.get(boost_lib, boost_lib + ".hpp")
     libname = "boost_" + boost_lib + env.get("boost_suffix", "")
 
-    if env["fast"]:
-        env.AppendUnique(CXXFLAGS = ["-isystem", boostdir], LIBPATH = [boostlibdir])
-    else:
-        env.AppendUnique(CPPPATH = [boostdir], LIBPATH = [boostlibdir])
+    if sys.platform != "win32" and not os.path.samefile(boostdir, "/usr/include"):
+        if env["fast"]:
+            env.AppendUnique(CXXFLAGS = ["-isystem", boostdir], LIBPATH = [boostlibdir])
+        else:
+            env.AppendUnique(CPPPATH = [boostdir], LIBPATH = [boostlibdir])
     if not header_only:
         env.AppendUnique(LIBS = [libname])
     if boost_lib == "thread" and env["PLATFORM"] == "posix":