X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=Build;h=7972020fb1fd0471b8ea771eeaa6c566cef3025f;hb=eba34251cee51134bba7644a84da49583da599f7;hp=a0f437caa8cd37f3e534672896902defdde577a2;hpb=1aca77b93853ee127ac3bbf6886f7f04920542ef;p=libs%2Fgui.git

diff --git a/Build b/Build
index a0f437c..7972020 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,31 +43,67 @@ package "mspgui"
 		require "libpng";
 	};
 
-	feature "opengl" "Include support for OpenGL contexts"
+	feature "libjpeg" "Include libjpeg support for loading JPEG files"
 	{
 		default "yes";
 	};
-	if_feature "opengl"
+	if_feature "libjpeg"
 	{
-		require "opengl";
+		build_info
+		{
+			library "jpeg";
+		};
 	};
 
-	if_arch "!windows"
+	if_arch "darwin"
 	{
-		feature "xf86vidmode" "Include support for video mode switching with xf86vidmode";
-		if_feature "xf86vidmode"
+		feature "quartz" "Include Quartz support for loading image files"
+		{
+			default "yes";
+		};
+		if_feature "quartz"
 		{
 			build_info
 			{
-				library "Xxf86vm";
+				library "ApplicationServices.framework";
 			};
 		};
 	};
 
+	feature "opengl" "Include support for OpenGL contexts"
+	{
+		default "yes";
+	};
+	if_feature "opengl"
+	{
+		require "opengl";
+	};
+
+	if_arch "!windows & !darwin"
+	{
+		feature "xrandr" "Include support for video mode switching with XRandR";
+		if_feature "xrandr"
+		{
+			require "xrandr";
+		};
+	};
+
 	library "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 "windows"
 		{
 			overlay "windows";
@@ -65,7 +112,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"