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
108
|
diff -Naur linden.orig/indra/SConstruct linden/indra/SConstruct
--- linden.orig/indra/SConstruct 2007-09-15 05:53:52.000000000 +0900
+++ linden/indra/SConstruct 2007-09-16 01:36:13.000000000 +0900
@@ -111,7 +111,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 ]
@@ -134,6 +134,7 @@
'gdk-pixbuf-2.0',
'glib-2.0',
'gmodule-2.0',
+ 'gthread-2.0',
'gtk+-2.0',
'libpng',
'pango',
@@ -154,6 +155,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
@@ -610,7 +614,7 @@
net_external_libs = [ 'curl', 'ssl', 'crypto', 'aprutil-1', 'apr-1' ]
net_external_libs += [ 'cares', 'expat' ]
- common_external_libs = net_external_libs + [ 'xmlrpc-epi', 'z' ]
+ common_external_libs = net_external_libs + [ 'xmlrpc', 'z' ]
if build_target == 'client':
if platform == 'linux':
@@ -753,7 +757,7 @@
internal_libs + external_libs)
# Rpcserver
- external_libs = common_external_libs + ['xmlrpc-epi', 'mysqlclient']
+ external_libs = common_external_libs + ['xmlrpc', 'mysqlclient']
internal_libs = ['llscene', 'llmessage', 'lldatabase', 'llvfs',
'llmath', 'llcommon']
create_executable('rpcserver/rpcserver' + file_suffix, 'rpcserver',
diff -Naur linden.orig/indra/llimagej2coj/llimagej2coj.cpp linden/indra/llimagej2coj/llimagej2coj.cpp
--- linden.orig/indra/llimagej2coj/llimagej2coj.cpp 2007-09-15 05:53:53.000000000 +0900
+++ linden/indra/llimagej2coj/llimagej2coj.cpp 2007-09-16 01:33:57.000000000 +0900
@@ -31,7 +31,7 @@
// this is defined so that we get static linking.
#define OPJ_STATIC
-#include "openjpeg/openjpeg.h"
+#include "openjpeg.h"
#include "lltimer.h"
#include "llmemory.h"
diff -Naur linden.orig/indra/llmessage/llfiltersd2xmlrpc.cpp linden/indra/llmessage/llfiltersd2xmlrpc.cpp
--- linden.orig/indra/llmessage/llfiltersd2xmlrpc.cpp 2007-09-15 05:53:53.000000000 +0900
+++ linden/indra/llmessage/llfiltersd2xmlrpc.cpp 2007-09-16 01:33:57.000000000 +0900
@@ -77,7 +77,7 @@
#include <sstream>
#include <iterator>
-#include <xmlrpc-epi/xmlrpc.h>
+#include <xmlrpc.h>
#include "apr-1/apr_base64.h"
#include "llbuffer.h"
diff -Naur linden.orig/indra/newview/lluserauth.cpp linden/indra/newview/lluserauth.cpp
--- linden.orig/indra/newview/lluserauth.cpp 2007-09-15 05:53:58.000000000 +0900
+++ linden/indra/newview/lluserauth.cpp 2007-09-16 01:33:57.000000000 +0900
@@ -42,7 +42,7 @@
// NOTE: MUST include these after otherincludes since queue gets redefined!?!!
#include <curl/curl.h>
-#include <xmlrpc-epi/xmlrpc.h>
+#include <xmlrpc.h>
diff -Naur linden.orig/indra/newview/llvoiceclient.cpp linden/indra/newview/llvoiceclient.cpp
--- linden.orig/indra/newview/llvoiceclient.cpp 2007-09-15 05:53:59.000000000 +0900
+++ linden/indra/newview/llvoiceclient.cpp 2007-09-16 01:33:57.000000000 +0900
@@ -36,7 +36,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
diff -Naur linden.orig/indra/newview/llxmlrpctransaction.cpp linden/indra/newview/llxmlrpctransaction.cpp
--- linden.orig/indra/newview/llxmlrpctransaction.cpp 2007-09-15 05:53:59.000000000 +0900
+++ linden/indra/newview/llxmlrpctransaction.cpp 2007-09-16 01:33:57.000000000 +0900
@@ -34,7 +34,7 @@
// Have to include these last to avoid queue redefinition!
#include <curl/curl.h>
-#include <xmlrpc-epi/xmlrpc.h>
+#include <xmlrpc.h>
#include "viewer.h"
|
GitWeb