Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 127026 | Differences between
and this patch

Collapse All | Expand All

(-)linden/indra/newview/linux_tools/client-manifest-i686.no_fmod (-1 / +1 lines)
Lines 32-38 Link Here
32 
res-sdl/*
 32 
res-sdl/*
33 
../../scripts/messages/message_template.msg,app_settings/message_template.msg
 33 
../../scripts/messages/message_template.msg,app_settings/message_template.msg
34 
#../../libraries/i686-linux/lib_release_client/libkdu_v42R.so,lib/libkdu_v42R.so
 34 
#../../libraries/i686-linux/lib_release_client/libkdu_v42R.so,lib/libkdu_v42R.so
35 
../../libraries/i686-linux/lib_release_client/libfmod-3.75.so,lib/libfmod-3.75.so
 35 
#../../libraries/i686-linux/lib_release_client/libfmod-3.75.so,lib/libfmod-3.75.so
36 
../../libraries/i686-linux/lib_release_client/libapr-1.so.0,lib/libapr-1.so.0
 36 
../../libraries/i686-linux/lib_release_client/libapr-1.so.0,lib/libapr-1.so.0
37 
../../libraries/i686-linux/lib_release_client/libaprutil-1.so.0,lib/libaprutil-1.so.0
 37 
../../libraries/i686-linux/lib_release_client/libaprutil-1.so.0,lib/libaprutil-1.so.0
38 
../../libraries/i686-linux/lib_release_client/libdb-4.2.so,lib/libdb-4.2.so
 38 
../../libraries/i686-linux/lib_release_client/libdb-4.2.so,lib/libdb-4.2.so
(-)linden/indra/SConstruct.no_fmod (-2 / +2 lines)
Lines 181-187 Link Here
181 
		flags += '-DLL_LINUX=1 '
 181 
		flags += '-DLL_LINUX=1 '
182 
		system_link_flags += '-Wl,--version-script=newview/linux_tools/hidesymbols.ver '
 182 
		system_link_flags += '-Wl,--version-script=newview/linux_tools/hidesymbols.ver '
183 
		if build_target == 'client':
 183 
		if build_target == 'client':
184 
			flags += '-DAPPID=secondlife -DLL_SDL=1 -DLL_X11=1 '
 184 
			flags += '-DAPPID=secondlife -DLL_SDL=1 -DLL_FMOD=0 -DLL_X11=1 '
185 
			flags += '-DLL_GTK=1 '
 185 
			flags += '-DLL_GTK=1 '
186 
			client_external_libs += [ 'gtk-x11-2.0', 'elfio' ]
 186 
			client_external_libs += [ 'gtk-x11-2.0', 'elfio' ]
187 
			include_dirs += [ ' ../libraries/' + system_str + '/include/gtk-2.0' ]
 187 
			include_dirs += [ ' ../libraries/' + system_str + '/include/gtk-2.0' ]
Lines 381-387 Link Here
381 
		##################
 381 
		##################
382 
		output_bin = 'newview/secondlife-' + arch + '-bin'
 382 
		output_bin = 'newview/secondlife-' + arch + '-bin'
383 

          383
          

        

          
            

              384
              
		external_libs = client_external_libs + common_external_libs + [ 'freetype', 'jpeg', 'SDL', 'GL', 'GLU', 'ogg', 'vorbisenc', 'vorbisfile', 'vorbis', 'fmod-3.75', 'db-4.2', 'openjpeg' ]


              384
              
		external_libs = client_external_libs + common_external_libs + [ 'freetype', 'jpeg', 'SDL', 'GL', 'GLU', 'ogg', 'vorbisenc', 'vorbisfile', 'vorbis', 'db-4.2', 'openjpeg' ]

            

        

          385
          

          385
          

        

        

          386
          
		internal_libs = [ 'lscript', 'llwindow', 'llrender', 'llprimitive',

          386
          
		internal_libs = [ 'lscript', 'llwindow', 'llrender', 'llprimitive',

        

        

          387
          
				 'llmedia', 'llinventory', 

          387
          
				 'llmedia', 'llinventory', 

        






  

  Return to bug 127026