Browse Source

[c::b] update projects
-boost::iostreams
*link with release boost libs always

alexvins 13 years ago
parent
commit
2942e2e824
7 changed files with 20 additions and 47 deletions
  1. 2 4
      AI/BattleAI/BattleAI.cbp
  2. 2 4
      AI/EmptyAI/EmptyAI.cbp
  3. 2 4
      AI/StupidAI/StupidAI.cbp
  4. 4 8
      AI/VCAI/VCAI.cbp
  5. 0 1
      VCMI_client.cbp
  6. 4 12
      VCMI_lib.cbp
  7. 6 14
      VCMI_server.cbp

+ 2 - 4
AI/BattleAI/BattleAI.cbp

@@ -15,8 +15,6 @@
 					<Add option="-g" />
 				</Compiler>
 				<Linker>
-					<Add option="-lboost_system-mgw47-mt-d-1_51" />
-					<Add option="-lVCMI_lib" />
 					<Add directory="..\..\bin\Debug" />
 				</Linker>
 			</Target>
@@ -30,8 +28,6 @@
 				</Compiler>
 				<Linker>
 					<Add option="-s" />
-					<Add option="-lboost_system-mgw47-mt-1_51" />
-					<Add option="-lVCMI_lib" />
 					<Add directory="..\..\bin\Release" />
 				</Linker>
 			</Target>
@@ -50,6 +46,8 @@
 			<Add directory="..\..\include" />
 		</Compiler>
 		<Linker>
+			<Add option="-lboost_system-mgw47-mt-1_51" />
+			<Add option="-lVCMI_lib" />
 			<Add directory="$(#boost.lib)" />
 		</Linker>
 		<Unit filename="BattleAI.cpp" />

+ 2 - 4
AI/EmptyAI/EmptyAI.cbp

@@ -15,8 +15,6 @@
 					<Add option="-ggdb" />
 				</Compiler>
 				<Linker>
-					<Add option="-lboost_system-mgw47-mt-d-1_51" />
-					<Add option="-lVCMI_lib" />
 					<Add directory="..\..\bin\Debug" />
 				</Linker>
 			</Target>
@@ -31,8 +29,6 @@
 				</Compiler>
 				<Linker>
 					<Add option="-s" />
-					<Add option="-lboost_system-mgw47-mt-1_51" />
-					<Add option="-lVCMI_lib" />
 					<Add directory="..\..\bin\Release" />
 				</Linker>
 			</Target>
@@ -51,6 +47,8 @@
 			<Add directory="..\..\include" />
 		</Compiler>
 		<Linker>
+			<Add option="-lboost_system-mgw47-mt-1_51" />
+			<Add option="-lVCMI_lib" />
 			<Add directory="$(#boost.lib)" />
 		</Linker>
 		<Unit filename="CEmptyAI.cpp" />

+ 2 - 4
AI/StupidAI/StupidAI.cbp

@@ -15,8 +15,6 @@
 					<Add option="-ggdb" />
 				</Compiler>
 				<Linker>
-					<Add option="-lboost_system-mgw47-mt-d-1_51" />
-					<Add option="-lVCMI_lib" />
 					<Add directory="..\..\bin\Debug" />
 				</Linker>
 			</Target>
@@ -31,8 +29,6 @@
 				</Compiler>
 				<Linker>
 					<Add option="-s" />
-					<Add option="-lboost_system-mgw47-mt-1_51" />
-					<Add option="-lVCMI_lib" />
 					<Add directory="..\..\bin\Release" />
 				</Linker>
 			</Target>
@@ -53,6 +49,8 @@
 			<Add directory="..\..\include" />
 		</Compiler>
 		<Linker>
+			<Add option="-lboost_system-mgw47-mt-1_51" />
+			<Add option="-lVCMI_lib" />
 			<Add directory="$(#boost.lib)" />
 		</Linker>
 		<Unit filename="StdInc.h">

+ 4 - 8
AI/VCAI/VCAI.cbp

@@ -15,10 +15,6 @@
 					<Add option="-g" />
 				</Compiler>
 				<Linker>
-					<Add option="-lboost_system-mgw47-mt-d-1_51" />
-					<Add option="-lboost_thread-mgw47-mt-d-1_51" />
-					<Add option="-lboost_chrono-mgw47-mt-d-1_51" />
-					<Add option="-lVCMI_lib" />
 					<Add directory="..\..\bin\Debug" />
 					<Add directory="..\FuzzyLite\bin\Debug" />
 				</Linker>
@@ -34,10 +30,6 @@
 				</Compiler>
 				<Linker>
 					<Add option="-s" />
-					<Add option="-lboost_system-mgw47-mt-1_51" />
-					<Add option="-lboost_thread-mgw47-mt-1_51" />
-					<Add option="-lboost_chrono-mgw47-mt-1_51" />
-					<Add option="-lVCMI_lib" />
 					<Add directory="..\..\bin\Release" />
 					<Add directory="..\FuzzyLite\bin\Release" />
 				</Linker>
@@ -60,6 +52,10 @@
 		</Compiler>
 		<Linker>
 			<Add option="-lFuzzyLite" />
+			<Add option="-lboost_system-mgw47-mt-1_51" />
+			<Add option="-lboost_thread-mgw47-mt-1_51" />
+			<Add option="-lboost_chrono-mgw47-mt-1_51" />
+			<Add option="-lVCMI_lib" />
 			<Add directory="$(#boost.lib)" />
 		</Linker>
 		<Unit filename="Fuzzy.cpp" />

+ 0 - 1
VCMI_client.cbp

@@ -59,7 +59,6 @@
 			<Add option="-lboost_filesystem-mgw47-mt-1_51" />
 			<Add option="-lboost_system-mgw47-mt-1_51" />
 			<Add option="-lboost_thread-mgw47-mt-1_51" />
-			<Add option="-lboost_iostreams-mgw47-mt-1_51" />
 			<Add option="-lboost_chrono-mgw47-mt-1_51" />
 			<Add option="-lSDL" />
 			<Add option="-lSDL_image" />

+ 4 - 12
VCMI_lib.cbp

@@ -18,13 +18,6 @@
 					<Add option="-O1" />
 					<Add option="-O" />
 				</Compiler>
-				<Linker>
-					<Add option="-lboost_filesystem-mgw47-mt-d-1_51" />
-					<Add option="-lboost_system-mgw47-mt-d-1_51" />
-					<Add option="-lboost_thread-mgw47-mt-d-1_51" />
-					<Add option="-lboost_iostreams-mgw47-mt-d-1_51" />
-					<Add option="-lboost_chrono-mgw47-mt-d-1_51" />
-				</Linker>
 			</Target>
 			<Target title="Release">
 				<Option platforms="Windows;" />
@@ -39,11 +32,6 @@
 				</Compiler>
 				<Linker>
 					<Add option="-s" />
-					<Add option="-lboost_filesystem-mgw47-mt-1_51" />
-					<Add option="-lboost_system-mgw47-mt-1_51" />
-					<Add option="-lboost_thread-mgw47-mt-1_51" />
-					<Add option="-lboost_iostreams-mgw47-mt-1_51" />
-					<Add option="-lboost_chrono-mgw47-mt-1_51" />
 				</Linker>
 			</Target>
 		</Build>
@@ -68,6 +56,10 @@
 		<Linker>
 			<Add option="-lws2_32" />
 			<Add option="-lzlib" />
+			<Add option="-lboost_filesystem-mgw47-mt-1_51" />
+			<Add option="-lboost_system-mgw47-mt-1_51" />
+			<Add option="-lboost_thread-mgw47-mt-1_51" />
+			<Add option="-lboost_chrono-mgw47-mt-1_51" />
 			<Add directory="$(#boost.lib)" />
 			<Add directory="$(#sdl.lib)" />
 		</Linker>

+ 6 - 14
VCMI_server.cbp

@@ -16,13 +16,6 @@
 					<Add option="-ggdb" />
 				</Compiler>
 				<Linker>
-					<Add option="-lboost_program_options-mgw47-mt-d-1_51" />
-					<Add option="-lboost_filesystem-mgw47-mt-d-1_51" />
-					<Add option="-lboost_system-mgw47-mt-d-1_51" />
-					<Add option="-lboost_thread-mgw47-mt-d-1_51" />
-					<Add option="-lboost_iostreams-mgw47-mt-d-1_51" />
-					<Add option="-lboost_chrono-mgw47-mt-d-1_51" />
-					<Add option="-lVCMI_lib" />
 					<Add directory="bin\Debug" />
 				</Linker>
 			</Target>
@@ -37,13 +30,6 @@
 				</Compiler>
 				<Linker>
 					<Add option="-s" />
-					<Add option="-lboost_program_options-mgw47-mt-1_51" />
-					<Add option="-lboost_filesystem-mgw47-mt-1_51" />
-					<Add option="-lboost_system-mgw47-mt-1_51" />
-					<Add option="-lboost_thread-mgw47-mt-1_51" />
-					<Add option="-lboost_iostreams-mgw47-mt-1_51" />
-					<Add option="-lboost_chrono-mgw47-mt-1_51" />
-					<Add option="-lVCMI_lib" />
 					<Add directory="bin\Release" />
 				</Linker>
 			</Target>
@@ -69,6 +55,12 @@
 			<Add option="-loleaut32" />
 			<Add option="-lws2_32" />
 			<Add option="-lmswsock" />
+			<Add option="-lboost_program_options-mgw47-mt-1_51" />
+			<Add option="-lboost_filesystem-mgw47-mt-1_51" />
+			<Add option="-lboost_system-mgw47-mt-1_51" />
+			<Add option="-lboost_thread-mgw47-mt-1_51" />
+			<Add option="-lboost_chrono-mgw47-mt-1_51" />
+			<Add option="-lVCMI_lib" />
 			<Add directory="$(#boost.lib)" />
 		</Linker>
 		<Unit filename="server\CGameHandler.cpp" />