# HG changeset patch
# User John Tsiombikas <nuclear@siggraph.org>
# Date 1305352729 -10800
# Node ID 5efd62ff354ac4862d16a097059fcd2cc69f1c0f
# Parent  0b07dd867b2f7ff34ea19e472d05322033e98fbf
- configure now also heeds mac-framework: options in modules
- cleaned up the generated module.c a bit

diff -r 0b07dd867b2f -r 5efd62ff354a configure
--- a/configure	Sat May 14 08:33:41 2011 +0300
+++ b/configure	Sat May 14 08:58:49 2011 +0300
@@ -3,9 +3,19 @@
 cfgfile=src/config.h
 modfile=src/modules.c
 
+extract()
+{
+	grep "$2:" $1 | sed "s/^.*$2: \?\(.*\) \?\*\//\1/"
+}
+
 get_depline()
 {
-	grep 'link-with:' $1 | sed 's/^.*link-with: \?\(.*\) \?\*\//\1/'
+	extract $1 link-with
+}
+
+get_framework()
+{
+	extract $1 mac-framework
 }
 
 get_usedef()
@@ -30,6 +40,9 @@
 # write beginning of modules.c
 echo "/* this file is generated by $0, do not edit */" >$modfile
 echo >>$modfile
+echo '#define REGISTER_MODULE(name) \' >>$modfile
+echo '		do { void sgl_register_##name(); sgl_register_##name(); } while(0)' >>$modfile
+echo >>$modfile
 echo 'void sgl_modules_init(void)' >>$modfile
 echo '{' >>$modfile
 
@@ -45,7 +58,15 @@
 	def=`get_usedef $m`
 
 	# extract link-with line
-	dep=`get_depline $m`
+	if [ `uname -s` = Darwin ]; then
+		dep=`get_framework $m`
+		if [ -z "$dep" ]; then
+			dep=`get_depline $m`
+		fi
+	else
+		dep=`get_depline $m`
+	fi
+
 	name=`echo $m | sort | sed 's/src\/wsys_//' | sed 's/\.c//'`
 	echo -n "-> trying module $name (needs: $dep) ... "
 
@@ -59,9 +80,7 @@
 		echo >>$cfgfile
 
 		# make the registration call in modules.c
-		echo "	void sgl_register_$name();" >>$modfile
-		echo "	sgl_register_$name();" >>$modfile
-		echo >>$modfile
+		echo "	REGISTER_MODULE($name);" >>$modfile
 	else
 		echo failed
 	fi
diff -r 0b07dd867b2f -r 5efd62ff354a src/wsys_x11.c
--- a/src/wsys_x11.c	Sat May 14 08:33:41 2011 +0300
+++ b/src/wsys_x11.c	Sat May 14 08:58:49 2011 +0300
@@ -1,5 +1,5 @@
 /* SimplyGL window system module for X11/GLX */
-/* link-with: -lX12 */
+/* link-with: -lX11 */
 
 #include "config.h"