diff --git a/test/CachedFactory/CachedFactory.cbp b/test/CachedFactory/CachedFactory.cbp
index ff40ede..f81d439 100644
--- a/test/CachedFactory/CachedFactory.cbp
+++ b/test/CachedFactory/CachedFactory.cbp
@@ -5,9 +5,41 @@
 		<Option title="CachedFactory" />
 		<Option compiler="cygwin" />
 		<Build>
-			<Target title="Debug">
-				<Option output="obj\Debug\CachedFactory" prefix_auto="1" extension_auto="1" />
-				<Option object_output="obj\Debug\" />
+			<Target title="Debug_GCC">
+				<Option output="obj\Debug_GCC\CachedFactory" 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\CachedFactory" 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\CachedFactory" 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="obj\Release\CachedFactory" prefix_auto="1" extension_auto="1" />
-				<Option object_output="obj\Release\" />
+			<Target title="Release_Cygwin">
+				<Option output="obj\Release_Cygwin\CachedFactory" 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>
diff --git a/test/OrderedStatic/OrderedStatic.cbp b/test/OrderedStatic/OrderedStatic.cbp
index 051beac..569e4ae 100644
--- a/test/OrderedStatic/OrderedStatic.cbp
+++ b/test/OrderedStatic/OrderedStatic.cbp
@@ -5,9 +5,41 @@
 		<Option title="OrderedStatic" />
 		<Option compiler="cygwin" />
 		<Build>
-			<Target title="Debug">
-				<Option output="bin\Debug\OrderedStatic" prefix_auto="1" extension_auto="1" />
-				<Option object_output="obj\Debug\" />
+			<Target title="Debug_GCC">
+				<Option output="bin\Debug_GCC\OrderedStatic" 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\OrderedStatic" 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\OrderedStatic" 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\OrderedStatic" prefix_auto="1" extension_auto="1" />
-				<Option object_output="obj\Release\" />
+			<Target title="Release_Cygwin">
+				<Option output="bin\Release_Cygwin\OrderedStatic" 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>
diff --git a/test/ScopeGuard/ScopeGuard.cbp b/test/ScopeGuard/ScopeGuard.cbp
index 58bb495..dff2fa4 100644
--- a/test/ScopeGuard/ScopeGuard.cbp
+++ b/test/ScopeGuard/ScopeGuard.cbp
@@ -5,9 +5,35 @@
 		<Option title="ScopeGuard" />
 		<Option compiler="cygwin" />
 		<Build>
-			<Target title="Debug">
-				<Option output="bin\Debug\ScopeGuard" prefix_auto="1" extension_auto="1" />
-				<Option object_output="obj\Debug\" />
+			<Target title="Debug_GCC">
+				<Option output="bin\Debug_GCC\ScopeGuard" 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\ScopeGuard" 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\ScopeGuard" prefix_auto="1" extension_auto="1" />
+				<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">
-				<Option output="bin\Release\ScopeGuard" prefix_auto="1" extension_auto="1" />
-				<Option object_output="obj\Release\" />
+			<Target title="Release_Cygwin">
+				<Option output="bin\Release_Cygwin\ScopeGuard" prefix_auto="1" extension_auto="1" />
+				<Option object_output="obj\Release_Cygwin\" />
 				<Option type="1" />
 				<Option compiler="cygwin" />
 				<Compiler>