diff options
| author | dolphin <dolphin@lindenlab.com> | 2013-01-23 13:36:50 -0800 |
|---|---|---|
| committer | dolphin <dolphin@lindenlab.com> | 2013-01-23 13:36:50 -0800 |
| commit | 3e8bc28c88f16c1b8bba496704ec3a6156a25e1d (patch) | |
| tree | aa52be0bc7aa10d578ba000b8cd69d40271477a0 /indra/newview/CMakeLists.txt | |
| parent | 7e9ac192d779e77cad0a0b785510190215fbe7a6 (diff) | |
| parent | a30a2c492d06c9ef843a43c0ff0be6f2826d6d0b (diff) | |
Merge
Diffstat (limited to 'indra/newview/CMakeLists.txt')
| -rw-r--r--[-rwxr-xr-x] | indra/newview/CMakeLists.txt | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt index 20999c9028..fc138cc12e 100755..100644 --- a/indra/newview/CMakeLists.txt +++ b/indra/newview/CMakeLists.txt @@ -35,6 +35,7 @@ include(LLXML) include(LScript) include(Linking) include(NDOF) +include(NVAPI) include(GooglePerfTools) include(TemplateCheck) include(UI) @@ -337,7 +338,6 @@ set(viewer_SOURCE_FILES llmarketplacenotifications.cpp llmediactrl.cpp llmediadataclient.cpp - llmemoryview.cpp llmenuoptionpathfindingrebakenavmesh.cpp llmeshrepository.cpp llmimetypes.cpp @@ -916,7 +916,6 @@ set(viewer_HEADER_FILES llmarketplacenotifications.h llmediactrl.h llmediadataclient.h - llmemoryview.h llmenuoptionpathfindingrebakenavmesh.h llmeshrepository.h llmimetypes.h @@ -1823,6 +1822,7 @@ target_link_libraries(${VIEWER_BINARY_NAME} ${LLCOREHTTP_LIBRARIES} ${LLCOMMON_LIBRARIES} ${NDOF_LIBRARY} + ${NVAPI_LIBRARY} ${HUNSPELL_LIBRARY} ${viewer_LIBRARIES} ${BOOST_PROGRAM_OPTIONS_LIBRARY} @@ -1871,7 +1871,6 @@ if (LINUX) set(COPY_INPUT_DEPENDENCIES ${VIEWER_BINARY_NAME} linux-crash-logger - linux-updater SLPlugin media_plugin_webkit media_plugin_gstreamer010 |