From b3e10e872f2f6141e7f75fb1ea08717cbac0e099 Mon Sep 17 00:00:00 2001 From: Merov Linden Date: Tue, 24 Aug 2010 15:40:49 -0700 Subject: Suppress llkdu target on Windows build, re-enable manifest check for llkdu.dll --- indra/newview/viewer_manifest.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'indra/newview/viewer_manifest.py') 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') -- cgit v1.2.3 From 63053aad8fc15a63bbd35c38de7bdc103b7fb4ab Mon Sep 17 00:00:00 2001 From: Merov Linden Date: Thu, 26 Aug 2010 20:30:10 -0700 Subject: VWR-20946 : fix the viewer manifest script to take the new kdu lib name into account --- indra/newview/viewer_manifest.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/newview/viewer_manifest.py') diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py index e963bcc9f7..4058933d9f 100644 --- a/indra/newview/viewer_manifest.py +++ b/indra/newview/viewer_manifest.py @@ -930,7 +930,7 @@ class Linux_i686Manifest(LinuxManifest): self.path("libopenal.so", "libopenal.so.1") self.path("libopenal.so", "libvivoxoal.so.1") # vivox's sdk expects this soname try: - self.path("libkdu_v42R.so", "libkdu.so") + self.path("libkdu.so") pass except: print "Skipping libkdu_v42R.so - not found" -- cgit v1.2.3 From 9d880615d1c8fee01b2528693466d48e816620db Mon Sep 17 00:00:00 2001 From: Merov Linden Date: Thu, 26 Aug 2010 20:37:54 -0700 Subject: VWR-20946 : fix erroneous error message (broken window...) --- indra/newview/viewer_manifest.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/newview/viewer_manifest.py') diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py index 4058933d9f..08ba8c13b1 100644 --- a/indra/newview/viewer_manifest.py +++ b/indra/newview/viewer_manifest.py @@ -933,7 +933,7 @@ class Linux_i686Manifest(LinuxManifest): self.path("libkdu.so") pass except: - print "Skipping libkdu_v42R.so - not found" + print "Skipping libkdu.so - not found" pass try: self.path("libfmod-3.75.so") -- cgit v1.2.3