[SCM] A client for connecting to 3D metaverses such as Linden Labs Secondlife(tm) and OpenSim grids branch, master, updated. upstream/1.20.8-31-g8f9aa30
Robin Cornelius
robin.cornelius at gmail.com
Thu Jun 26 10:02:43 UTC 2008
The following commit has been merged in the master branch:
commit bb75c43ab83dbe8482d65fba94818c6eb2711e6e
Author: Robin Cornelius <robin.cornelius at gmail.com>
Date: Wed Jun 25 13:05:42 2008 +0100
Fix SConstruct for git-buildpackage
diff --git a/indra/SConstruct b/indra/SConstruct
index 2583b79..78d0325 100644
--- a/indra/SConstruct
+++ b/indra/SConstruct
@@ -138,14 +138,21 @@ standalone_pkgs = [
'cairo',
'fontconfig',
'freetype2',
+ 'gdk-2.0',
+ 'gdk-pixbuf-2.0',
+ 'glib-2.0',
+ 'gmodule-2.0',
+ 'gthread-2.0',
'gtk+-2.0',
'libpng',
+ 'pango',
+ 'pangoft2',
+ 'pangox',
+ 'pangoxft',
'sdl',
'vorbis',
'vorbisenc',
'vorbisfile',
- 'openal',
- 'freealut',
]
standalone_net_pkgs = [
@@ -156,9 +163,6 @@ standalone_net_pkgs = [
'libssl',
]
-if enable_gstreamer:
- standalone_pkgs.append( 'gstreamer-0.10' )
-
def pkgconfig(opt, pkgs=None):
if pkgs is None:
pkgs = standalone_pkgs + standalone_net_pkgs
@@ -173,8 +177,6 @@ if standalone:
'packages: %s' % ' '.join(missing))
sys.exit(2)
-
-
#####################
# ITERATE TARGETS #
#####################
@@ -255,7 +257,7 @@ for build_target in targets:
# 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 -DLL_RELEASE_FOR_DOWNLOAD '
+ cflags = '-g -pipe -Wall -Wno-reorder -Wno-trigraphs -Wno-sign-compare -fexceptions '
cxxflags = ''
#cppflags = '-D_FORTIFY_SOURCE=2 '
cppflags = ''
@@ -301,7 +303,7 @@ for build_target in targets:
if standalone:
include_dirs += [d[2:] for d in
pkgconfig('--cflags-only-I').split()]
- client_external_libs += [ 'boost_program_options', 'boost_signals', 'boost_regex']
+ client_external_libs += [ 'boost_program_options-gcc34-mt', 'boost_signals-gcc34-mt', 'boost_regex-gcc34-mt']
else:
client_external_libs += [ 'fontconfig', 'gtk-x11-2.0', 'atk-1.0', 'gmodule-2.0', 'gdk-x11-2.0', 'gdk_pixbuf-2.0', 'pango-1.0', 'pangoft2-1.0', 'pangox-1.0', 'pangoxft-1.0', 'Xinerama', 'boost_program_options-gcc34-mt', 'boost_signals-gcc34-mt', 'boost_regex-gcc34-mt' ]
incdirs = [ 'ELFIO', 'atk-1.0', 'glib-2.0', 'gtk-2.0',
@@ -318,17 +320,17 @@ for build_target in targets:
if enable_mozlib:
cppflags += '-DLL_LLMOZLIB_ENABLED=1 '
client_external_libs += [ 'llmozlib2' ]
+ client_external_libs += [ 'mozjs', 'nspr4', 'plc4', 'plds4', 'profdirserviceprovider_s', 'xul' ]
else:
cppflags += '-DLL_LLMOZLIB_ENABLED=0 '
# GStreamer stuff
if enable_gstreamer:
cppflags += '-DLL_GSTREAMER_ENABLED=1 '
- if not standalone:
- client_external_libs += [ 'glib-2.0', 'gobject-2.0', 'gthread-2.0' ]
- include_dirs += [ '../libraries/' + system_str + '/include/gstreamer-0.10' ]
- include_dirs += [ '../libraries/' + system_str + '/include/glib-2.0', '../libraries/' + system_str + '/include/glib-2.0/include' ]
- include_dirs += [ '../libraries/' + system_str + '/include/libxml2']
+ client_external_libs += [ 'glib-2.0', 'gobject-2.0', 'gthread-2.0' ]
+ include_dirs += [ '../libraries/' + system_str + '/include/gstreamer-0.10' ]
+ include_dirs += [ '../libraries/' + system_str + '/include/glib-2.0', '../libraries/' + system_str + '/include/glib-2.0/include' ]
+ include_dirs += [ '../libraries/' + system_str + '/include/libxml2']
else:
cppflags += '-DLL_GSTREAMER_ENABLED=0 '
@@ -385,7 +387,7 @@ for build_target in targets:
# used mainly to hide the symbols of the many common libraries we
# static-link, which otherwise cause hard-to-trace fatal crashes due
# to clashes in the run-time symbol namespace.
- if not standalone and platform == 'linux':
+ if platform == 'linux':
exposed_symbols_file = 'newview/linux_tools/exposed-symbols.txt'
hidesyms_cmd = 'objcopy --keep-global-symbols ' + exposed_symbols_file + ' $SOURCE $TARGET'
else:
@@ -445,21 +447,17 @@ for build_target in targets:
env_no_distcc = env.Copy(CXX = compiler_no_distcc)
- vec_match = re.compile("_vec\.")
- sse_match = re.compile("_sse\.")
- sse2_match = re.compile("_sse2\.")
-
+ vec_match = re.compile("_vec\.")
env_vec = env.Copy() # _vec is for default vector optimizations or none
+
+ sse_match = re.compile("_sse\.")
env_sse = env.Copy()
+ env_sse.Append(CPPFLAGS = ' -msse -mfpmath=sse')
+
+ sse2_match = re.compile("_sse2\.")
env_sse2 = env.Copy()
-
- if arch == 'powerpc':
- env_vec.Append(CPPFLAGS = ' -faltivec ')
- elif arch == 'i686' or arch == 'x86_64':
- env_sse.Append(CPPFLAGS = ' -msse -mfpmath=sse')
- env_sse2.Append(CPPFLAGS = ' -msse2 -mfpmath=sse')
- else:
- print("What ARCH are you??? no Vectorisation possible");
+ env_sse2.Append(CPPFLAGS = ' -msse2 -mfpmath=sse')
+
### Distributed build hosts ###
@@ -508,7 +506,7 @@ for build_target in targets:
return env_sse.Object(file)
elif sse2_match.search(file) != None:
return env_sse2.Object(file)
- else:
+ else:
return file
### Load a files.lst and files.PLATFORM.lst for each module ###
@@ -618,6 +616,7 @@ for build_target in targets:
create_cond_module('llvfs')
create_cond_module('llimagej2coj', module_libs=['openjpeg'])
create_cond_module('llimage', module_libs=['llimagej2coj', 'jpeg', 'png12'])
+ create_static_module('llcrashlogger')
create_static_module('llmessage')
create_static_module('llinventory')
create_static_module('llcharacter')
@@ -638,7 +637,7 @@ for build_target in targets:
common_external_libs = net_external_libs + [ 'xmlrpc-epi', 'z' ]
if build_target == 'client':
- if not opensource and platform == 'linux':
+ if platform == 'linux':
#############################
# BUILD LINUX_CRASH_LOGGER #
#############################
@@ -666,7 +665,7 @@ for build_target in targets:
##################
# BUILD NEWVIEW #
##################
- output_bin = 'newview/omvviewer'
+ output_bin = 'newview/secondlife-' + arch + '-bin'
external_libs = client_external_libs + common_external_libs
--
A client for connecting to 3D metaverses such as Linden Labs Secondlife(tm) and OpenSim grids
More information about the Pkg-games-commits
mailing list