X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=Build;h=da62feed92c10f1c2093f4a63ac9f340c6e3d29a;hb=refs%2Fheads%2Fmaster;hp=2cf1583030d2280291e617f70c9c8fb86dc6d1cc;hpb=d3e9e3db18a9fb6024fced0fe506752763c91c7f;p=builder.git

diff --git a/Build b/Build
index 2cf1583..da62fee 100644
--- a/Build
+++ b/Build
@@ -5,7 +5,6 @@ package "builder"
 
 	require "mspcore";
 	require "mspdatafile";
-	require "mspcrypto";
 	require "sigc++-2.0";
 
 	build_info
@@ -13,33 +12,16 @@ package "builder"
 		standard CXX "c++11";
 	};
 
-	library "androidtools"
-	{
-		source "plugins/android";
-		default false;
-	};
-
-	library "datatools"
-	{
-		source "plugins/datafile";
-		default false;
-	};
-
 	library "libbuilder"
 	{
 		source "source/lib";
-		use "androidtools";
-		use "datatools";
-		build_info
-		{
-			incpath "plugins";
-		};
 		if_arch "windows"
 		{
 			build_info
 			{
 				library "ole32";
 				library "advapi32";
+				library "shell32";
 			};
 		};
 		install true;
@@ -56,27 +38,46 @@ package "builder"
 		install true;
 	};
 
-	module "builtintools"
+	module "androidtools"
+	{
+		source "plugins/android";
+		use "libbuilder";
+		install true;
+	};
+
+	module "basetools"
 	{
-		source "plugins/builtin";
+		source "plugins/base";
+		use "libbuilder";
+		install true;
+	};
+
+	module "datatools"
+	{
+		source "plugins/datafile";
+		use "libbuilder";
 		install true;
 	};
 
 	module "gnutools"
 	{
 		source "plugins/gnu";
+		use "libbuilder";
 		install true;
 	};
 
 	module "clangtools"
 	{
 		source "plugins/clang";
+		use "libbuilder";
 		install true;
 	};
 
 	module "msvctools"
 	{
 		source "plugins/msvc";
+		use "libbuilder";
+		require "mspcrypto";
 		install true;
 	};