X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=Build;h=6bf5ebb03a11208134dcf638ae001a36c735c663;hp=7b64dde536c62abed41f022938407f56bf71fa84;hb=54fdd850d1e657bc357d859a532497905ded741a;hpb=44ac1183d7a4d54088561cc7ce8fe5f3120c4b35

diff --git a/Build b/Build
index 7b64dde5..6bf5ebb0 100644
--- a/Build
+++ b/Build
@@ -1,77 +1,113 @@
 package "mspgl"
 {
-	version "2.0";
+	version "3.0";
 	description "Lightweight C++/OpenGL graphics engine";
 
 	require "mspcore";
 	require "mspdatafile";
+	require "mspmath";
 	require "mspgui";
-	require "opengl";
-
-	library "mspgl"
+	require "sigc++-2.0";
+	if_arch "android"
 	{
-		source "source";
-		install true;
-		install_map
-		{
-			map "source" "include/msp/gl";
-		};
+		require "opengles";
 	};
-
-	program "mesh2c"
+	if_arch "!android"
 	{
-		source "tools/mesh2c.cpp";
-		build_info
-		{
-			library "mspgl";
-		};
+		require "opengl";
 	};
 
-	program "viewer"
+	generate "GLEX"
 	{
-		source "tools/viewer.cpp";
-		build_info
+		in_suffix ".glext";
+		out_suffix ".cpp";
+		out_suffix ".h";
+		command "scripts/extgen.py";
+		if_arch "android"
 		{
-			library "mspgl";
+			argument "gles2";
 		};
 	};
 
-	program "shaders"
+	generate "RES"
 	{
-		source "demos/shaders.cpp";
-		build_info
-		{
-			library "mspgl";
-		};
+		in_suffix ".glsl";
+		in_suffix ".samp";
+		in_suffix ".mesh";
+		out_suffix ".cpp";
+		command "mspdatatool";
+		arguments "-i" "-n" "Msp::GL";
+		out_argument "-o";
+		processing_unit DIRECTORY;
 	};
 
-	program "texturing"
+	library "mspgl"
 	{
-		source "demos/texturing.cpp";
+		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 "source/backends/opengl";
+		source "extensions";
+		source "builtin_data";
+		source "shaderlib";
 		build_info
 		{
-			library "mspgl";
+			incpath "source";
+			incpath "source/core";
+			incpath "source/materials";
+			incpath "source/render";
+			incpath "source/effects";
+			incpath "source/animation";
+			incpath "source/resources";
+			incpath "source/builders";
+			incpath "source/backends/opengl";
+			standard CXX "c++11";
+		};
+		install true;
+		install_map
+		{
+			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/glsl";
+			map "source/builders" "include/msp/gl";
+			map "source/backends/opengl" "include/msp/gl";
+			map "extensions" "include/msp/gl/extensions";
 		};
 	};
 
-	program "cubemap"
+	program "viewer"
 	{
-		source "demos/cubemap.cpp";
-		build_info
-		{
-			library "mspgl";
-		};
+		source "tools/viewer.cpp";
+		require "sigc++-2.0";
+		use "mspgl";
 	};
 
 	program "desertpillars"
 	{
-		source "demos/desertpillars.cpp";
+		source "demos/desertpillars/source";
+		require "sigc++-2.0";
+		use "mspgl";
 		build_info
 		{
-			library "mspgl";
+			standard CXX "c++14";
 		};
 	};
 
+	program "glslcompiler"
+	{
+		source "tools/glslcompiler.cpp";
+		use "mspgl";
+	};
+
 	source_tarball
 	{
 		source "License.txt";