diff options
| author | Volker Grabsch <vog@notjusthosting.com> | 2011-11-15 15:43:58 (GMT) |
|---|---|---|
| committer | Volker Grabsch <vog@notjusthosting.com> | 2011-11-15 15:43:58 (GMT) |
| commit | 6ca88cec3aeaf2dda31e1a8c1038a1daf910b814 (patch) | |
| tree | d109604695f74f6d70875ce025838d4ab671672f /src/opencsg-1-fixes.patch | |
| parent | f2e6c5b0b7f88fe06c2b98870c241a4c190db213 (diff) | |
| parent | efaf6a291272dbb45ca7c891f3052ec46d6a8e87 (diff) | |
| download | mxe-6ca88cec3aeaf2dda31e1a8c1038a1daf910b814.zip mxe-6ca88cec3aeaf2dda31e1a8c1038a1daf910b814.tar.gz mxe-6ca88cec3aeaf2dda31e1a8c1038a1daf910b814.tar.bz2 | |
merge
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..02c8a83 --- /dev/null +++ b/src/opencsg-1-fixes.patch @@ -0,0 +1,46 @@ +This file is part of mingw-cross-env. +See doc/index.html for further information. + +Contains ad hoc patches for cross building. + +From 71c4f0a34399fd74d4e39f9985a4c2c56f8b9a43 Mon Sep 17 00:00:00 2001 +From: mingw-cross-env +Date: Sat, 22 Oct 2011 01:29:03 +0200 +Subject: [PATCH] configure for mingw-cross-env + + +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 + |