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/opencsg-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/opencsg-1-fixes.patch')
| -rw-r--r-- | src/opencsg-1-fixes.patch | 46 |
1 files changed, 46 insertions, 0 deletions
diff --git a/src/opencsg-1-fixes.patch b/src/opencsg-1-fixes.patch new file mode 100644 index 0000000..e0d3fd9 --- /dev/null +++ b/src/opencsg-1-fixes.patch @@ -0,0 +1,46 @@ +This file is part of MXE. +See index.html for further information. + +Contains ad hoc patches for cross building. + +From 71c4f0a34399fd74d4e39f9985a4c2c56f8b9a43 Mon Sep 17 00:00:00 2001 +From: MXE +Date: Sat, 22 Oct 2011 01:29:03 +0200 +Subject: [PATCH] configure for MXE + + +diff --git a/example/example.pro b/example/example.pro +index 8891a28..02c1fe0 100644 +--- a/example/example.pro ++++ b/example/example.pro +@@ -1,10 +1,11 @@ + TEMPLATE = app + TARGET = opencsgexample + +-CONFIG += opengl warn_on release ++CONFIG += opengl warn_on release link_pkgconfig + INCLUDEPATH += ../glew/include ../include + +-LIBS += -L../lib -lopencsg -lglut -L../glew/lib -lGLEW ++LIBS += -L../lib -lopencsg ++PKGCONFIG += glew glut + + HEADERS = displaylistPrimitive.h + SOURCES = displaylistPrimitive.cpp main.cpp +diff --git a/src/src.pro b/src/src.pro +index db5e1fb..4c664ab 100644 +--- a/src/src.pro ++++ b/src/src.pro +@@ -3,7 +3,8 @@ TARGET = opencsg + VERSION = 1.3.1 + DESTDIR = ../lib + +-CONFIG += opengl warn_on release ++CONFIG += opengl warn_on release staticlib link_pkgconfig ++PKGCONFIG += glew glut + INCLUDEPATH += ../include ../glew/include ../ + + HEADERS = ../include/opencsg.h \ +-- +1.7.7 + |