diff options
| author | Merov Linden <merov@lindenlab.com> | 2010-08-24 15:40:49 -0700 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2010-08-24 15:40:49 -0700 |
| commit | b3e10e872f2f6141e7f75fb1ea08717cbac0e099 (patch) | |
| tree | 7be2e4c6a137ebf86683af9ebd0b976d487d991e /indra/newview | |
| parent | 1de433aa8cda814dbfd0ce51a3ec5dea111aadd0 (diff) | |
Suppress llkdu target on Windows build, re-enable manifest check for llkdu.dll
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/CMakeLists.txt | 9 | ||||
| -rw-r--r-- | indra/newview/viewer_manifest.py | 4 |
2 files changed, 1 insertions, 12 deletions
diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt index 1ee7586d5f..ab1df7727b 100644 --- a/indra/newview/CMakeLists.txt +++ b/indra/newview/CMakeLists.txt @@ -1394,10 +1394,6 @@ add_executable(${VIEWER_BINARY_NAME} ${viewer_SOURCE_FILES} ) -if (LLKDU_LIBRARY) - add_dependencies(${VIEWER_BINARY_NAME} ${LLKDU_LIBRARY}) -endif (LLKDU_LIBRARY) - # add package files file(GLOB EVENT_HOST_SCRIPT_GLOB_LIST ${CMAKE_CURRENT_SOURCE_DIR}/../viewer_components/*.py) @@ -1555,11 +1551,6 @@ if (WINDOWS) add_dependencies(${VIEWER_BINARY_NAME} stage_third_party_libs llcommon copy_w_viewer_manifest) - if(LLKDU_LIBRARY) - # kdu may not exist! - add_dependencies(copy_w_viewer_manifest llkdu) - endif(LLKDU_LIBRARY) - if (EXISTS ${CMAKE_SOURCE_DIR}/copy_win_scripts) add_dependencies(${VIEWER_BINARY_NAME} copy_win_scripts) endif (EXISTS ${CMAKE_SOURCE_DIR}/copy_win_scripts) diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py index 0eda4007e3..e963bcc9f7 100644 --- a/indra/newview/viewer_manifest.py +++ b/indra/newview/viewer_manifest.py @@ -251,7 +251,7 @@ class WindowsManifest(ViewerManifest): if self.prefix(src=os.path.join(os.pardir, 'sharedlibs', self.args['configuration']), dst=""): - self.enable_no_crt_manifest_check() + self.enable_crt_manifest_check() # Get kdu dll, continue if missing. try: @@ -259,8 +259,6 @@ class WindowsManifest(ViewerManifest): except RuntimeError: print "Skipping llkdu.dll" - self.enable_crt_manifest_check() - # Get llcommon and deps. If missing assume static linkage and continue. try: self.path('llcommon.dll') |