From dd8846c2f75cedd1f24046bd4626d8fd3e071398 Mon Sep 17 00:00:00 2001 From: ColinDrieu <colin.drieu@insa-rennes.fr> Date: Tue, 10 May 2016 20:46:14 +0200 Subject: [PATCH] =?UTF-8?q?R=C3=A9solution=20du=20conflit=20de=20Merge=20p?= =?UTF-8?q?our=20le=20projet=20cbp?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ElderInternalIgnition/ElderInternalIgnition.cbp | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/ElderInternalIgnition/ElderInternalIgnition.cbp b/ElderInternalIgnition/ElderInternalIgnition.cbp index d0e4cdf..51b9d8e 100644 --- a/ElderInternalIgnition/ElderInternalIgnition.cbp +++ b/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> -- GitLab