1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
|
diff -Naur linden.orig/indra/SConstruct linden/indra/SConstruct
--- linden.orig/indra/SConstruct 2007-11-30 07:47:10.000000000 +0900
+++ linden/indra/SConstruct 2008-01-29 00:35:06.000000000 +0900
@@ -112,7 +112,7 @@
channel = optenv['CHANNEL']
standalone = optenv['STANDALONE']
opensource = standalone or optenv['OPENSOURCE']
-enable_fmod = not opensource and optenv['FMOD']
+enable_fmod = optenv['FMOD']
elfio = optenv['ELFIO']
targets = [ target_param ]
@@ -135,6 +135,7 @@
'gdk-pixbuf-2.0',
'glib-2.0',
'gmodule-2.0',
+ 'gthread-2.0',
'gtk+-2.0',
'libpng',
'pango',
@@ -155,6 +156,9 @@
'libssl',
]
+if enable_gstreamer:
+ standalone_pkgs += [ 'gstreamer-0.10' ]
+
def pkgconfig(opt, pkgs=None):
if pkgs is None:
pkgs = standalone_pkgs + standalone_net_pkgs
@@ -243,7 +247,7 @@
##############
# Generic GCC flags
- cflags = '-g -pipe -Wall -Wno-reorder -Wno-trigraphs -Wno-sign-compare -Werror -fexceptions '
+ cflags = '-g -pipe -Wall -Wno-reorder -Wno-trigraphs -Wno-sign-compare -fexceptions '
cxxflags = ''
cppflags = '-D_FORTIFY_SOURCE=2 '
if standalone:
diff -Naur linden.orig/indra/llimagej2coj/llimagej2coj.cpp linden/indra/llimagej2coj/llimagej2coj.cpp
--- linden.orig/indra/llimagej2coj/llimagej2coj.cpp 2007-11-30 07:47:11.000000000 +0900
+++ linden/indra/llimagej2coj/llimagej2coj.cpp 2008-01-29 00:34:21.000000000 +0900
@@ -33,7 +33,7 @@
#include "llimagej2coj.h"
// this is defined so that we get static linking.
-#include "openjpeg/openjpeg.h"
+#include "openjpeg.h"
#include "lltimer.h"
#include "llmemory.h"
diff -Naur linden.orig/indra/llmath/llquaternion.cpp linden/indra/llmath/llquaternion.cpp
--- linden.orig/indra/llmath/llquaternion.cpp 2007-11-30 07:47:11.000000000 +0900
+++ linden/indra/llmath/llquaternion.cpp 2008-01-29 00:34:21.000000000 +0900
@@ -698,22 +698,22 @@
{
default:
case LLQuaternion::XYZ:
- p = "XYZ";
+ strcpy(p, "XYZ");
break;
case LLQuaternion::YZX:
- p = "YZX";
+ strcpy(p, "YZX");
break;
case LLQuaternion::ZXY:
- p = "ZXY";
+ strcpy(p, "ZXY");
break;
case LLQuaternion::XZY:
- p = "XZY";
+ strcpy(p, "XZY");
break;
case LLQuaternion::YXZ:
- p = "YXZ";
+ strcpy(p, "YXZ");
break;
case LLQuaternion::ZYX:
- p = "ZYX";
+ strcpy(p, "ZYX");
break;
}
return p;
diff -Naur linden.orig/indra/llwindow/llgl.cpp linden/indra/llwindow/llgl.cpp
--- linden.orig/indra/llwindow/llgl.cpp 2007-11-30 07:47:12.000000000 +0900
+++ linden/indra/llwindow/llgl.cpp 2008-01-29 00:34:21.000000000 +0900
@@ -64,7 +64,7 @@
# include "GL/glxext.h"
// Use glXGetProcAddressARB instead of glXGetProcAddress - the ARB symbol
// is considered 'legacy' but works on more machines.
-# define GLH_EXT_GET_PROC_ADDRESS(p) glXGetProcAddressARB((const GLubyte*)(p))
+# define GLH_EXT_GET_PROC_ADDRESS(p) glXGetProcAddress((const GLubyte*)(p))
#endif // LL_LINUX && !LL_MESA_HEADLESS
diff -Naur linden.orig/indra/newview/llvoiceclient.cpp linden/indra/newview/llvoiceclient.cpp
--- linden.orig/indra/newview/llvoiceclient.cpp 2007-11-30 07:47:17.000000000 +0900
+++ linden/indra/newview/llvoiceclient.cpp 2008-01-29 00:34:21.000000000 +0900
@@ -39,7 +39,7 @@
#include "llvoavatar.h"
#include "llbufferstream.h"
#include "llfile.h"
-#include "expat/expat.h"
+#include "expat.h"
#include "llcallbacklist.h"
#include "llviewerregion.h"
#include "llviewernetwork.h" // for gUserServerChoice
|
GitWeb