Mercurial > mxe-octave
annotate src/opencsg-1-fixes.patch @ 4733:1ecb1e67eaa1
* src/src-msys-dos2unix.mk: update checksum
author | John Donoghue <john.donoghue@ieee.org> |
---|---|
date | Sat, 09 Jun 2018 10:13:46 -0400 |
parents | 99516e73b368 |
children |
rev | line source |
---|---|
2333
f653602a0500
Rebrand to new project name MXE
Volker Grabsch <vog@notjusthosting.com>
parents:
2041
diff
changeset
|
1 This file is part of MXE. |
2353
99516e73b368
Move doc/index.html -> index.html
Volker Grabsch <vog@notjusthosting.com>
parents:
2333
diff
changeset
|
2 See index.html for further information. |
2030
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 |
2041
eb4ed6ec6e8c
package opencsg: use pkg-config
Mark Brand <mabrand@mabrand.nl>
parents:
2036
diff
changeset
|
6 From 71c4f0a34399fd74d4e39f9985a4c2c56f8b9a43 Mon Sep 17 00:00:00 2001 |
2333
f653602a0500
Rebrand to new project name MXE
Volker Grabsch <vog@notjusthosting.com>
parents:
2041
diff
changeset
|
7 From: MXE |
2030
e85998eb5167
style improvements for package opencsg
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
8 Date: Sat, 22 Oct 2011 01:29:03 +0200 |
2333
f653602a0500
Rebrand to new project name MXE
Volker Grabsch <vog@notjusthosting.com>
parents:
2041
diff
changeset
|
9 Subject: [PATCH] configure for MXE |
2030
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 |
2041
eb4ed6ec6e8c
package opencsg: use pkg-config
Mark Brand <mabrand@mabrand.nl>
parents:
2036
diff
changeset
|
13 index 8891a28..02c1fe0 100644 |
2030
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 |
2036
62b023062c78
remove hard coded path in opencsg patch
Brad Pitcher <bradpitcher@gmail.com>
parents:
2030
diff
changeset
|
16 @@ -1,10 +1,11 @@ |
2041
eb4ed6ec6e8c
package opencsg: use pkg-config
Mark Brand <mabrand@mabrand.nl>
parents:
2036
diff
changeset
|
17 TEMPLATE = app |
eb4ed6ec6e8c
package opencsg: use pkg-config
Mark Brand <mabrand@mabrand.nl>
parents:
2036
diff
changeset
|
18 TARGET = opencsgexample |
2030
e85998eb5167
style improvements for package opencsg
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
19 |
2041
eb4ed6ec6e8c
package opencsg: use pkg-config
Mark Brand <mabrand@mabrand.nl>
parents:
2036
diff
changeset
|
20 -CONFIG += opengl warn_on release |
eb4ed6ec6e8c
package opencsg: use pkg-config
Mark Brand <mabrand@mabrand.nl>
parents:
2036
diff
changeset
|
21 +CONFIG += opengl warn_on release link_pkgconfig |
2030
e85998eb5167
style improvements for package opencsg
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
22 INCLUDEPATH += ../glew/include ../include |
e85998eb5167
style improvements for package opencsg
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
23 |
e85998eb5167
style improvements for package opencsg
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
24 -LIBS += -L../lib -lopencsg -lglut -L../glew/lib -lGLEW |
2041
eb4ed6ec6e8c
package opencsg: use pkg-config
Mark Brand <mabrand@mabrand.nl>
parents:
2036
diff
changeset
|
25 +LIBS += -L../lib -lopencsg |
eb4ed6ec6e8c
package opencsg: use pkg-config
Mark Brand <mabrand@mabrand.nl>
parents:
2036
diff
changeset
|
26 +PKGCONFIG += glew glut |
2030
e85998eb5167
style improvements for package opencsg
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
27 |
e85998eb5167
style improvements for package opencsg
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
28 HEADERS = displaylistPrimitive.h |
e85998eb5167
style improvements for package opencsg
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
29 SOURCES = displaylistPrimitive.cpp main.cpp |
e85998eb5167
style improvements for package opencsg
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
30 diff --git a/src/src.pro b/src/src.pro |
2041
eb4ed6ec6e8c
package opencsg: use pkg-config
Mark Brand <mabrand@mabrand.nl>
parents:
2036
diff
changeset
|
31 index db5e1fb..4c664ab 100644 |
2030
e85998eb5167
style improvements for package opencsg
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
32 --- a/src/src.pro |
e85998eb5167
style improvements for package opencsg
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
33 +++ b/src/src.pro |
e85998eb5167
style improvements for package opencsg
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
34 @@ -3,7 +3,8 @@ TARGET = opencsg |
e85998eb5167
style improvements for package opencsg
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
35 VERSION = 1.3.1 |
e85998eb5167
style improvements for package opencsg
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
36 DESTDIR = ../lib |
e85998eb5167
style improvements for package opencsg
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
37 |
e85998eb5167
style improvements for package opencsg
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
38 -CONFIG += opengl warn_on release |
2041
eb4ed6ec6e8c
package opencsg: use pkg-config
Mark Brand <mabrand@mabrand.nl>
parents:
2036
diff
changeset
|
39 +CONFIG += opengl warn_on release staticlib link_pkgconfig |
eb4ed6ec6e8c
package opencsg: use pkg-config
Mark Brand <mabrand@mabrand.nl>
parents:
2036
diff
changeset
|
40 +PKGCONFIG += glew glut |
2030
e85998eb5167
style improvements for package opencsg
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
41 INCLUDEPATH += ../include ../glew/include ../ |
e85998eb5167
style improvements for package opencsg
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
42 |
e85998eb5167
style improvements for package opencsg
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
43 HEADERS = ../include/opencsg.h \ |
e85998eb5167
style improvements for package opencsg
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
44 -- |
e85998eb5167
style improvements for package opencsg
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
45 1.7.7 |
e85998eb5167
style improvements for package opencsg
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
46 |