diff options
| author | Jacek Antonelli | 2008-10-17 20:01:38 -0500 |
|---|---|---|
| committer | Jacek Antonelli | 2008-10-17 20:01:38 -0500 |
| commit | fdf944fb0355249d73c4e25ee86e9ffd378e7d4b (patch) | |
| tree | 2e5c51fe0e6d5757f984721e01cc097801d927e7 /linden/indra/cmake | |
| parent | Rebranded Windows-specific installer/support files. (diff) | |
| parent | Updated source to SL version 1.21.6. (diff) | |
| download | meta-impy-fdf944fb0355249d73c4e25ee86e9ffd378e7d4b.zip meta-impy-fdf944fb0355249d73c4e25ee86e9ffd378e7d4b.tar.gz meta-impy-fdf944fb0355249d73c4e25ee86e9ffd378e7d4b.tar.bz2 meta-impy-fdf944fb0355249d73c4e25ee86e9ffd378e7d4b.tar.xz | |
Merge branch 'merge-1.21.6' into rebranding
Conflicts:
linden/indra/newview/installers/windows/installer_template.nsi
linden/indra/newview/llappviewer.cpp
Diffstat (limited to 'linden/indra/cmake')
| -rw-r--r-- | linden/indra/cmake/MySQL.cmake | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/linden/indra/cmake/MySQL.cmake b/linden/indra/cmake/MySQL.cmake index 97dd091..e124ebb 100644 --- a/linden/indra/cmake/MySQL.cmake +++ b/linden/indra/cmake/MySQL.cmake | |||
| @@ -14,8 +14,8 @@ if (WINDOWS) | |||
| 14 | elseif (DARWIN) | 14 | elseif (DARWIN) |
| 15 | set(MYSQL_INCLUDE_DIR ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include) | 15 | set(MYSQL_INCLUDE_DIR ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include) |
| 16 | set(MYSQL_LIBRARIES | 16 | set(MYSQL_LIBRARIES |
| 17 | optimized ${LIBS_PREBUILT_DIRS_RELEASE}/libmysqlclient.a | 17 | optimized ${ARCH_PREBUILT_DIRS_RELEASE}/libmysqlclient.a |
| 18 | debug ${LIBS_PREBUILT_DIRS_DEBUG}/libmysqlclient.a | 18 | debug ${ARCH_PREBUILT_DIRS_DEBUG}/libmysqlclient.a |
| 19 | ) | 19 | ) |
| 20 | else (WINDOWS) | 20 | else (WINDOWS) |
| 21 | set(MYSQL_FIND_REQUIRED) | 21 | set(MYSQL_FIND_REQUIRED) |