--- linden/indra/newview/linux_tools/client-manifest-i686.no_fmod 2007-01-07 23:50:31.000000000 +0100 +++ linden/indra/newview/linux_tools/client-manifest-i686 2007-01-08 19:28:37.000000000 +0100 @@ -32,7 +32,7 @@ res-sdl/* ../../scripts/messages/message_template.msg,app_settings/message_template.msg #../../libraries/i686-linux/lib_release_client/libkdu_v42R.so,lib/libkdu_v42R.so -../../libraries/i686-linux/lib_release_client/libfmod-3.75.so,lib/libfmod-3.75.so +#../../libraries/i686-linux/lib_release_client/libfmod-3.75.so,lib/libfmod-3.75.so ../../libraries/i686-linux/lib_release_client/libapr-1.so.0,lib/libapr-1.so.0 ../../libraries/i686-linux/lib_release_client/libaprutil-1.so.0,lib/libaprutil-1.so.0 ../../libraries/i686-linux/lib_release_client/libdb-4.2.so,lib/libdb-4.2.so --- linden/indra/SConstruct.no_fmod 2007-01-08 19:12:36.000000000 +0100 +++ linden/indra/SConstruct 2007-01-08 19:27:08.000000000 +0100 @@ -181,7 +181,7 @@ flags += '-DLL_LINUX=1 ' system_link_flags += '-Wl,--version-script=newview/linux_tools/hidesymbols.ver ' if build_target == 'client': - flags += '-DAPPID=secondlife -DLL_SDL=1 -DLL_X11=1 ' + flags += '-DAPPID=secondlife -DLL_SDL=1 -DLL_FMOD=0 -DLL_X11=1 ' flags += '-DLL_GTK=1 ' client_external_libs += [ 'gtk-x11-2.0', 'elfio' ] include_dirs += [ ' ../libraries/' + system_str + '/include/gtk-2.0' ] @@ -381,7 +381,7 @@ ################## output_bin = 'newview/secondlife-' + arch + '-bin' - external_libs = client_external_libs + common_external_libs + [ 'freetype', 'jpeg', 'SDL', 'GL', 'GLU', 'ogg', 'vorbisenc', 'vorbisfile', 'vorbis', 'fmod-3.75', 'db-4.2', 'openjpeg' ] + external_libs = client_external_libs + common_external_libs + [ 'freetype', 'jpeg', 'SDL', 'GL', 'GLU', 'ogg', 'vorbisenc', 'vorbisfile', 'vorbis', 'db-4.2', 'openjpeg' ] internal_libs = [ 'lscript', 'llwindow', 'llrender', 'llprimitive', 'llmedia', 'llinventory',