X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=Build;h=c9a35d43dbb5142805486867f18128ef07351fb4;hb=495c54e187ddbb7514c983e1829a69d82ccad5f3;hp=817d757f9c6dc2485429fc2e498cbd515885c7b6;hpb=444c7efb2fadb10e98197a62b791829d821370c0;p=r2c2.git

diff --git a/Build b/Build
index 817d757..c9a35d4 100644
--- a/Build
+++ b/Build
@@ -1,4 +1,4 @@
-package "märklin"
+package "r2c2"
 {
 	require "mspcore";
 	require "sigc++-2.0";
@@ -6,37 +6,46 @@ package "märklin"
 	program "shoppinglist"
 	{
 		source "source/shoppinglist";
+		build_info
+		{
+			incpath "source";
+			library "r2c2";
+		};
 		require "mspdatafile";
 	};
 
-	library "marklin"
+	library "r2c2"
 	{
-		source "source/libmarklin";
+		source "source/libr2c2";
 		require "mspdatafile";
+		// XXX drivers should be made into plugins to avoid this dependency
+		require "mspnet";
+		install true;
 	};
 
-	library "marklin3d"
+	library "r2c2_3d"
 	{
 		source "source/3d";
 		require "mspgl";
 		build_info
 		{
 			incpath "source";
-			library "marklin";
-			libpath ".";
+			library "r2c2";
 		};
+		install true;
 	};
 
-	/*program "newconsole"
+	library "r2c2_net"
 	{
-		source "source/newconsole";
+		source "source/network";
+		require "mspnet";
 		build_info
 		{
-			library "marklincontrol";
 			incpath "source";
-			libpath ".";
+			library "r2c2";
 		};
-	};*/
+		install true;
+	};
 
 	program "designer"
 	{
@@ -44,11 +53,11 @@ package "märklin"
 		require "mspstrings";
 		require "mspgltk";
 		require "mspgbase";
+		require "libxml++-2.6";
 		build_info
 		{
 			incpath "source";
-			library "marklin3d";
-			libpath ".";
+			library "r2c2_3d";
 		};
 	};
 
@@ -61,8 +70,29 @@ package "märklin"
 		build_info
 		{
 			incpath "source";
-			library "marklin3d";
-			libpath ".";
+			library "r2c2_3d";
+			library "r2c2_net";
+		};
+	};
+
+	program "remote"
+	{
+		source "source/remote";
+		require "gtkmm-2.4";
+		build_info
+		{
+			incpath "source";
+			library "r2c2_net";
+		};
+	};
+
+	program "serial"
+	{
+		source "source/serial";
+		build_info
+		{
+			incpath "source";
+			library "r2c2_net";
 		};
 	};
 };