Mercurial > mxe-octave
changeset 2041:eb4ed6ec6e8c
package opencsg: use pkg-config
| author | Mark Brand <mabrand@mabrand.nl> |
|---|---|
| date | Mon, 24 Oct 2011 11:01:54 +0200 |
| parents | 8b909011187a |
| children | 1b67fb0c1fb7 d82c8cc0bfac |
| files | src/opencsg-1-fixes.patch |
| diffstat | 1 files changed, 11 insertions(+), 10 deletions(-) [+] |
line wrap: on
line diff
--- a/src/opencsg-1-fixes.patch Mon Oct 24 10:59:15 2011 +0200 +++ b/src/opencsg-1-fixes.patch Mon Oct 24 11:01:54 2011 +0200 @@ -3,31 +3,32 @@ 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 @@ 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 \