2
0
AlexVinS 11 жил өмнө
parent
commit
bbd0312b45

+ 4 - 2
AI/BattleAI/BattleAI.cbp

@@ -6,7 +6,8 @@
 		<Option pch_mode="2" />
 		<Option compiler="gcc" />
 		<Build>
-			<Target title="Debug">
+			<Target title="Debug-win32-SDL2">
+				<Option platforms="Windows;" />
 				<Option output="../BattleAI" imp_lib="$(TARGET_OUTPUT_DIR)$(TARGET_OUTPUT_BASENAME).a" def_file="$(TARGET_OUTPUT_DIR)$(TARGET_OUTPUT_BASENAME).def" prefix_auto="1" extension_auto="1" />
 				<Option object_output="obj/Debug/" />
 				<Option type="3" />
@@ -15,7 +16,8 @@
 					<Add option="-g" />
 				</Compiler>
 			</Target>
-			<Target title="Release">
+			<Target title="Release-win32-SDL2">
+				<Option platforms="Windows;" />
 				<Option output="../BattleAI" imp_lib="$(TARGET_OUTPUT_DIR)$(TARGET_OUTPUT_BASENAME).a" def_file="$(TARGET_OUTPUT_DIR)$(TARGET_OUTPUT_BASENAME).def" prefix_auto="1" extension_auto="1" />
 				<Option object_output="obj/Release/" />
 				<Option type="3" />

+ 4 - 2
AI/EmptyAI/EmptyAI.cbp

@@ -6,7 +6,8 @@
 		<Option pch_mode="2" />
 		<Option compiler="gcc" />
 		<Build>
-			<Target title="Debug">
+			<Target title="Debug-win32-SDL2">
+				<Option platforms="Windows;" />
 				<Option output="../EmptyAI" imp_lib="$(TARGET_OUTPUT_DIR)$(TARGET_OUTPUT_BASENAME).a" def_file="$(TARGET_OUTPUT_DIR)$(TARGET_OUTPUT_BASENAME).def" prefix_auto="1" extension_auto="1" />
 				<Option object_output="obj/Debug/" />
 				<Option type="3" />
@@ -15,7 +16,8 @@
 					<Add option="-ggdb" />
 				</Compiler>
 			</Target>
-			<Target title="Release">
+			<Target title="Release-win32-SDL2">
+				<Option platforms="Windows;" />
 				<Option output="../EmptyAI" imp_lib="$(TARGET_OUTPUT_DIR)$(TARGET_OUTPUT_BASENAME).a" def_file="$(TARGET_OUTPUT_DIR)$(TARGET_OUTPUT_BASENAME).def" prefix_auto="1" extension_auto="1" />
 				<Option object_output="obj/Release/" />
 				<Option type="3" />

+ 132 - 130
AI/FuzzyLite/FuzzyLite.cbp

@@ -1,130 +1,132 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
-<CodeBlocks_project_file>
-	<FileVersion major="1" minor="6" />
-	<Project>
-		<Option title="FuzzyLite" />
-		<Option pch_mode="2" />
-		<Option compiler="gcc" />
-		<Build>
-			<Target title="Debug">
-				<Option output="bin\Debug\FuzzyLite" prefix_auto="1" extension_auto="1" />
-				<Option working_dir="" />
-				<Option object_output="obj\Debug\" />
-				<Option type="2" />
-				<Option compiler="gcc" />
-				<Option createDefFile="1" />
-				<Compiler>
-					<Add option="-g" />
-				</Compiler>
-			</Target>
-			<Target title="Release">
-				<Option output="bin\Release\FuzzyLite" prefix_auto="1" extension_auto="1" />
-				<Option working_dir="" />
-				<Option object_output="obj\Release\" />
-				<Option type="2" />
-				<Option compiler="gcc" />
-				<Option createDefFile="1" />
-				<Compiler>
-					<Add option="-fomit-frame-pointer" />
-					<Add option="-O2" />
-				</Compiler>
-				<Linker>
-					<Add option="-s" />
-				</Linker>
-			</Target>
-		</Build>
-		<Compiler>
-			<Add option="-Wextra" />
-			<Add option="-Wall" />
-			<Add option="-fexceptions" />
-			<Add option="-Wpointer-arith" />
-			<Add option="-Wno-switch" />
-			<Add option="-Wno-sign-compare" />
-			<Add option="-Wno-unused-parameter" />
-			<Add option="-Wno-overloaded-virtual" />
-		</Compiler>
-		<Unit filename="AreaCentroidAlgorithm.cpp" />
-		<Unit filename="AreaCentroidAlgorithm.h" />
-		<Unit filename="CompoundTerm.cpp" />
-		<Unit filename="CompoundTerm.h" />
-		<Unit filename="DescriptiveAntecedent.cpp" />
-		<Unit filename="DescriptiveAntecedent.h" />
-		<Unit filename="DiscreteTerm.cpp" />
-		<Unit filename="DiscreteTerm.h" />
-		<Unit filename="FunctionTerm.cpp" />
-		<Unit filename="FunctionTerm.h" />
-		<Unit filename="FuzzyAnd.cpp" />
-		<Unit filename="FuzzyAnd.h" />
-		<Unit filename="FuzzyAntecedent.cpp" />
-		<Unit filename="FuzzyAntecedent.h" />
-		<Unit filename="FuzzyConsequent.cpp" />
-		<Unit filename="FuzzyConsequent.h" />
-		<Unit filename="FuzzyDefuzzifier.cpp" />
-		<Unit filename="FuzzyDefuzzifier.h" />
-		<Unit filename="FuzzyEngine.cpp" />
-		<Unit filename="FuzzyEngine.h" />
-		<Unit filename="FuzzyException.cpp" />
-		<Unit filename="FuzzyException.h" />
-		<Unit filename="FuzzyExceptions.cpp" />
-		<Unit filename="FuzzyExceptions.h" />
-		<Unit filename="FuzzyLite.h" />
-		<Unit filename="FuzzyModulation.cpp" />
-		<Unit filename="FuzzyModulation.h" />
-		<Unit filename="FuzzyOperation.cpp" />
-		<Unit filename="FuzzyOperation.h" />
-		<Unit filename="FuzzyOperator.cpp" />
-		<Unit filename="FuzzyOperator.h" />
-		<Unit filename="FuzzyOr.cpp" />
-		<Unit filename="FuzzyOr.h" />
-		<Unit filename="FuzzyRule.cpp" />
-		<Unit filename="FuzzyRule.h" />
-		<Unit filename="Hedge.cpp" />
-		<Unit filename="Hedge.h" />
-		<Unit filename="HedgeSet.cpp" />
-		<Unit filename="HedgeSet.h" />
-		<Unit filename="InfixToPostfix.cpp" />
-		<Unit filename="InfixToPostfix.h" />
-		<Unit filename="InputLVar.cpp" />
-		<Unit filename="InputLVar.h" />
-		<Unit filename="LinguisticTerm.cpp" />
-		<Unit filename="LinguisticTerm.h" />
-		<Unit filename="LinguisticVariable.cpp" />
-		<Unit filename="LinguisticVariable.h" />
-		<Unit filename="MamdaniConsequent.cpp" />
-		<Unit filename="MamdaniConsequent.h" />
-		<Unit filename="MamdaniRule.cpp" />
-		<Unit filename="MamdaniRule.h" />
-		<Unit filename="OutputLVar.cpp" />
-		<Unit filename="OutputLVar.h" />
-		<Unit filename="RectangularTerm.cpp" />
-		<Unit filename="RectangularTerm.h" />
-		<Unit filename="RuleBlock.cpp" />
-		<Unit filename="RuleBlock.h" />
-		<Unit filename="ShoulderTerm.cpp" />
-		<Unit filename="ShoulderTerm.h" />
-		<Unit filename="SingletonTerm.cpp" />
-		<Unit filename="SingletonTerm.h" />
-		<Unit filename="StrOp.cpp" />
-		<Unit filename="StrOp.h" />
-		<Unit filename="TakagiSugenoConsequent.cpp" />
-		<Unit filename="TakagiSugenoConsequent.h" />
-		<Unit filename="TakagiSugenoRule.cpp" />
-		<Unit filename="TakagiSugenoRule.h" />
-		<Unit filename="TakagiSugenoTerm.cpp" />
-		<Unit filename="TakagiSugenoTerm.h" />
-		<Unit filename="TrapezoidalTerm.cpp" />
-		<Unit filename="TrapezoidalTerm.h" />
-		<Unit filename="TriangularTerm.cpp" />
-		<Unit filename="TriangularTerm.h" />
-		<Unit filename="defs.h" />
-		<Unit filename="flScalar.h" />
-		<Unit filename="main.cpp" />
-		<Unit filename="test.h" />
-		<Extensions>
-			<code_completion />
-			<envvars />
-			<debugger />
-			<lib_finder disable_auto="1" />
-		</Extensions>
-	</Project>
-</CodeBlocks_project_file>
+<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
+<CodeBlocks_project_file>
+	<FileVersion major="1" minor="6" />
+	<Project>
+		<Option title="FuzzyLite" />
+		<Option pch_mode="2" />
+		<Option compiler="gcc" />
+		<Build>
+			<Target title="Debug-win32-SDL2">
+				<Option platforms="Windows;" />
+				<Option output="bin/Debug/FuzzyLite" prefix_auto="1" extension_auto="1" />
+				<Option working_dir="" />
+				<Option object_output="obj/Debug/" />
+				<Option type="2" />
+				<Option compiler="gcc" />
+				<Option createDefFile="1" />
+				<Compiler>
+					<Add option="-g" />
+				</Compiler>
+			</Target>
+			<Target title="Release-win32-SDL2">
+				<Option platforms="Windows;" />
+				<Option output="bin/Release/FuzzyLite" prefix_auto="1" extension_auto="1" />
+				<Option working_dir="" />
+				<Option object_output="obj/Release/" />
+				<Option type="2" />
+				<Option compiler="gcc" />
+				<Option createDefFile="1" />
+				<Compiler>
+					<Add option="-fomit-frame-pointer" />
+					<Add option="-O2" />
+				</Compiler>
+				<Linker>
+					<Add option="-s" />
+				</Linker>
+			</Target>
+		</Build>
+		<Compiler>
+			<Add option="-Wextra" />
+			<Add option="-Wall" />
+			<Add option="-fexceptions" />
+			<Add option="-Wpointer-arith" />
+			<Add option="-Wno-switch" />
+			<Add option="-Wno-sign-compare" />
+			<Add option="-Wno-unused-parameter" />
+			<Add option="-Wno-overloaded-virtual" />
+		</Compiler>
+		<Unit filename="AreaCentroidAlgorithm.cpp" />
+		<Unit filename="AreaCentroidAlgorithm.h" />
+		<Unit filename="CompoundTerm.cpp" />
+		<Unit filename="CompoundTerm.h" />
+		<Unit filename="DescriptiveAntecedent.cpp" />
+		<Unit filename="DescriptiveAntecedent.h" />
+		<Unit filename="DiscreteTerm.cpp" />
+		<Unit filename="DiscreteTerm.h" />
+		<Unit filename="FunctionTerm.cpp" />
+		<Unit filename="FunctionTerm.h" />
+		<Unit filename="FuzzyAnd.cpp" />
+		<Unit filename="FuzzyAnd.h" />
+		<Unit filename="FuzzyAntecedent.cpp" />
+		<Unit filename="FuzzyAntecedent.h" />
+		<Unit filename="FuzzyConsequent.cpp" />
+		<Unit filename="FuzzyConsequent.h" />
+		<Unit filename="FuzzyDefuzzifier.cpp" />
+		<Unit filename="FuzzyDefuzzifier.h" />
+		<Unit filename="FuzzyEngine.cpp" />
+		<Unit filename="FuzzyEngine.h" />
+		<Unit filename="FuzzyException.cpp" />
+		<Unit filename="FuzzyException.h" />
+		<Unit filename="FuzzyExceptions.cpp" />
+		<Unit filename="FuzzyExceptions.h" />
+		<Unit filename="FuzzyLite.h" />
+		<Unit filename="FuzzyModulation.cpp" />
+		<Unit filename="FuzzyModulation.h" />
+		<Unit filename="FuzzyOperation.cpp" />
+		<Unit filename="FuzzyOperation.h" />
+		<Unit filename="FuzzyOperator.cpp" />
+		<Unit filename="FuzzyOperator.h" />
+		<Unit filename="FuzzyOr.cpp" />
+		<Unit filename="FuzzyOr.h" />
+		<Unit filename="FuzzyRule.cpp" />
+		<Unit filename="FuzzyRule.h" />
+		<Unit filename="Hedge.cpp" />
+		<Unit filename="Hedge.h" />
+		<Unit filename="HedgeSet.cpp" />
+		<Unit filename="HedgeSet.h" />
+		<Unit filename="InfixToPostfix.cpp" />
+		<Unit filename="InfixToPostfix.h" />
+		<Unit filename="InputLVar.cpp" />
+		<Unit filename="InputLVar.h" />
+		<Unit filename="LinguisticTerm.cpp" />
+		<Unit filename="LinguisticTerm.h" />
+		<Unit filename="LinguisticVariable.cpp" />
+		<Unit filename="LinguisticVariable.h" />
+		<Unit filename="MamdaniConsequent.cpp" />
+		<Unit filename="MamdaniConsequent.h" />
+		<Unit filename="MamdaniRule.cpp" />
+		<Unit filename="MamdaniRule.h" />
+		<Unit filename="OutputLVar.cpp" />
+		<Unit filename="OutputLVar.h" />
+		<Unit filename="RectangularTerm.cpp" />
+		<Unit filename="RectangularTerm.h" />
+		<Unit filename="RuleBlock.cpp" />
+		<Unit filename="RuleBlock.h" />
+		<Unit filename="ShoulderTerm.cpp" />
+		<Unit filename="ShoulderTerm.h" />
+		<Unit filename="SingletonTerm.cpp" />
+		<Unit filename="SingletonTerm.h" />
+		<Unit filename="StrOp.cpp" />
+		<Unit filename="StrOp.h" />
+		<Unit filename="TakagiSugenoConsequent.cpp" />
+		<Unit filename="TakagiSugenoConsequent.h" />
+		<Unit filename="TakagiSugenoRule.cpp" />
+		<Unit filename="TakagiSugenoRule.h" />
+		<Unit filename="TakagiSugenoTerm.cpp" />
+		<Unit filename="TakagiSugenoTerm.h" />
+		<Unit filename="TrapezoidalTerm.cpp" />
+		<Unit filename="TrapezoidalTerm.h" />
+		<Unit filename="TriangularTerm.cpp" />
+		<Unit filename="TriangularTerm.h" />
+		<Unit filename="defs.h" />
+		<Unit filename="flScalar.h" />
+		<Unit filename="main.cpp" />
+		<Unit filename="test.h" />
+		<Extensions>
+			<code_completion />
+			<envvars />
+			<debugger />
+			<lib_finder disable_auto="1" />
+		</Extensions>
+	</Project>
+</CodeBlocks_project_file>

+ 4 - 2
AI/StupidAI/StupidAI.cbp

@@ -6,7 +6,8 @@
 		<Option pch_mode="2" />
 		<Option compiler="gcc" />
 		<Build>
-			<Target title="Debug">
+			<Target title="Debug-win32-SDL2">
+				<Option platforms="Windows;" />
 				<Option output="../StupidAI" imp_lib="$(TARGET_OUTPUT_DIR)$(TARGET_OUTPUT_BASENAME).a" def_file="$(TARGET_OUTPUT_DIR)$(TARGET_OUTPUT_BASENAME).def" prefix_auto="1" extension_auto="1" />
 				<Option object_output="obj/Debug/" />
 				<Option type="3" />
@@ -15,7 +16,8 @@
 					<Add option="-ggdb" />
 				</Compiler>
 			</Target>
-			<Target title="Release">
+			<Target title="Release-win32-SDL2">
+				<Option platforms="Windows;" />
 				<Option output="../StupidAI" imp_lib="$(TARGET_OUTPUT_DIR)$(TARGET_OUTPUT_BASENAME).a" def_file="$(TARGET_OUTPUT_DIR)$(TARGET_OUTPUT_BASENAME).def" prefix_auto="1" extension_auto="1" />
 				<Option object_output="obj/Release/" />
 				<Option type="3" />

+ 4 - 2
AI/VCAI/VCAI.cbp

@@ -6,7 +6,8 @@
 		<Option pch_mode="2" />
 		<Option compiler="gcc" />
 		<Build>
-			<Target title="Debug">
+			<Target title="Debug-win32-SDL2">
+				<Option platforms="Windows;" />
 				<Option output="../VCAI" imp_lib="$(TARGET_OUTPUT_DIR)$(TARGET_OUTPUT_BASENAME).a" def_file="$(TARGET_OUTPUT_DIR)$(TARGET_OUTPUT_BASENAME).def" prefix_auto="1" extension_auto="1" />
 				<Option object_output="obj/Debug/" />
 				<Option type="3" />
@@ -18,7 +19,8 @@
 					<Add directory="../FuzzyLite/bin/Debug" />
 				</Linker>
 			</Target>
-			<Target title="Release">
+			<Target title="Release-win32-SDL2">
+				<Option platforms="Windows;" />
 				<Option output="../VCAI" imp_lib="$(TARGET_OUTPUT_DIR)$(TARGET_OUTPUT_BASENAME).a" def_file="$(TARGET_OUTPUT_DIR)$(TARGET_OUTPUT_BASENAME).def" prefix_auto="1" extension_auto="1" />
 				<Option object_output="obj/Release/" />
 				<Option type="3" />

+ 4 - 2
client/VCMI_client.cbp

@@ -6,7 +6,8 @@
 		<Option pch_mode="2" />
 		<Option compiler="gcc" />
 		<Build>
-			<Target title="Debug">
+			<Target title="Debug-win32-SDL2">
+				<Option platforms="Windows;" />
 				<Option output="../VCMI_client" prefix_auto="1" extension_auto="1" />
 				<Option working_dir="../" />
 				<Option object_output="../obj/Debug/" />
@@ -17,7 +18,8 @@
 					<Add option="-Og" />
 				</Compiler>
 			</Target>
-			<Target title="Release">
+			<Target title="Release-win32-SDL2">
+				<Option platforms="Windows;" />
 				<Option output="../VCMI_client" prefix_auto="1" extension_auto="1" />
 				<Option working_dir="../" />
 				<Option object_output="../obj/Release/" />

+ 2 - 2
lib/VCMI_lib.cbp

@@ -7,7 +7,7 @@
 		<Option pch_mode="2" />
 		<Option compiler="gcc" />
 		<Build>
-			<Target title="Debug">
+			<Target title="Debug-win32-SDL2">
 				<Option platforms="Windows;" />
 				<Option output="../VCMI_lib" prefix_auto="0" extension_auto="1" />
 				<Option object_output="../obj/Debug/Lib" />
@@ -21,7 +21,7 @@
 					<Add option="-g" />
 				</Compiler>
 			</Target>
-			<Target title="Release">
+			<Target title="Release-win32-SDL2">
 				<Option platforms="Windows;" />
 				<Option output="../VCMI_lib" prefix_auto="0" extension_auto="1" />
 				<Option object_output="../obj/Release/Lib" />

+ 3 - 2
lib/minizip/minizip.cbp

@@ -6,7 +6,7 @@
 		<Option pch_mode="2" />
 		<Option compiler="gcc" />
 		<Build>
-			<Target title="Debug">
+			<Target title="Debug-win32-SDL2">
 				<Option platforms="Windows;" />
 				<Option output="../../minizip" prefix_auto="1" extension_auto="1" />
 				<Option object_output="obj/Debug/" />
@@ -19,7 +19,8 @@
 					<Add option="-DBUILD_DLL" />
 				</Compiler>
 			</Target>
-			<Target title="Release">
+			<Target title="Release-win32-SDL2">
+				<Option platforms="Windows;" />
 				<Option output="../../minizip" prefix_auto="1" extension_auto="1" />
 				<Option object_output="obj/Release/" />
 				<Option type="3" />

+ 5 - 2
server/VCMI_server.cbp

@@ -6,7 +6,8 @@
 		<Option pch_mode="2" />
 		<Option compiler="gcc" />
 		<Build>
-			<Target title="Debug">
+			<Target title="Debug-win32-SDL2">
+				<Option platforms="Windows;" />
 				<Option output="../VCMI_server" prefix_auto="1" extension_auto="1" />
 				<Option object_output="../obj/Debug/Server" />
 				<Option type="1" />
@@ -17,11 +18,13 @@
 					<Add option="-Og" />
 				</Compiler>
 			</Target>
-			<Target title="Release">
+			<Target title="Release-win32-SDL2">
+				<Option platforms="Windows;" />
 				<Option output="../VCMI_server" prefix_auto="1" extension_auto="1" />
 				<Option object_output="../obj/Release/Server" />
 				<Option type="1" />
 				<Option compiler="gcc" />
+				<Option use_console_runner="0" />
 				<Compiler>
 					<Add option="-fomit-frame-pointer" />
 					<Add option="-O2" />

+ 2 - 1
test/Test.cbp

@@ -6,7 +6,8 @@
 		<Option pch_mode="2" />
 		<Option compiler="gcc" />
 		<Build>
-			<Target title="Debug">
+			<Target title="Debug-win32-SDL2">
+				<Option platforms="Windows;" />
 				<Option output="../Test" prefix_auto="1" extension_auto="1" />
 				<Option object_output="obj/Debug/" />
 				<Option type="1" />