Attachment #110634 for bug #127026

View | Details | Raw Unified | Return to bug 127026 | Differences between

and this patch

Lines 180-186 Link Here

(-)linden.orig/indra/SConstruct (-2 / +2 lines)
180	# Linux-only flags	180	# Linux-only flags
181	flags += '-DLL_LINUX=1 '	181	flags += '-DLL_LINUX=1 '
182	if build_target == 'client':	182	if build_target == 'client':
183	flags += '-DAPPID=secondlife -DLL_SDL=1 -DLL_X11=1 '	183	flags += '-DAPPID=secondlife -DLL_SDL=1 -DLL_FMOD=0 -DLL_X11=1 '
184	flags += '-DLL_GTK=1 '	184	flags += '-DLL_GTK=1 '
185	client_external_libs += [ 'gtk-x11-2.0', 'elfio' ]	185	client_external_libs += [ 'gtk-x11-2.0', 'elfio' ]
186	include_dirs += [ '../libraries/' + system_str + '/include/gtk-2.0' ]	186	include_dirs += [ '../libraries/' + system_str + '/include/gtk-2.0' ]
Lines 393-399 Link Here
393	##################	393	##################
394	output_bin = 'newview/secondlife-' + arch + '-bin'	394	output_bin = 'newview/secondlife-' + arch + '-bin'
395		395
396	external_libs = client_external_libs + common_external_libs + [ 'freetype', 'jpeg', 'SDL', 'GL', 'GLU', 'ogg', 'vorbisenc', 'vorbisfile', 'vorbis', 'fmod-3.75', 'db-4.2', 'openjpeg' ]	396	external_libs = client_external_libs + common_external_libs + [ 'freetype', 'jpeg', 'SDL', 'GL', 'GLU', 'ogg', 'vorbisenc', 'vorbisfile', 'vorbis', 'db-4.2', 'openjpeg' ]
397	external_libs.remove('cares')	397	external_libs.remove('cares')
398		398
399	internal_libs = [ 'lscript', 'llwindow', 'llrender', 'llprimitive',	399	internal_libs = [ 'lscript', 'llwindow', 'llrender', 'llprimitive',

Return to bug 127026