diff --git a/test/CheckReturn/CheckReturn.cbp b/test/CheckReturn/CheckReturn.cbp
index baba3a9..e1dba12 100644
--- a/test/CheckReturn/CheckReturn.cbp
+++ b/test/CheckReturn/CheckReturn.cbp
@@ -5,9 +5,35 @@
 		<Option title="CheckReturn" />
 		<Option compiler="cygwin" />
 		<Build>
-			<Target title="Debug">
+			<Target title="Debug_GCC">
+				<Option output="obj\Debug_GCC\CheckReturn" 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="obj\Release_GCC\CheckReturn" 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="obj\Debug\CheckReturn" prefix_auto="1" extension_auto="1" />
-				<Option object_output="obj\Debug\" />
+				<Option object_output="obj\Debug_Cygwin\" />
 				<Option type="1" />
 				<Option compiler="cygwin" />
 				<Compiler>
@@ -17,9 +43,9 @@
 					<Add directory="..\..\include" />
 				</Compiler>
 			</Target>
-			<Target title="Release">
+			<Target title="Release_Cygwin">
 				<Option output="obj\Release\CheckReturn" prefix_auto="1" extension_auto="1" />
-				<Option object_output="obj\Release\" />
+				<Option object_output="obj\Release_Cygwin\" />
 				<Option type="1" />
 				<Option compiler="cygwin" />
 				<Compiler>
diff --git a/test/SmartPtr/SmartPtr.cbp b/test/SmartPtr/SmartPtr.cbp
index a53eb97..69ea208 100644
--- a/test/SmartPtr/SmartPtr.cbp
+++ b/test/SmartPtr/SmartPtr.cbp
@@ -3,11 +3,43 @@
 	<FileVersion major="1" minor="6" />
 	<Project>
 		<Option title="SmartPtr" />
-		<Option compiler="cygwin" />
+		<Option compiler="gcc" />
 		<Build>
-			<Target title="Debug">
-				<Option output="bin\Debug\SmartPtr" prefix_auto="1" extension_auto="1" />
-				<Option object_output="obj\Debug\" />
+			<Target title="Debug_GCC">
+				<Option output="bin\Debug_GCC\SmartPtr" 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="bin\Release_GCC\SmartPtr" 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="bin\Debug_Cygwin\SmartPtr" prefix_auto="1" extension_auto="1" />
+				<Option object_output="obj\Debug_Cygwin\" />
 				<Option type="1" />
 				<Option compiler="cygwin" />
 				<Compiler>
@@ -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="bin\Release\SmartPtr" prefix_auto="1" extension_auto="1" />
-				<Option object_output="obj\Release\" />
+			<Target title="Release_Cygwin">
+				<Option output="bin\Release_Cygwin\SmartPtr" 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>