Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of git://github.com/LightDrake/SingularityViewer

Browse Source
This commit is contained in:
Siana Gearz
2012-09-11 20:18:05 +02:00
parent 4ade726a07 86ad4aabf3
commit 3ef9e3bc69
9 changed files with 51 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
indra/newview/CMakeLists.txt
View File

@@ -8,10 +8,10 @@ include(DBusGlib)
include(DirectX)
include(ELFIO)
if(FMODEX)
include(FMODEX)
set(FMOD OFF)
include(FMODEX)
set(FMOD OFF)
else(FMODEX)
include(FMOD)
include(FMOD)
endif(FMODEX)
include(OPENAL)
include(FindOpenGL)
@@ -1560,10 +1560,10 @@ target_link_libraries(${VIEWER_BINARY_NAME}
${LLCOMMON_LIBRARIES}
${NDOF_LIBRARY}
${viewer_LIBRARIES}
${BOOST_FILESYSTEM_LIBRARY}
${BOOST_PROGRAM_OPTIONS_LIBRARY}
${BOOST_REGEX_LIBRARY}
${BOOST_SYSTEM_LIBRARY}
${Boost_FILESYSTEM_LIBRARY}
${Boost_PROGRAM_OPTIONS_LIBRARY}
${Boost_REGEX_LIBRARY}
${Boost_SYSTEM_LIBRARY}
${DBUSGLIB_LIBRARIES}
${OPENGL_LIBRARIES}
${FMODWRAPPER_LIBRARY} # must come after LLAudio