浏览代码

[ERM] exclude black template magick from PCH.
this fixes build with PCH enabled

alexvins 13 年之前
父节点
当前提交
00e7a913a1
共有 4 个文件被更改,包括 15 次插入14 次删除
  1. 1 0
      Scripting/ERM/ERM.cbp
  2. 0 1
      Scripting/ERM/ERMParser.cpp
  3. 14 0
      Scripting/ERM/ERMParser.h
  4. 0 13
      Scripting/ERM/StdInc.h

+ 1 - 0
Scripting/ERM/ERM.cbp

@@ -64,6 +64,7 @@
 		<Unit filename="ERMScriptModule.cpp" />
 		<Unit filename="ERMScriptModule.h" />
 		<Unit filename="StdInc.h">
+			<Option compile="1" />
 			<Option weight="0" />
 		</Unit>
 		<Extensions>

+ 0 - 1
Scripting/ERM/ERMParser.cpp

@@ -1,7 +1,6 @@
 #include "StdInc.h"
 #include "ERMParser.h"
 
-
 //To make compilation with older boost versions possible
 //Don't know exact version - 1.46 works while 1.42 not
 #if BOOST_VERSION >= 104600

+ 14 - 0
Scripting/ERM/ERMParser.h

@@ -1,6 +1,20 @@
 #pragma once
 
 
+#include <boost/spirit/home/support/unused.hpp>
+#include <boost/spirit/include/qi.hpp>
+#include <boost/spirit/include/phoenix_core.hpp>
+#include <boost/spirit/include/phoenix_operator.hpp>
+#include <boost/spirit/include/phoenix_fusion.hpp>
+#include <boost/spirit/include/phoenix_stl.hpp>
+#include <boost/spirit/include/phoenix_object.hpp>
+#include <boost/fusion/include/adapt_struct.hpp>
+
+namespace spirit = boost::spirit;
+namespace qi = boost::spirit::qi;
+namespace ascii = spirit::ascii;
+namespace phoenix = boost::phoenix;
+
 /*
  * ERMParser.h, part of VCMI engine
  *

+ 0 - 13
Scripting/ERM/StdInc.h

@@ -6,18 +6,5 @@
 
 // Here you can add specific libraries and macros which are specific to this project.
 #include <boost/variant.hpp>
-#include <boost/version.hpp>
-#include <boost/spirit/home/support/unused.hpp>
-#include <boost/spirit/include/qi.hpp>
-#include <boost/spirit/include/phoenix_core.hpp>
-#include <boost/spirit/include/phoenix_operator.hpp>
-#include <boost/spirit/include/phoenix_fusion.hpp>
-#include <boost/spirit/include/phoenix_stl.hpp>
-#include <boost/spirit/include/phoenix_object.hpp>
-#include <boost/fusion/include/adapt_struct.hpp>
 #include <boost/optional.hpp>
 
-namespace spirit = boost::spirit;
-namespace qi = boost::spirit::qi;
-namespace ascii = spirit::ascii;
-namespace phoenix = boost::phoenix;