X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=Build;h=a9b5308fdab52e2ae038501f280afb0d3b2d2bc9;hb=d6ad508feda1aaa9b2ac2ca2d303c8d28d3094b9;hp=df11fe0df6c3c7a2119b0c4c744e75bee1f6243b;hpb=6c61179fe09af2f5366d50f10aadbf5f83438087;p=r2c2.git

diff --git a/Build b/Build
index df11fe0..a9b5308 100644
--- a/Build
+++ b/Build
@@ -6,13 +6,19 @@ package "märklin"
 	program "shoppinglist"
 	{
 		source "source/shoppinglist";
-		require "mspparser";
+		build_info
+		{
+			incpath "source";
+			library "marklin";
+		};
+		require "mspdatafile";
 	};
 
 	library "marklin"
 	{
 		source "source/libmarklin";
-		require "mspparser";
+		require "mspdatafile";
+		install true;
 	};
 
 	library "marklin3d"
@@ -23,31 +29,32 @@ package "märklin"
 		{
 			incpath "source";
 			library "marklin";
-			libpath ".";
 		};
+		install true;
 	};
 
-	/*program "newconsole"
+	library "marklinnet"
 	{
-		source "source/newconsole";
+		source "source/network";
+		require "mspnet";
 		build_info
 		{
-			library "marklincontrol";
 			incpath "source";
-			libpath ".";
+			library "marklin";
 		};
-	};*/
+		install true;
+	};
 
 	program "designer"
 	{
 		source "source/designer";
 		require "mspstrings";
-		require "sdl";
+		require "mspgltk";
+		require "mspgbase";
 		build_info
 		{
 			incpath "source";
 			library "marklin3d";
-			libpath ".";
 		};
 	};
 
@@ -56,12 +63,33 @@ package "märklin"
 		source "source/engineer";
 		require "mspstrings";
 		require "mspgltk";
-		require "sdl";
+		require "mspgbase";
 		build_info
 		{
 			incpath "source";
 			library "marklin3d";
-			libpath ".";
+			library "marklinnet";
+		};
+	};
+
+	program "remote"
+	{
+		source "source/remote";
+		require "gtkmm-2.4";
+		build_info
+		{
+			incpath "source";
+			library "marklinnet";
+		};
+	};
+
+	program "serial"
+	{
+		source "source/serial";
+		build_info
+		{
+			incpath "source";
+			library "marklinnet";
 		};
 	};
 };