From bfc6be49a459fd9f9f7151530bc10b45c4258f20 Mon Sep 17 00:00:00 2001
From: Tony Theodore <tonyt@logyst.com>
Date: Mon, 10 Feb 2014 20:03:51 +1100
Subject: packages freeglut ftgl: add shared builds

---
 src/freeglut-1-fixes.patch | 5 +++--
 src/freeglut.mk            | 7 ++-----
 src/ftgl.mk                | 6 ++----
 3 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/src/freeglut-1-fixes.patch b/src/freeglut-1-fixes.patch
index 1117b96..c739834 100644
--- a/src/freeglut-1-fixes.patch
+++ b/src/freeglut-1-fixes.patch
@@ -41,7 +41,7 @@ new file mode 100644
 index 0000000..ea57c4a
 --- /dev/null
 +++ b/glut.pc.in
-@@ -0,0 +1,12 @@
+@@ -0,0 +1,13 @@
 +prefix=@prefix@
 +exec_prefix=@exec_prefix@
 +libdir=@libdir@
@@ -52,7 +52,8 @@ index 0000000..ea57c4a
 +Version: @VERSION@
 +Libs: -L${libdir} -lglut
 +Libs.private: -lglu32 -lopengl32 -lwinmm -lgdi32 -mwindows
-+Cflags: -DFREEGLUT_STATIC -I${includedir}
++Cflags: -I${includedir}
++Cflags.private: -DFREEGLUT_STATIC
 +
 -- 
 1.8.1.4
diff --git a/src/freeglut.mk b/src/freeglut.mk
index 56701d0..d9f30e1 100644
--- a/src/freeglut.mk
+++ b/src/freeglut.mk
@@ -19,14 +19,11 @@ endef
 define $(PKG)_BUILD
     cd '$(1)' && ./autogen.sh
     cd '$(1)' && ./configure \
-        --host='$(TARGET)' \
-        --build="`config.guess`" \
-        --disable-shared \
-        --prefix='$(PREFIX)/$(TARGET)' \
+        $(MXE_CONFIGURE_OPTS) \
         --enable-replace-glut \
         --disable-debug \
         --without-x
-    $(MAKE) -C '$(1)' -j '$(JOBS)' install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= EXPORT_FLAGS='-DFREEGLUT_STATIC'
+    $(MAKE) -C '$(1)' -j '$(JOBS)' install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= $(if $(BUILD_STATIC),EXPORT_FLAGS='-DFREEGLUT_STATIC')
 
     '$(TARGET)-gcc' \
         -W -Wall -Werror -ansi -pedantic \
diff --git a/src/ftgl.mk b/src/ftgl.mk
index 6fcf0bb..b3a2554 100644
--- a/src/ftgl.mk
+++ b/src/ftgl.mk
@@ -22,9 +22,7 @@ define $(PKG)_BUILD
     cd '$(1)' && automake --gnu
     cd '$(1)' && autoconf
     cd '$(1)' && ./configure \
-        --host='$(TARGET)' \
-        --disable-shared \
-        --prefix='$(PREFIX)/$(TARGET)' \
+        $(MXE_CONFIGURE_OPTS) \
         --without-x \
         --disable-freetypetest \
         --with-ft-prefix='$(PREFIX)/$(TARGET)'
@@ -35,5 +33,5 @@ define $(PKG)_BUILD
         -W -Wall -Werror -ansi \
         '$(2).c' -o '$(PREFIX)/$(TARGET)/bin/test-$(PKG).exe' \
         -lftgl -lm -lstdc++ \
-        `'$(TARGET)-pkg-config' freetype2 gl glu --cflags --libs --static`
+        `'$(TARGET)-pkg-config' freetype2 gl glu --cflags --libs`
 endef
-- 
cgit v0.12