X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=Build;h=37238596691a28ae4efd05d9c1c4ef6cd08f0b7e;hb=418d0b18998fbd982bed87b05ff1247b4dd758dd;hp=6f93cb026ca4dadcb97d8c19ffa3f587a886252b;hpb=412d452138526d55d6b96b36f685c0e1d4e22edb;p=builder.git

diff --git a/Build b/Build
index 6f93cb0..3723859 100644
--- a/Build
+++ b/Build
@@ -13,74 +13,65 @@ package "builder"
 		standard CXX "c++11";
 	};
 
-	library "builtintools"
+	library "libbuilder"
 	{
-		source "plugins/builtin";
-		default false;
+		source "source/lib";
+		if_arch "windows"
+		{
+			build_info
+			{
+				library "ole32";
+				library "advapi32";
+				library "shell32";
+			};
+		};
+		install true;
+		install_map
+		{
+			map "source/lib" "include/msp/builder";
+		};
 	};
 
-	library "gnutools"
+	program "builder"
 	{
-		source "plugins/gnu";
-		default false;
+		source "source/cli";
+		use "libbuilder";
+		install true;
 	};
 
-	library "clangtools"
+	module "androidtools"
 	{
-		source "plugins/clang";
-		default false;
+		source "plugins/android";
+		install true;
 	};
 
-	library "msvctools"
+	module "basetools"
 	{
-		source "plugins/msvc";
-		default false;
+		source "plugins/base";
+		install true;
 	};
 
-	library "androidtools"
+	module "datatools"
 	{
-		source "plugins/android";
-		default false;
+		source "plugins/datafile";
+		install true;
 	};
 
-	library "datatools"
+	module "gnutools"
 	{
-		source "plugins/datafile";
-		default false;
+		source "plugins/gnu";
+		install true;
 	};
 
-	library "libbuilder"
+	module "clangtools"
 	{
-		source "source/lib";
-		use "builtintools";
-		use "gnutools";
-		use "clangtools";
-		use "msvctools";
-		use "androidtools";
-		use "datatools";
-		build_info
-		{
-			incpath "plugins";
-		};
-		if_arch "windows"
-		{
-			build_info
-			{
-				library "ole32";
-				library "advapi32";
-			};
-		};
+		source "plugins/clang";
 		install true;
-		install_map
-		{
-			map "source/lib" "include/msp/builder";
-		};
 	};
 
-	program "builder"
+	module "msvctools"
 	{
-		source "source/cli";
-		use "libbuilder";
+		source "plugins/msvc";
 		install true;
 	};