diff --git a/test/Pimpl/Pimpl.cbp b/test/Pimpl/Pimpl.cbp
index 1db0208..54b04d7 100644
--- a/test/Pimpl/Pimpl.cbp
+++ b/test/Pimpl/Pimpl.cbp
@@ -5,9 +5,41 @@
 		<Option title="Pimpl" />
 		<Option compiler="cygwin" />
 		<Build>
-			<Target title="Debug">
-				<Option output="bin\Debug\Pimpl" prefix_auto="1" extension_auto="1" />
-				<Option object_output="obj\Debug\" />
+			<Target title="Debug_GCC">
+				<Option output="bin\Debug_GCC\Pimpl" 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\Pimpl" 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\Pimpl" 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\Pimpl" prefix_auto="1" extension_auto="1" />
-				<Option object_output="obj\Release\" />
+			<Target title="Release_Cygwin">
+				<Option output="bin\Release_Cygwin\Pimpl" 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/Register/Register.cbp b/test/Register/Register.cbp
index e36f19b..b03c6e1 100644
--- a/test/Register/Register.cbp
+++ b/test/Register/Register.cbp
@@ -5,9 +5,41 @@
 		<Option title="Register" />
 		<Option compiler="cygwin" />
 		<Build>
-			<Target title="Debug">
-				<Option output="bin\Debug\Register" prefix_auto="1" extension_auto="1" />
-				<Option object_output="obj\Debug\" />
+			<Target title="Debug_GCC">
+				<Option output="bin\Debug_GCC\Register" 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\Register" 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\Register" 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\Register" prefix_auto="1" extension_auto="1" />
-				<Option object_output="obj\Release\" />
+			<Target title="Release_Cygwin">
+				<Option output="bin\Release_Cygwin\Register" 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/flex_string/flex_string.cbp b/test/flex_string/flex_string.cbp
index 5c4061e..da0ad82 100644
--- a/test/flex_string/flex_string.cbp
+++ b/test/flex_string/flex_string.cbp
@@ -5,9 +5,43 @@
 		<Option title="flex_string" />
 		<Option compiler="cygwin" />
 		<Build>
-			<Target title="Debug">
-				<Option output="obj\Debug\flex_string" prefix_auto="1" extension_auto="1" />
-				<Option object_output="obj\Debug\" />
+			<Target title="Debug_GCC">
+				<Option output="obj\Debug_GCC\flex_string" 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" />
+					<Add directory="..\..\include\loki\flex" />
+				</Compiler>
+				<Linker>
+					<Add library="..\..\lib\GCC\Loki_D.a" />
+				</Linker>
+			</Target>
+			<Target title="Release_GCC">
+				<Option output="obj\Release_GCC\flex_string" 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" />
+					<Add directory="..\..\include\loki\flex" />
+				</Compiler>
+				<Linker>
+					<Add library="..\..\lib\GCC\Loki.a" />
+				</Linker>
+			</Target>
+			<Target title="Debug_Cygwin">
+				<Option output="obj\Debug_Cygwin\flex_string" prefix_auto="1" extension_auto="1" />
+				<Option object_output="obj\Debug_Cygwin\" />
 				<Option type="1" />
 				<Option compiler="cygwin" />
 				<Compiler>
@@ -18,12 +52,12 @@
 					<Add directory="..\..\include\loki\flex" />
 				</Compiler>
 				<Linker>
-					<Add library="..\..\lib\Loki_D.a" />
+					<Add library="..\..\lib\Cygwin\Loki_D.a" />
 				</Linker>
 			</Target>
-			<Target title="Release">
-				<Option output="obj\Release\flex_string" prefix_auto="1" extension_auto="1" />
-				<Option object_output="obj\Release\" />
+			<Target title="Release_Cygwin">
+				<Option output="obj\Release_Cygwin\flex_string" prefix_auto="1" extension_auto="1" />
+				<Option object_output="obj\Release_Cygwin\" />
 				<Option type="1" />
 				<Option compiler="cygwin" />
 				<Compiler>
@@ -36,7 +70,7 @@
 					<Add directory="..\..\include\loki\flex" />
 				</Compiler>
 				<Linker>
-					<Add library="..\..\lib\Loki.a" />
+					<Add library="..\..\lib\Cygwin\Loki.a" />
 				</Linker>
 			</Target>
 		</Build>