Résolution du conflit de Merge pour le projet cbp

ElderInternalIgnition/ElderInternalIgnition.cbp

@@ -15,7 +15,7 @@
 					<Add option="-g" />
 				</Compiler>
 				<Linker>
-					<Add library="../Libs/SDL-1.2.15/lib/SDL_ttf.lib" />
+					<Add library="..\Libs\SDL-1.2.15\lib\SDL_ttf.lib" />
 					<Add directory="../Libs/SDL-1.2.15" />
 				</Linker>
 			</Target>
@@ -40,10 +40,10 @@
 			<Add directory="../Libs/cmocka-1.0.0/include" />
 		</Compiler>
 		<Linker>
-			<Add library="../Libs/libroxml-2.3.0/Build/libroxml.dll" />
-			<Add library="./../Libs/SDL-1.2.15/bin/SDL.dll" />
-			<Add library="../Libs/cmocka-1.0.0/lib/cmocka.dll.a" />
-			<Add library="../Libs/SDL-1.2.15/lib/SDL_ttf.lib" />
+			<Add library="..\Libs\libroxml-2.3.0\Build\libroxml.dll" />
+			<Add library=".\..\Libs\SDL-1.2.15\bin\SDL.dll" />
+			<Add library="..\Libs\cmocka-1.0.0\lib\cmocka.dll.a" />
+			<Add library="..\Libs\SDL-1.2.15\lib\SDL_ttf.lib" />
 			<Add directory="./../Libs" />
 			<Add directory="../Libs/cmocka-1.0.0/lib" />
 		</Linker>
@@ -59,10 +59,17 @@
 			<Option compilerVar="CC" />
 		</Unit>
 		<Unit filename="../src/TerrainsXML.h" />
+
 		<Unit filename="../src/affichage.c">
 			<Option compilerVar="CC" />
 		</Unit>
 		<Unit filename="../src/affichage.h" />
+
+		<Unit filename="../src/attaques.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="../src/attaques.h" />
+
 		<Unit filename="../src/carte.c">
 			<Option compilerVar="CC" />
 		</Unit>