X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=Build;h=7a65ca9c7d6af7ae3b39c8a0cfbbfebcf6032625;hp=4ea0aa793964f6e0141c196db46337b871e49f5b;hb=ff85f90d33023d908c534b0bf5d9a65e9fc2cce2;hpb=6c2b7c80d806cb46284f66ff55bbcb8fe7bdce05

diff --git a/Build b/Build
index 4ea0aa79..7a65ca9c 100644
--- a/Build
+++ b/Build
@@ -1,66 +1,80 @@
 package "mspgl"
 {
-	version "1.1";
+	version "2.0";
 	description "Lightweight C++/OpenGL graphics engine";
 
 	require "mspcore";
 	require "mspdatafile";
+	require "mspmath";
 	require "mspgui";
-	require "opengl";
+	require "sigc++-2.0";
+	if_arch "android"
+	{
+		require "opengles";
+	};
+	if_arch "!android"
+	{
+		require "opengl";
+	};
 
-	library "mspgl"
+	generate "GLEX"
 	{
-		source "source";
-		install true;
-		install_map
+		in_suffix ".glext";
+		out_suffix ".cpp";
+		out_suffix ".h";
+		command "scripts/extgen.py";
+		if_arch "android"
 		{
-			map "source" "include/msp/gl";
+			argument "gles2";
 		};
 	};
 
-	program "mesh2c"
+	generate "RES"
 	{
-		source "tools/mesh2c.cpp";
-		build_info
+		in_suffix ".glsl";
+		out_suffix ".cpp";
+		command "scripts/resgen.py";
+		processing_unit DIRECTORY;
+	};
+
+	library "mspgl"
+	{
+		source "source";
+		source "extensions";
+		source "shaderlib";
+		install true;
+		install_map
 		{
-			library "mspgl";
+			map "source" "include/msp/gl";
+			map "extensions" "include/msp/gl/extensions";
+			map "shaderlib" "include/msp/gl/resources";
 		};
 	};
 
 	program "viewer"
 	{
 		source "tools/viewer.cpp";
-		build_info
-		{
-			library "mspgl";
-		};
+		require "sigc++-2.0";
+		use "mspgl";
 	};
 
 	program "shaders"
 	{
 		source "demos/shaders.cpp";
-		build_info
-		{
-			library "mspgl";
-		};
+		use "mspgl";
 	};
 
-	program "texturing"
+	program "cubemap"
 	{
-		source "demos/texturing.cpp";
-		build_info
-		{
-			library "mspgl";
-		};
+		source "demos/cubemap.cpp";
+		use "mspgl";
 	};
 
-	program "cubemap"
+	program "desertpillars"
 	{
-		source "demos/cubemap.cpp";
-		build_info
-		{
-			library "mspgl";
-		};
+		source "demos/desertpillars.cpp";
+		require "sigc++-2.0";
+		use "mspgl";
 	};
 
 	source_tarball