Mercurial > mxe-octave
changeset 2030:e85998eb5167
style improvements for package opencsg
| author | Mark Brand <mabrand@mabrand.nl> |
|---|---|
| date | Sat, 22 Oct 2011 01:36:24 +0200 |
| parents | 36e64b79cb3a |
| children | 42ea60937f81 |
| files | src/opencsg-1-fixes.patch src/opencsg.mk |
| diffstat | 2 files changed, 51 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/opencsg-1-fixes.patch Sat Oct 22 01:36:24 2011 +0200 @@ -0,0 +1,47 @@ +This file is part of mingw-cross-env. +See doc/index.html for further information. + +Contains ad hoc patches for cross building. + +From c4856742f7d5022fbdcd3ee57849cee4e6d8535f 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 +--- a/example/example.pro ++++ b/example/example.pro +@@ -1,10 +1,12 @@ + TEMPLATE = app +-TARGET = opencsgexample ++TARGET = test-opencsg ++Release:DESTDIR = /home/brand/projects/mingw-cross-env.dev/local/usr/i686-pc-mingw32/bin/ + + CONFIG += opengl warn_on release + 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 + + HEADERS = displaylistPrimitive.h + SOURCES = displaylistPrimitive.cpp main.cpp +diff --git a/src/src.pro b/src/src.pro +index db5e1fb..e121df1 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 ++DEFINES += FREEGLUT_STATIC GLEW_STATIC + INCLUDEPATH += ../include ../glew/include ../ + + HEADERS = ../include/opencsg.h \ +-- +1.7.7 +
--- a/src/opencsg.mk Sat Oct 22 01:27:06 2011 +0200 +++ b/src/opencsg.mk Sat Oct 22 01:36:24 2011 +0200 @@ -20,11 +20,10 @@ endef define $(PKG)_BUILD - cd '$(1)/src' && $(SED) -i 's/release/release staticlib\nDEFINES += FREEGLUT_STATIC GLEW_STATIC/g' src.pro - cd '$(1)/example' && $(SED) -i 's,\(lGLEW\),\1 -lglut -lglu32 -lopengl32 -lwinmm -lgdi32\nDEFINES += FREEGLUT_STATIC GLEW_STATIC,g' example.pro - cd '$(1)/example' && $(SED) -i 's,opencsgexample,test-libopencsg\nRelease:DESTDIR = $(PREFIX)/$(TARGET)/bin/,g' example.pro - cd '$(1)/src' && '$(TARGET)-qmake' src.pro && $(MAKE) -C '$(1)/src' -j '$(JOBS)' - cd '$(1)/example' && '$(TARGET)-qmake' example.pro && $(MAKE) -C '$(1)/example' -j '$(JOBS)' + cd '$(1)/src' && '$(TARGET)-qmake' src.pro + $(MAKE) -C '$(1)/src' -j '$(JOBS)' + cd '$(1)/example' && '$(TARGET)-qmake' example.pro + $(MAKE) -C '$(1)/example' -j '$(JOBS)' $(INSTALL) -m644 '$(1)/lib/libopencsg.a' '$(PREFIX)/$(TARGET)/lib/' $(INSTALL) -m644 '$(1)/include/opencsg.h' '$(PREFIX)/$(TARGET)/include/' endef