Merge branch 'reorg' of github.com:dennisferron/LikeMagic-All into reorg

dennisferron · Mar 11, 2013 · 5e92bf3 · 5e92bf3
2 parents 5a2d94b + 30f68e1
commit 5e92bf3
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 29 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -1,15 +1,7 @@
-[submodule "LikeMagic"]
-	path = LikeMagic
-	url = git@github.com:dennisferron/LikeMagic.git
 [submodule "desteer"]
 	path = desteer
 	url = git@github.com:dennisferron/desteer.git
-[submodule "Common"]
-	path = Common
-	url = git@github.com:dennisferron/Common-Dependencies.git
 [submodule "GameBindings"]
 	path = GameBindings
 	url = git@github.com:dennisferron/GameBindings.git
-[submodule "Iocaste"]
-	path = Iocaste
-	url = git@github.com:dennisferron/Iocaste.git
+
diff --git a/Common b/Common
diff --git a/Iocaste b/Iocaste
diff --git a/LikeMagic b/LikeMagic
diff --git a/LikeMagic-All.workspace b/LikeMagic-All.workspace
@@ -2,39 +2,34 @@
 <CodeBlocks_workspace_file>
 	<Workspace title="Workspace">
 		<Project filename="GameBindings/GameBindings.cbp">
-			<Depends filename="LikeMagic/LikeMagic.cbp" />
-			<Depends filename="Iocaste/Iocaste.cbp" />
+			<Depends filename="desteer/bindings/DESteerBindings.cbp" />
+			<Depends filename="GameBindings/Bullet.cbp" />
+			<Depends filename="GameBindings/Deps/irrlicht-1.7.3/source/Irrlicht/Irrlicht-gcc.cbp" />
+			<Depends filename="GameBindings/Deps/tps-1.2/ThinPlateSpline/ThinPlateSpline.cbp" />
+			<Depends filename="GameBindings/LikeMagic/LikeMagic.cbp" />
+			<Depends filename="GameBindings/LikeMagic/StdBindings/StdBindings.cbp" />
+			<Depends filename="GameBindings/Iocaste/Iocaste.cbp" />
 		</Project>
 		<Project filename="desteer/bindings/DESteerBindings.cbp">
 			<Depends filename="desteer/DESteer.cbp" />
-			<Depends filename="LikeMagic/LikeMagic.cbp" />
-			<Depends filename="Iocaste/Iocaste.cbp" />
 		</Project>
 		<Project filename="desteer/DESteer.cbp" />
-		<Project filename="LikeMagic/StdBindings/StdBindings.cbp">
-			<Depends filename="LikeMagic/LikeMagic.cbp" />
-			<Depends filename="Iocaste/Iocaste.cbp" />
-		</Project>
-		<Project filename="LikeMagic/LikeMagic.cbp" />
-		<Project filename="Iocaste/Iocaste.cbp">
-			<Depends filename="LikeMagic/LikeMagic.cbp" />
-		</Project>
-		<Project filename="Iocaste/Debugger/Debugger.cbp" />
 		<Project filename="../wayup/WayUp.cbp" />
 		<Project filename="GameBindings/Bullet.cbp" />
 		<Project filename="GameBindings/Deps/irrlicht-1.7.3/source/Irrlicht/Irrlicht-gcc.cbp" />
 		<Project filename="GameBindings/Deps/tps-1.2/ThinPlateSpline/ThinPlateSpline.cbp" />
-		<Project filename="GameBindings/Interpreter/Interpreter.cbp" active="1">
+		<Project filename="GameBindings/Interpreter/Interpreter.cbp">
 			<Depends filename="GameBindings/GameBindings.cbp" />
 			<Depends filename="desteer/bindings/DESteerBindings.cbp" />
 			<Depends filename="desteer/DESteer.cbp" />
-			<Depends filename="LikeMagic/StdBindings/StdBindings.cbp" />
-			<Depends filename="LikeMagic/LikeMagic.cbp" />
-			<Depends filename="Iocaste/Iocaste.cbp" />
 			<Depends filename="GameBindings/Bullet.cbp" />
 			<Depends filename="GameBindings/Deps/irrlicht-1.7.3/source/Irrlicht/Irrlicht-gcc.cbp" />
 			<Depends filename="GameBindings/Deps/tps-1.2/ThinPlateSpline/ThinPlateSpline.cbp" />
 		</Project>
 		<Project filename="GameBindings/Engine/Engine.cbp" />
+		<Project filename="GameBindings/LikeMagic/LikeMagic.cbp" />
+		<Project filename="GameBindings/LikeMagic/StdBindings/StdBindings.cbp" />
+		<Project filename="GameBindings/Iocaste/Iocaste.cbp" />
+		<Project filename="GameBindings/Iocaste/Debugger/Debugger.cbp" active="1" />
 	</Workspace>
 </CodeBlocks_workspace_file>