diff options
| author | Volker Grabsch <vog@notjusthosting.com> | 2012-04-12 15:23:12 (GMT) |
|---|---|---|
| committer | Volker Grabsch <vog@notjusthosting.com> | 2012-04-12 15:23:12 (GMT) |
| commit | 1f86817ee82b162a1a5bd495886183ca81a68ba7 (patch) | |
| tree | 3116df65f83174295af8c6315a36583f460fe9e0 /src/freeglut-1-fixes.patch | |
| parent | 0f01e5e88f720fe5073c88f5cf1803d5c283904d (diff) | |
| parent | e513258770cdc39c0d6a904437f191aa61b3175c (diff) | |
| download | mxe-2.22.zip mxe-2.22.tar.gz mxe-2.22.tar.bz2 | |
Merge all well-tested changes into the stable branchv2.22
Diffstat (limited to 'src/freeglut-1-fixes.patch')
| -rw-r--r-- | src/freeglut-1-fixes.patch | 65 |
1 files changed, 65 insertions, 0 deletions
diff --git a/src/freeglut-1-fixes.patch b/src/freeglut-1-fixes.patch new file mode 100644 index 0000000..8f31b37 --- /dev/null +++ b/src/freeglut-1-fixes.patch @@ -0,0 +1,65 @@ +This file is part of MXE. +See index.html for further information. + +Contains ad hoc patches for cross building. + +From 87a791a05687c7737d1c50381a0de30ba1acf96e Mon Sep 17 00:00:00 2001 +From: MXE +Date: Mon, 24 Oct 2011 09:40:10 +0200 +Subject: [PATCH] add pkg-config support + +based on +http://old.nabble.com/-PATCH--Add-pkgconfig-file-td23312302.html + +proposed to upstream +https://sourceforge.net/tracker/?func=detail&aid=3511842&group_id=1032&atid=101032 +--- + Makefile.am | 3 +++ + configure.ac | 1 + + glut.pc.in | 12 ++++++++++++ + 3 files changed, 16 insertions(+), 0 deletions(-) + create mode 100644 glut.pc.in + +diff --git a/Makefile.am b/Makefile.am +index 39c5628..b504bc6 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -68,3 +68,6 @@ dist-hook: + + libtool: $(LIBTOOL_DEPS) + $(SHELL) ./config.status --recheck ++ ++pkgconfigdir = $(libdir)/pkgconfig ++pkgconfig_DATA = glut.pc +diff --git a/configure.ac b/configure.ac +index 15dc997..2f25bcb 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -119,5 +119,6 @@ AC_CONFIG_FILES([ + progs/demos/spaceball/Makefile + progs/demos/subwin/Makefile + src/Makefile ++ glut.pc + ]) + AC_OUTPUT +diff --git a/glut.pc.in b/glut.pc.in +new file mode 100644 +index 0000000..ea57c4a +--- /dev/null ++++ b/glut.pc.in +@@ -0,0 +1,12 @@ ++prefix=@prefix@ ++exec_prefix=@exec_prefix@ ++libdir=@libdir@ ++includedir=@includedir@/@PACKAGE@ ++ ++Name: glut ++Description: A freely licensed alternative to the GLUT library ++Version: @VERSION@ ++Libs: -L${libdir} -lglut ++Libs.private: -lglu32 -lopengl32 -lwinmm -lgdi32 -mwindows ++Cflags: -DFREEGLUT_STATIC -I${includedir} ++ +-- +1.7.8 + |