Mercurial > mxe-octave

annotate src/opencsg-1-fixes.patch @ 2030:e85998eb5167

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
style improvements for package opencsg
author Mark Brand <mabrand@mabrand.nl>
date Sat, 22 Oct 2011 01:36:24 +0200
parents
children 62b023062c78
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
2030
e85998eb5167 style improvements for package opencsg
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
1 This file is part of mingw-cross-env.
e85998eb5167 style improvements for package opencsg
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
2 See doc/index.html for further information.
e85998eb5167 style improvements for package opencsg
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
3
e85998eb5167 style improvements for package opencsg
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
4 Contains ad hoc patches for cross building.
e85998eb5167 style improvements for package opencsg
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
5
e85998eb5167 style improvements for package opencsg
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
6 From c4856742f7d5022fbdcd3ee57849cee4e6d8535f Mon Sep 17 00:00:00 2001
e85998eb5167 style improvements for package opencsg
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
7 From: mingw-cross-env
e85998eb5167 style improvements for package opencsg
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
8 Date: Sat, 22 Oct 2011 01:29:03 +0200
e85998eb5167 style improvements for package opencsg
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
9 Subject: [PATCH] configure for mingw-cross-env
e85998eb5167 style improvements for package opencsg
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
10
e85998eb5167 style improvements for package opencsg
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
11
e85998eb5167 style improvements for package opencsg
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
12 diff --git a/example/example.pro b/example/example.pro
e85998eb5167 style improvements for package opencsg
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
13 index 8891a28..6c88ee6 100644
e85998eb5167 style improvements for package opencsg
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
14 --- a/example/example.pro
e85998eb5167 style improvements for package opencsg
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
15 +++ b/example/example.pro
e85998eb5167 style improvements for package opencsg
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
16 @@ -1,10 +1,12 @@
e85998eb5167 style improvements for package opencsg
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
17 TEMPLATE = app
e85998eb5167 style improvements for package opencsg
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
18 -TARGET = opencsgexample
e85998eb5167 style improvements for package opencsg
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
19 +TARGET = test-opencsg
e85998eb5167 style improvements for package opencsg
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
20 +Release:DESTDIR = /home/brand/projects/mingw-cross-env.dev/local/usr/i686-pc-mingw32/bin/
e85998eb5167 style improvements for package opencsg
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
21
e85998eb5167 style improvements for package opencsg
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
22 CONFIG += opengl warn_on release
e85998eb5167 style improvements for package opencsg
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
23 INCLUDEPATH += ../glew/include ../include
e85998eb5167 style improvements for package opencsg
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
24
e85998eb5167 style improvements for package opencsg
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
25 -LIBS += -L../lib -lopencsg -lglut -L../glew/lib -lGLEW
e85998eb5167 style improvements for package opencsg
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
26 +LIBS += -L../lib -lopencsg -lglut -L../glew/lib -lGLEW -lglut -lglu32 -lopengl32 -lwinmm -lgdi32
e85998eb5167 style improvements for package opencsg
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
27 +DEFINES += FREEGLUT_STATIC GLEW_STATIC
e85998eb5167 style improvements for package opencsg
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
28
e85998eb5167 style improvements for package opencsg
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
29 HEADERS = displaylistPrimitive.h
e85998eb5167 style improvements for package opencsg
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
30 SOURCES = displaylistPrimitive.cpp main.cpp
e85998eb5167 style improvements for package opencsg
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
31 diff --git a/src/src.pro b/src/src.pro
e85998eb5167 style improvements for package opencsg
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
32 index db5e1fb..e121df1 100644
e85998eb5167 style improvements for package opencsg
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
33 --- a/src/src.pro
e85998eb5167 style improvements for package opencsg
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
34 +++ b/src/src.pro
e85998eb5167 style improvements for package opencsg
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
35 @@ -3,7 +3,8 @@ TARGET = opencsg
e85998eb5167 style improvements for package opencsg
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
36 VERSION = 1.3.1
e85998eb5167 style improvements for package opencsg
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
37 DESTDIR = ../lib
e85998eb5167 style improvements for package opencsg
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
38
e85998eb5167 style improvements for package opencsg
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
39 -CONFIG += opengl warn_on release
e85998eb5167 style improvements for package opencsg
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
40 +CONFIG += opengl warn_on release staticlib
e85998eb5167 style improvements for package opencsg
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
41 +DEFINES += FREEGLUT_STATIC GLEW_STATIC
e85998eb5167 style improvements for package opencsg
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
42 INCLUDEPATH += ../include ../glew/include ../
e85998eb5167 style improvements for package opencsg
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
43
e85998eb5167 style improvements for package opencsg
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
44 HEADERS = ../include/opencsg.h \
e85998eb5167 style improvements for package opencsg
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
45 --
e85998eb5167 style improvements for package opencsg
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
46 1.7.7
e85998eb5167 style improvements for package opencsg
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
47