X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=Build;h=c9a35d43dbb5142805486867f18128ef07351fb4;hb=495c54e187ddbb7514c983e1829a69d82ccad5f3;hp=9be8021817cb64ba9e1242a9a78a2389f616e908;hpb=2e3ad91af312aaf20b10f1cbe6096cda7e8a97d1;p=r2c2.git

diff --git a/Build b/Build
index 9be8021..c9a35d4 100644
--- a/Build
+++ b/Build
@@ -1,4 +1,4 @@
-package "märklin"
+package "r2c2"
 {
 	require "mspcore";
 	require "sigc++-2.0";
@@ -6,36 +6,43 @@ 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";
+			library "r2c2";
 		};
 		install true;
 	};
 
-	library "marklinnet"
+	library "r2c2_net"
 	{
 		source "source/network";
 		require "mspnet";
 		build_info
 		{
 			incpath "source";
-			library "marklin";
+			library "r2c2";
 		};
 		install true;
 	};
@@ -46,10 +53,11 @@ package "märklin"
 		require "mspstrings";
 		require "mspgltk";
 		require "mspgbase";
+		require "libxml++-2.6";
 		build_info
 		{
 			incpath "source";
-			library "marklin3d";
+			library "r2c2_3d";
 		};
 	};
 
@@ -62,8 +70,8 @@ package "märklin"
 		build_info
 		{
 			incpath "source";
-			library "marklin3d";
-			library "marklinnet";
+			library "r2c2_3d";
+			library "r2c2_net";
 		};
 	};
 
@@ -74,7 +82,7 @@ package "märklin"
 		build_info
 		{
 			incpath "source";
-			library "marklinnet";
+			library "r2c2_net";
 		};
 	};
 
@@ -84,7 +92,7 @@ package "märklin"
 		build_info
 		{
 			incpath "source";
-			library "marklinnet";
+			library "r2c2_net";
 		};
 	};
 };