aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorJacek Antonelli2008-10-17 22:10:33 -0500
committerJacek Antonelli2008-10-17 22:23:49 -0500
commit4e44f1fcb23fadbc832476f8226bc642590fd8e7 (patch)
tree74b7ad34ed7bdfae46e4aad5de110df11f671981
parentCommented out vivox / SLVoice from viewer manifest. (diff)
downloadmeta-impy-4e44f1fcb23fadbc832476f8226bc642590fd8e7.zip
meta-impy-4e44f1fcb23fadbc832476f8226bc642590fd8e7.tar.gz
meta-impy-4e44f1fcb23fadbc832476f8226bc642590fd8e7.tar.bz2
meta-impy-4e44f1fcb23fadbc832476f8226bc642590fd8e7.tar.xz
Use FMOD_LIBRARY variable. It's there for a reason.
-rw-r--r--ChangeLog.txt3
-rw-r--r--linden/indra/newview/CMakeLists.txt2
2 files changed, 4 insertions, 1 deletions
diff --git a/ChangeLog.txt b/ChangeLog.txt
index 1bafbd6..21414d2 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -1,5 +1,8 @@
12008-10-17 Jacek Antonelli <jacek.antonelli@gmail.com> 12008-10-17 Jacek Antonelli <jacek.antonelli@gmail.com>
2 2
3 * linden/indra/newview/CMakeLists.txt:
4 Use FMOD_LIBRARY variable. It's there for a reason.
5
3 * linden/indra/newview/viewer_manifest.py: 6 * linden/indra/newview/viewer_manifest.py:
4 Commented out fmod from viewer manifest. 7 Commented out fmod from viewer manifest.
5 Commented out kdu from viewer manifest. 8 Commented out kdu from viewer manifest.
diff --git a/linden/indra/newview/CMakeLists.txt b/linden/indra/newview/CMakeLists.txt
index ae0feb6..7a5ff32 100644
--- a/linden/indra/newview/CMakeLists.txt
+++ b/linden/indra/newview/CMakeLists.txt
@@ -979,7 +979,7 @@ if (WINDOWS)
979 comdlg32 979 comdlg32
980 ${DINPUT_LIBRARY} 980 ${DINPUT_LIBRARY}
981 ${DXGUID_LIBRARY} 981 ${DXGUID_LIBRARY}
982 fmodvc 982 ${FMOD_LIBRARY}
983 gdi32 983 gdi32
984 kernel32 984 kernel32
985 odbc32 985 odbc32