From: <ric...@us...> - 2009-10-10 23:43:10
|
Revision: 1032 http://loki-lib.svn.sourceforge.net/loki-lib/?rev=1032&view=rev Author: rich_sposato Date: 2009-10-10 23:43:02 +0000 (Sat, 10 Oct 2009) Log Message: ----------- Added new configurations to differentiate between cygwin-gcc and gnu-gcc. Modified Paths: -------------- trunk/Loki.cbp trunk/test/Longevity/Longevity.cbp trunk/test/RegressionTest/RegressionTest.cbp Modified: trunk/Loki.cbp =================================================================== --- trunk/Loki.cbp 2009-10-10 23:11:31 UTC (rev 1031) +++ trunk/Loki.cbp 2009-10-10 23:43:02 UTC (rev 1032) @@ -5,11 +5,39 @@ <Option title="Loki" /> <Option compiler="cygwin" /> <Build> - <Target title="Debug"> - <Option output=".\lib\Loki_D" prefix_auto="0" extension_auto="1" /> + <Target title="Debug_GCC"> + <Option output=".\lib\GCC\Loki_D" prefix_auto="0" extension_auto="1" /> <Option working_dir="" /> - <Option object_output="obj\Debug\" /> + <Option object_output="obj\Debug_GCC\" /> <Option type="2" /> + <Option compiler="gcc" /> + <Option createDefFile="1" /> + <Compiler> + <Add option="-W" /> + <Add option="-g" /> + <Add directory="." /> + <Add directory=".\include" /> + <Add directory=".\include\loki" /> + </Compiler> + </Target> + <Target title="Release_GCC"> + <Option output=".\lib\GCC\Loki" prefix_auto="0" extension_auto="1" /> + <Option working_dir="" /> + <Option object_output="obj\Release_GCC\" /> + <Option type="2" /> + <Option compiler="gcc" /> + <Option createDefFile="1" /> + <Compiler> + <Add option="-W" /> + <Add directory=".\include\loki" /> + <Add directory=".\include" /> + </Compiler> + </Target> + <Target title="Debug_Cygwin"> + <Option output=".\lib\Cygwin\Loki_D.a" prefix_auto="0" extension_auto="0" /> + <Option working_dir="" /> + <Option object_output="obj\Debug_Cygwin\" /> + <Option type="2" /> <Option compiler="cygwin" /> <Option createDefFile="1" /> <Compiler> @@ -20,10 +48,10 @@ <Add directory=".\include\loki" /> </Compiler> </Target> - <Target title="Release"> - <Option output=".\lib\Loki" prefix_auto="0" extension_auto="1" /> + <Target title="Release_Cygwin"> + <Option output=".\lib\Cygwin\Loki.a" prefix_auto="0" extension_auto="0" /> <Option working_dir="" /> - <Option object_output="obj\Release\" /> + <Option object_output="obj\Release_Cygwin\" /> <Option type="2" /> <Option compiler="cygwin" /> <Option createDefFile="1" /> Modified: trunk/test/Longevity/Longevity.cbp =================================================================== --- trunk/test/Longevity/Longevity.cbp 2009-10-10 23:11:31 UTC (rev 1031) +++ trunk/test/Longevity/Longevity.cbp 2009-10-10 23:43:02 UTC (rev 1032) @@ -5,10 +5,42 @@ <Option title="Longevity" /> <Option compiler="cygwin" /> <Build> - <Target title="Debug"> - <Option output="obj\Debug\Longevity" prefix_auto="1" extension_auto="1" /> - <Option object_output="obj\Debug\" /> + <Target title="Debug_GCC"> + <Option output="obj\Debug_GCC\Longevity" prefix_auto="1" extension_auto="1" /> + <Option object_output="obj\Debug_GCC\" /> <Option type="1" /> + <Option compiler="gcc" /> + <Compiler> + <Add option="-W" /> + <Add option="-g" /> + <Add directory="..\..\include\loki" /> + <Add directory="..\..\include" /> + </Compiler> + <Linker> + <Add library="..\..\lib\GCC\Loki_D.a" /> + </Linker> + </Target> + <Target title="Release_GCC"> + <Option output="obj\Release_GCC\Longevity" prefix_auto="1" extension_auto="1" /> + <Option object_output="obj\Release_GCC\" /> + <Option type="1" /> + <Option compiler="gcc" /> + <Compiler> + <Add option="-fexpensive-optimizations" /> + <Add option="-Os" /> + <Add option="-O3" /> + <Add option="-W" /> + <Add directory="..\..\include\loki" /> + <Add directory="..\..\include" /> + </Compiler> + <Linker> + <Add library="..\..\lib\GCC\Loki.a" /> + </Linker> + </Target> + <Target title="Debug_Cygwin"> + <Option output="obj\Debug_Cygwin\Longevity" prefix_auto="1" extension_auto="1" /> + <Option object_output="obj\Debug_Cygwin\" /> + <Option type="1" /> <Option compiler="cygwin" /> <Compiler> <Add option="-W" /> @@ -17,12 +49,12 @@ <Add directory="..\..\include" /> </Compiler> <Linker> - <Add library="..\..\lib\Loki_D.a" /> + <Add library="..\..\lib\Cygwin\Loki_D.a" /> </Linker> </Target> - <Target title="Release"> - <Option output="obj\Release\Longevity" prefix_auto="1" extension_auto="1" /> - <Option object_output="obj\Release\" /> + <Target title="Release_Cygwin"> + <Option output="obj\Release_Cygwin\Longevity" prefix_auto="1" extension_auto="1" /> + <Option object_output="obj\Release_Cygwin\" /> <Option type="1" /> <Option compiler="cygwin" /> <Compiler> @@ -34,7 +66,7 @@ <Add directory="..\..\include" /> </Compiler> <Linker> - <Add library="..\..\lib\Loki.a" /> + <Add library="..\..\lib\Cygwin\Loki.a" /> </Linker> </Target> </Build> Modified: trunk/test/RegressionTest/RegressionTest.cbp =================================================================== --- trunk/test/RegressionTest/RegressionTest.cbp 2009-10-10 23:11:31 UTC (rev 1031) +++ trunk/test/RegressionTest/RegressionTest.cbp 2009-10-10 23:43:02 UTC (rev 1032) @@ -5,10 +5,36 @@ <Option title="RegressionTest" /> <Option compiler="cygwin" /> <Build> - <Target title="Debug"> - <Option output="bin\Debug\RegressionTest" prefix_auto="1" extension_auto="1" /> - <Option object_output="obj\Debug\" /> + <Target title="Debug_GCC"> + <Option output="bin\Debug_GCC\RegressionTest" prefix_auto="1" extension_auto="1" /> + <Option object_output="obj\Debug_GCC\" /> <Option type="1" /> + <Option compiler="gcc" /> + <Compiler> + <Add option="-W" /> + <Add option="-g" /> + <Add directory="..\..\include\loki" /> + <Add directory="..\..\include" /> + </Compiler> + </Target> + <Target title="Release_GCC"> + <Option output="bin\Release_GCC\RegressionTest" prefix_auto="1" extension_auto="1" /> + <Option object_output="obj\Release_GCC\" /> + <Option type="1" /> + <Option compiler="gcc" /> + <Compiler> + <Add option="-fexpensive-optimizations" /> + <Add option="-Os" /> + <Add option="-O3" /> + <Add option="-W" /> + <Add directory="..\..\include\loki" /> + <Add directory="..\..\include" /> + </Compiler> + </Target> + <Target title="Debug_Cygwin"> + <Option output="bin\Debug_Cygwin\RegressionTest" prefix_auto="1" extension_auto="1" /> + <Option object_output="obj\Debug_Cygwin\" /> + <Option type="1" /> <Option compiler="cygwin" /> <Compiler> <Add option="-W" /> @@ -17,9 +43,9 @@ <Add directory="..\..\include" /> </Compiler> </Target> - <Target title="Release"> - <Option output="bin\Release\RegressionTest" prefix_auto="1" extension_auto="1" /> - <Option object_output="obj\Release\" /> + <Target title="Release_Cygwin"> + <Option output="bin\Release_Cygwin\RegressionTest" prefix_auto="1" extension_auto="1" /> + <Option object_output="obj\Release_Cygwin\" /> <Option type="1" /> <Option compiler="cygwin" /> <Compiler> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |