X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=Build;h=5ff4f7844ad9a6221db355ebefe59a02bb947fdc;hb=051149e5026ff64f3ec477cf19080124b82de619;hp=91255cea1377423f7124d0ac026906282bd1621d;hpb=9bc0825e93b1385a4aaf9f90d666a1ac409ffb17;p=libs%2Fgui.git

diff --git a/Build b/Build
index 91255ce..5ff4f78 100644
--- a/Build
+++ b/Build
@@ -7,7 +7,10 @@ package "mspgui"
 	require "sigc++-2.0";
 	if_arch "!windows"
 	{
-		require "xlib";
+		if_arch "!darwin"
+		{
+			require "xlib";
+		};
 	};
 	if_arch "windows"
 	{
@@ -16,6 +19,14 @@ package "mspgui"
 			library "gdi32";
 		};
 	};
+	if_arch "darwin"
+	{
+		build_info
+		{
+			library "CoreFoundation.framework";
+			library "AppKit.framework";
+		};
+	};
 
 	feature "devil" "Include DevIL support for loading image files";
 	if_feature "devil"
@@ -32,6 +43,33 @@ package "mspgui"
 		require "libpng";
 	};
 
+	feature "libjpeg" "Include libjpeg support for loading JPEG files"
+	{
+		default "yes";
+	};
+	if_feature "libjpeg"
+	{
+		build_info
+		{
+			library "jpeg";
+		};
+	};
+
+	if_arch "darwin"
+	{
+		feature "quartz" "Include Quartz support for loading image files"
+		{
+			default "yes";
+		};
+		if_feature "quartz"
+		{
+			build_info
+			{
+				library "ApplicationServices.framework";
+			};
+		};
+	};
+
 	feature "opengl" "Include support for OpenGL contexts"
 	{
 		default "yes";
@@ -41,15 +79,12 @@ package "mspgui"
 		require "opengl";
 	};
 
-	if_arch "!windows"
+	if_arch "!windows & !darwin"
 	{
 		feature "xrandr" "Include support for video mode switching with XRandR";
 		if_feature "xrandr"
 		{
-			build_info
-			{
-				library "Xrandr";
-			};
+			require "xrandr";
 		};
 	};
 
@@ -57,6 +92,22 @@ package "mspgui"
 	{
 		source "source/graphics";
 		source "source/input";
+		if_feature "libpng"
+		{
+			source "source/graphics/png";
+		};
+		if_feature "libjpeg"
+		{
+			source "source/graphics/jpeg";
+		};
+		if_feature "devil"
+		{
+			source "source/graphics/devil";
+		};
+		if_arch "linux"
+		{
+			overlay "linux";
+		};
 		if_arch "windows"
 		{
 			overlay "windows";
@@ -65,7 +116,19 @@ package "mspgui"
 				overlay "wgl";
 			};
 		};
-		if_arch "!windows"
+		if_arch "darwin"
+		{
+			if_feature "quartz"
+			{
+				source "source/graphics/quartz";
+			};
+			overlay "cocoa";
+			if_feature "opengl"
+			{
+				overlay "cgl";
+			};
+		};
+		if_arch "!windows & !darwin"
 		{
 			overlay "x11";
 			if_feature "opengl"