Merge branch 'next' of https://github.com/seanpaultaylor/GamePlay into next

Conflicts:
	.gitignore

.gitignore

@@ -1,6 +1,8 @@
 *.suo
 *.sdf
 *.opensdf
+*.layout
+*.depend
 .DS_Store*
 ehthumbs.db
 Icon?
@@ -8,6 +10,7 @@ Thumbs.db
 /.metadata
 /169.254.0.1
 /ipch
+/cmake
 /Debug
 /Release
 /Simulator
@@ -16,16 +19,10 @@ Thumbs.db
 /Device-Debug
 /Device-Coverage
 /Device-Profile
-/Device-Release
-/cmake
-/linux
-/windows
-/blackberry
-
+/Device-Release
 /gameplay-internal
 /gameplay-api/xml
 
-
 /gameplay-encoder/Debug
 /gameplay-encoder/Release
 /gameplay-encoder/gameplay-encoder.xcodeproj/xcuserdata
@@ -54,7 +51,6 @@ Thumbs.db
 /gameplay/android/local.properties
 /gameplay/android/project.properties
 /gameplay/android/obj
-/gameplay/linux
 
 /gameplay-tests/Debug
 /gameplay-tests/DebugMem
@@ -79,7 +75,6 @@ Thumbs.db
 /gameplay-tests/android/local.properties
 /gameplay-tests/android/proguard-project.txt
 /gameplay-tests/android/project.properties
-/gameplay-tests/linux
 
 /gameplay-samples/sample00-mesh/Debug
 /gameplay-samples/sample00-mesh/DebugMem
@@ -104,7 +99,6 @@ Thumbs.db
 /gameplay-samples/sample00-mesh/android/local.properties
 /gameplay-samples/sample00-mesh/android/proguard.cfg
 /gameplay-samples/sample00-mesh/android/project.properties
-/gameplay-samples/sample00-mesh/linux
 
 /gameplay-samples/sample01-longboard/Debug
 /gameplay-samples/sample01-longboard/DebugMem
@@ -130,7 +124,6 @@ Thumbs.db
 /gameplay-samples/sample01-longboard/android/proguard.cfg
 /gameplay-samples/sample01-longboard/android/project.properties
 /gameplay-samples/sample01-longboard/android/local.properties
-/gameplay-samples/sample01-longboard/linux
 
 /gameplay-samples/sample02-spaceship/Debug
 /gameplay-samples/sample02-spaceship/DebugMem
@@ -155,7 +148,6 @@ Thumbs.db
 /gameplay-samples/sample02-spaceship/android/src
 /gameplay-samples/sample02-spaceship/android/proguard.cfg
 /gameplay-samples/sample02-spaceship/android/local.properties
-/gameplay-samples/sample02-spaceship/linux
 
 /gameplay-samples/sample03-character/Debug
 /gameplay-samples/sample03-character/DebugMem
@@ -182,7 +174,6 @@ Thumbs.db
 /gameplay-samples/sample03-character/android/obj
 /gameplay-samples/sample03-character/android/NUL
 /gameplay-samples/sample03-character/res/gamepad.xcf
-/gameplay-samples/sample03-character/linux
 
 /gameplay-samples/sample04-particles/Debug
 /gameplay-samples/sample04-particles/DebugMem
@@ -209,7 +200,6 @@ Thumbs.db
 /gameplay-samples/sample04-particles/android/proguard.cfg
 /gameplay-samples/sample04-particles/android/local.properties
 /gameplay-samples/sample04-particles/android/project.properties
-/gameplay-samples/sample04-particles/linux
 
 /gameplay-samples/sample05-lua/Debug
 /gameplay-samples/sample05-lua/DebugMem
@@ -234,7 +224,6 @@ Thumbs.db
 /gameplay-samples/sample05-lua/android/local.properties
 /gameplay-samples/sample05-lua/android/proguard.cfg
 /gameplay-samples/sample05-lua/android/project.properties
-/gameplay-samples/sample05-lua/linux
 
 /gameplay-samples/sample06-racer/Debug
 /gameplay-samples/sample06-racer/DebugMem
@@ -264,6 +253,6 @@ Thumbs.db
 /gameplay-samples/sample06-racer/android/local.properties
 /gameplay-samples/sample06-racer/android/proguard.cfg
 /gameplay-samples/sample06-racer/android/project.properties
-/gameplay-samples/sample06-racer/linux
+
 
 

gameplay/gameplay.cbp

@@ -7,9 +7,9 @@
 		<Option compiler="gcc" />
 		<Build>
 			<Target title="Debug">
-				<Option output="linux/Debug/libgameplay" prefix_auto="1" extension_auto="1" />
+				<Option output="Debug/libgameplay" prefix_auto="1" extension_auto="1" />
 				<Option working_dir="" />
-				<Option object_output="linux/Debug/" />
+				<Option object_output="Debug/" />
 				<Option type="2" />
 				<Option compiler="gcc" />
 				<Option createDefFile="1" />
@@ -18,9 +18,9 @@
 				</Compiler>
 			</Target>
 			<Target title="Release">
-				<Option output="linux/Release/libgameplay" prefix_auto="1" extension_auto="1" />
+				<Option output="Release/libgameplay" prefix_auto="1" extension_auto="1" />
 				<Option working_dir="" />
-				<Option object_output="linux/Release/" />
+				<Option object_output="Release/" />
 				<Option type="2" />
 				<Option compiler="gcc" />
 				<Option createDefFile="1" />