diff options
| author | Mark Brand <mabrand@mabrand.nl> | 2011-10-24 09:01:54 (GMT) |
|---|---|---|
| committer | Mark Brand <mabrand@mabrand.nl> | 2011-10-24 09:01:54 (GMT) |
| commit | 4a7b5872f84262f86443488ea847642b7b540ae9 (patch) | |
| tree | e4a2758505f4aa0faa02ef374cf110b7b7f7e831 | |
| parent | 36de0879b7496f4ebd4b7814f166d8c4bd3e35a7 (diff) | |
| download | mxe-4a7b5872f84262f86443488ea847642b7b540ae9.zip mxe-4a7b5872f84262f86443488ea847642b7b540ae9.tar.gz mxe-4a7b5872f84262f86443488ea847642b7b540ae9.tar.bz2 | |
package opencsg: use pkg-config
| -rw-r--r-- | src/opencsg-1-fixes.patch | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/src/opencsg-1-fixes.patch b/src/opencsg-1-fixes.patch index 0a639af..02c8a83 100644 --- a/src/opencsg-1-fixes.patch +++ b/src/opencsg-1-fixes.patch @@ -3,31 +3,32 @@ See doc/index.html for further information. Contains ad hoc patches for cross building. -From c4856742f7d5022fbdcd3ee57849cee4e6d8535f Mon Sep 17 00:00:00 2001 +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..6c88ee6 100644 +index 8891a28..02c1fe0 100644 --- a/example/example.pro +++ b/example/example.pro @@ -1,10 +1,11 @@ - TEMPLATE = app - TARGET = opencsgexample + TEMPLATE = app + TARGET = opencsgexample - CONFIG += opengl warn_on release +-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 -lglut -L../glew/lib -lGLEW -lglut -lglu32 -lopengl32 -lwinmm -lgdi32 -+DEFINES += FREEGLUT_STATIC GLEW_STATIC ++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..e121df1 100644 +index db5e1fb..4c664ab 100644 --- a/src/src.pro +++ b/src/src.pro @@ -3,7 +3,8 @@ TARGET = opencsg @@ -35,8 +36,8 @@ index db5e1fb..e121df1 100644 DESTDIR = ../lib -CONFIG += opengl warn_on release -+CONFIG += opengl warn_on release staticlib -+DEFINES += FREEGLUT_STATIC GLEW_STATIC ++CONFIG += opengl warn_on release staticlib link_pkgconfig ++PKGCONFIG += glew glut INCLUDEPATH += ../include ../glew/include ../ HEADERS = ../include/opencsg.h \ |