Mercurial > mxe-octave
annotate src/qwtplot3d-1-fixes.patch @ 3880:e83bb1459c0f
ogg: update to v1.3.2
* src/ogg.mk: update version, checksum
author | John Donoghue |
---|---|
date | Fri, 03 Apr 2015 15:59:45 -0400 |
parents | 99516e73b368 |
children |
rev | line source |
---|---|
2333
f653602a0500
Rebrand to new project name MXE
Volker Grabsch <vog@notjusthosting.com>
parents:
2024
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. |
2024 | 3 |
4 Contains ad hoc patches for cross building. | |
5 | |
6 From 0ee512abc5ac926ebe37ea50ecac9c314efd8f53 Mon Sep 17 00:00:00 2001 | |
2333
f653602a0500
Rebrand to new project name MXE
Volker Grabsch <vog@notjusthosting.com>
parents:
2024
diff
changeset
|
7 From: MXE |
2024 | 8 Date: Thu, 20 Oct 2011 21:05:36 +0200 |
9 Subject: [PATCH 1/4] add missing #include <cstdio> | |
10 | |
11 | |
12 diff --git a/src/qwt3d_function.cpp b/src/qwt3d_function.cpp | |
13 index 28d874e..72f93a9 100644 | |
14 --- a/src/qwt3d_function.cpp | |
15 +++ b/src/qwt3d_function.cpp | |
16 @@ -1,3 +1,4 @@ | |
17 +#include <cstdio> | |
18 #include "qwt3d_surfaceplot.h" | |
19 #include "qwt3d_function.h" | |
20 | |
21 -- | |
22 1.7.7 | |
23 | |
24 | |
25 From 252126201db746fd5772e0ac201d7975aa705236 Mon Sep 17 00:00:00 2001 | |
2333
f653602a0500
Rebrand to new project name MXE
Volker Grabsch <vog@notjusthosting.com>
parents:
2024
diff
changeset
|
26 From: MXE |
2024 | 27 Date: Thu, 20 Oct 2011 21:06:42 +0200 |
28 Subject: [PATCH 2/4] add missing #include <GL/glu.h> | |
29 | |
30 We use symbols defined in this header. | |
31 Should not rely on Qt to include this file indirectly. | |
32 | |
33 diff --git a/include/qwt3d_openglhelper.h b/include/qwt3d_openglhelper.h | |
34 index e5499c2..48052ae 100644 | |
35 --- a/include/qwt3d_openglhelper.h | |
36 +++ b/include/qwt3d_openglhelper.h | |
37 @@ -1,3 +1,4 @@ | |
38 +#include <GL/glu.h> | |
39 #ifndef __openglhelper_2003_06_06_15_49__ | |
40 #define __openglhelper_2003_06_06_15_49__ | |
41 | |
42 -- | |
43 1.7.7 | |
44 | |
45 | |
46 From ac2860d954caeac6ce7701a0ee196e1533bc047e Mon Sep 17 00:00:00 2001 | |
2333
f653602a0500
Rebrand to new project name MXE
Volker Grabsch <vog@notjusthosting.com>
parents:
2024
diff
changeset
|
47 From: MXE |
2024 | 48 Date: Thu, 20 Oct 2011 21:22:24 +0200 |
2333
f653602a0500
Rebrand to new project name MXE
Volker Grabsch <vog@notjusthosting.com>
parents:
2024
diff
changeset
|
49 Subject: [PATCH 3/4] configure project for MXE |
2024 | 50 |
51 | |
52 diff --git a/qwtplot3d.pro b/qwtplot3d.pro | |
53 index d4fa0c1..94f92ee 100644 | |
54 --- a/qwtplot3d.pro | |
55 +++ b/qwtplot3d.pro | |
56 @@ -3,7 +3,7 @@ | |
57 | |
58 TARGET = qwtplot3d | |
59 TEMPLATE = lib | |
60 -CONFIG += qt warn_on opengl thread zlib debug | |
61 +CONFIG += qt warn_on opengl thread zlib static release | |
62 MOC_DIR = tmp | |
63 OBJECTS_DIR = tmp | |
64 INCLUDEPATH = include | |
65 @@ -12,13 +12,13 @@ DESTDIR = lib | |
66 #DESTDIR = ../../../lib | |
67 QT += opengl | |
68 | |
69 -win32:TEMPLATE = vclib | |
70 -win32:CONFIG += dll exceptions | |
71 +#win32:TEMPLATE = vclib | |
72 +win32:CONFIG += exceptions | |
73 win32:dll:DEFINES += QT_DLL QWT3D_DLL QWT3D_MAKEDLL | |
74 win32:QMAKE_CXXFLAGS += $$QMAKE_CFLAGS_STL | |
75 | |
76 # Comment the next line, if you have zlib on your windows system | |
77 -win32:CONFIG -= zlib | |
78 +#win32:CONFIG -= zlib | |
79 | |
80 linux-g++:TMAKE_CXXFLAGS += -fno-exceptions | |
81 unix:VERSION = 0.2.6 | |
82 -- | |
83 1.7.7 | |
84 | |
85 | |
86 From 6a316d1844a2634ebc4374e1e9d01502204d8c7e Mon Sep 17 00:00:00 2001 | |
2333
f653602a0500
Rebrand to new project name MXE
Volker Grabsch <vog@notjusthosting.com>
parents:
2024
diff
changeset
|
87 From: MXE |
2024 | 88 Date: Thu, 20 Oct 2011 21:47:18 +0200 |
2333
f653602a0500
Rebrand to new project name MXE
Volker Grabsch <vog@notjusthosting.com>
parents:
2024
diff
changeset
|
89 Subject: [PATCH 4/4] fix building examples for MXE |
2024 | 90 |
91 | |
92 diff --git a/examples/common.pro b/examples/common.pro | |
93 index 2b7fb83..a89066d 100644 | |
94 --- a/examples/common.pro | |
95 +++ b/examples/common.pro | |
96 @@ -11,12 +11,12 @@ unix:LIBS += -lqwtplot3d -L../../lib | |
97 linux-g++:QMAKE_CXXFLAGS += -fno-exceptions | |
98 | |
99 win32{ | |
100 - LIBS += ../../lib/qwtplot3d.lib | |
101 - TEMPLATE = vcapp | |
102 - DEFINES += QT_DLL QWT3D_DLL | |
103 + LIBS += -L../../lib -lqwtplot3d | |
104 +# TEMPLATE = vcapp | |
105 +# DEFINES += QT_DLL QWT3D_DLL | |
106 RC_FILE = ../icon.rc | |
107 contains (CONFIG, debug) { | |
108 - QMAKE_LFLAGS += /NODEFAULTLIB:msvcrt | |
109 +# QMAKE_LFLAGS += /NODEFAULTLIB:msvcrt | |
110 } | |
111 | |
112 } | |
113 -- | |
114 1.7.7 | |
115 |