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

diff --git a/Build b/Build
index f193a780..581a4f21 100644
--- a/Build
+++ b/Build
@@ -32,6 +32,8 @@ package "mspgl"
 	generate "RES"
 	{
 		in_suffix ".glsl";
+		in_suffix ".samp";
+		in_suffix ".mesh";
 		out_suffix ".cpp";
 		command "mspdatatool";
 		arguments "-i" "-n" "Msp::GL";
@@ -50,16 +52,17 @@ package "mspgl"
 		source "source/glsl";
 		source "source/builders";
 		source "extensions";
+		source "builtin_data";
 		source "shaderlib";
 		build_info
 		{
+			incpath "source";
 			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;
@@ -71,7 +74,7 @@ package "mspgl"
 			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/glsl" "include/msp/gl/glsl";
 			map "source/builders" "include/msp/gl";
 			map "extensions" "include/msp/gl/extensions";
 		};
@@ -86,9 +89,19 @@ package "mspgl"
 
 	program "desertpillars"
 	{
-		source "demos/desertpillars.cpp";
+		source "demos/desertpillars/source";
 		require "sigc++-2.0";
 		use "mspgl";
+		build_info
+		{
+			standard CXX "c++14";
+		};
+	};
+
+	program "glslcompiler"
+	{
+		source "tools/glslcompiler.cpp";
+		use "mspgl";
 	};
 
 	source_tarball