diff options
| author | Palmer <palmer@lindenlab.com> | 2010-01-29 15:04:14 -0800 |
|---|---|---|
| committer | Palmer <palmer@lindenlab.com> | 2010-01-29 15:04:14 -0800 |
| commit | c504c40a754a79baf0e4b1d1c10ca44197d577df (patch) | |
| tree | 29de94b75d98a4f40a2f75458fdd8f9e0d94c071 /indra | |
| parent | 024c0ebe19588f8452bae7ea01756fd7b4b30540 (diff) | |
Added glod.txt and libraries no longer unzipped into newview
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/cmake/Copy3rdPartyLibs.cmake | 4 | ||||
| -rwxr-xr-x | indra/newview/viewer_manifest.py | 11 |
2 files changed, 9 insertions, 6 deletions
diff --git a/indra/cmake/Copy3rdPartyLibs.cmake b/indra/cmake/Copy3rdPartyLibs.cmake index faf9da8b14..9a54c7a2e8 100644 --- a/indra/cmake/Copy3rdPartyLibs.cmake +++ b/indra/cmake/Copy3rdPartyLibs.cmake @@ -38,6 +38,8 @@ if(WINDOWS) libapr-1.dll libaprutil-1.dll libapriconv-1.dll + libcollada14dom21.dll + glod.dll ) # *TODO - update this to use LIBS_PREBUILT_DIR and LL_ARCH_DIR variables @@ -48,6 +50,8 @@ if(WINDOWS) libapr-1.dll libaprutil-1.dll libapriconv-1.dll + libcollada14dom21.dll + glod.dll ) if(USE_GOOGLE_PERFTOOLS) diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py index 37c2102e8f..595afd86e0 100755 --- a/indra/newview/viewer_manifest.py +++ b/indra/newview/viewer_manifest.py @@ -268,12 +268,17 @@ class WindowsManifest(ViewerManifest): self.path('libapr-1.dll') self.path('libaprutil-1.dll') self.path('libapriconv-1.dll') + except RuntimeError, err: print err.message print "Skipping llcommon.dll (assuming llcommon was linked statically)" self.disable_manifest_check() + # Mesh 3rd party libs needed for auto LOD and collada reading + self.path("libcollada14dom21.dll") + self.path("glod.dll") + # For textures if self.args['configuration'].lower() == 'debug': self.path("openjpegd.dll") @@ -320,12 +325,6 @@ class WindowsManifest(ViewerManifest): # For using FMOD for sound... DJS self.path("fmod.dll") - # For automatic level of detail generation in mesh importer - self.path("glod.dll") - - # For reading collada files - self.path("libcollada14dom21.dll") - self.enable_no_crt_manifest_check() # Media plugins - QuickTime |