X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=Build;h=f193a780a224a2c5cde340fb10424705460f7710;hp=162e26ca6257bde4ab8b3f4c4d7b5e0e6af4542d;hb=7aaec9a70b8d7733429bec043f8e33e02956f266;hpb=f1b12c992db974c679d85ae6ec22cd318199d0d5

diff --git a/Build b/Build
index 162e26ca..f193a780 100644
--- a/Build
+++ b/Build
@@ -1,13 +1,21 @@
 package "mspgl"
 {
-	version "2.0";
+	version "3.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";
+	};
 
 	generate "GLEX"
 	{
@@ -15,26 +23,60 @@ package "mspgl"
 		out_suffix ".cpp";
 		out_suffix ".h";
 		command "scripts/extgen.py";
+		if_arch "android"
+		{
+			argument "gles2";
+		};
+	};
+
+	generate "RES"
+	{
+		in_suffix ".glsl";
+		out_suffix ".cpp";
+		command "mspdatatool";
+		arguments "-i" "-n" "Msp::GL";
+		out_argument "-o";
+		processing_unit DIRECTORY;
 	};
 
 	library "mspgl"
 	{
-		source "source";
+		source "source/core";
+		source "source/materials";
+		source "source/render";
+		source "source/effects";
+		source "source/animation";
+		source "source/resources";
+		source "source/glsl";
+		source "source/builders";
 		source "extensions";
+		source "shaderlib";
+		build_info
+		{
+			incpath "source/core";
+			incpath "source/materials";
+			incpath "source/render";
+			incpath "source/effects";
+			incpath "source/animation";
+			incpath "source/resources";
+			incpath "source/glsl";
+			incpath "source/builders";
+		};
 		install true;
 		install_map
 		{
-			map "source" "include/msp/gl";
+			map "source/core" "include/msp/gl";
+			map "source/materials" "include/msp/gl";
+			map "source/render" "include/msp/gl";
+			map "source/effects" "include/msp/gl";
+			map "source/animation" "include/msp/gl";
+			map "source/resources" "include/msp/gl";
+			map "source/glsl" "include/msp/gl";
+			map "source/builders" "include/msp/gl";
 			map "extensions" "include/msp/gl/extensions";
 		};
 	};
 
-	program "mesh2c"
-	{
-		source "tools/mesh2c.cpp";
-		use "mspgl";
-	};
-
 	program "viewer"
 	{
 		source "tools/viewer.cpp";
@@ -42,18 +84,6 @@ package "mspgl"
 		use "mspgl";
 	};
 
-	program "shaders"
-	{
-		source "demos/shaders.cpp";
-		use "mspgl";
-	};
-
-	program "cubemap"
-	{
-		source "demos/cubemap.cpp";
-		use "mspgl";
-	};
-
 	program "desertpillars"
 	{
 		source "demos/desertpillars.cpp";