Avoid deactivating while the controller still has nonzero speed

[r2c2.git] / Build

diff --git a/Build b/Build
index 7f0fb86d4ff13aeb7dc605cf02c0303cca311236..c9a35d43dbb5142805486867f18128ef07351fb4 100644 (file)
--- a/Build
+++ b/Build
@@ -1,4 +1,4 @@
-package "märklin"
+package "r2c2"
 {
        require "mspcore";
        require "sigc++-2.0";
@@ -6,48 +6,58 @@ 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"
        {
                source "source/designer";
                require "mspstrings";
+               require "mspgltk";
                require "mspgbase";
+               require "libxml++-2.6";
                build_info
                {
                        incpath "source";
-                       library "marklin3d";
-                       libpath ".";
+                       library "r2c2_3d";
                };
        };
 
@@ -60,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";
                };
        };
 };