diff options
| author | Jacek Antonelli | 2009-06-08 00:41:31 -0500 |
|---|---|---|
| committer | Jacek Antonelli | 2009-06-08 00:41:31 -0500 |
| commit | 0e5df9bdf8d6b418bb6e25615e2ffc922d0f02aa (patch) | |
| tree | 2c93d38e210832e737d09cff7561373d8d5453b2 /linden/indra/cmake/APR.cmake | |
| parent | Imprudence 1.1.0 released. (diff) | |
| parent | Updated Imprudence to be based on SL 1.22.11. (ChangeLog Entry) (diff) | |
| download | meta-impy-0e5df9bdf8d6b418bb6e25615e2ffc922d0f02aa.zip meta-impy-0e5df9bdf8d6b418bb6e25615e2ffc922d0f02aa.tar.gz meta-impy-0e5df9bdf8d6b418bb6e25615e2ffc922d0f02aa.tar.bz2 meta-impy-0e5df9bdf8d6b418bb6e25615e2ffc922d0f02aa.tar.xz | |
Merge branch 'sl-base-1.22' into next
Conflicts:
linden/indra/newview/English.lproj/InfoPlist.strings
linden/indra/newview/skins/default/xui/en-us/panel_chat_bar.xml
Diffstat (limited to 'linden/indra/cmake/APR.cmake')
| -rw-r--r-- | linden/indra/cmake/APR.cmake | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/linden/indra/cmake/APR.cmake b/linden/indra/cmake/APR.cmake index 2563a98..088b3e6 100644 --- a/linden/indra/cmake/APR.cmake +++ b/linden/indra/cmake/APR.cmake | |||
| @@ -23,6 +23,10 @@ else (STANDALONE) | |||
| 23 | debug ${ARCH_PREBUILT_DIRS_DEBUG}/aprutil-1.lib | 23 | debug ${ARCH_PREBUILT_DIRS_DEBUG}/aprutil-1.lib |
| 24 | optimized ${ARCH_PREBUILT_DIRS_RELEASE}/aprutil-1.lib | 24 | optimized ${ARCH_PREBUILT_DIRS_RELEASE}/aprutil-1.lib |
| 25 | ) | 25 | ) |
| 26 | set(APRICONV_LIBRARIES | ||
| 27 | debug ${ARCH_PREBUILT_DIRS_DEBUG}/apriconv-1.lib | ||
| 28 | optimized ${ARCH_PREBUILT_DIRS_RELEASE}/apriconv-1.lib | ||
| 29 | ) | ||
| 26 | # Doesn't need to link with iconv.dll | 30 | # Doesn't need to link with iconv.dll |
| 27 | set(APRICONV_LIBRARIES "") | 31 | set(APRICONV_LIBRARIES "") |
| 28 | elseif (DARWIN) | 32 | elseif (DARWIN) |