diff options
| author | Merov Linden <merov@lindenlab.com> | 2010-12-21 15:27:41 -0800 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2010-12-21 15:27:41 -0800 |
| commit | 472c9363a4d3d78aba579aab903101d43b05726a (patch) | |
| tree | d14c7e2d600cfb1e25ca68d2ed596571755944e6 | |
| parent | 91021bf905286bcb5ce0f14e19a55b4800a9ce99 (diff) | |
| parent | aa56f78dd2abd354fc36854d365dbc89459051ff (diff) | |
STORM-453 : pull in viewer-development
| -rw-r--r-- | indra/cmake/CURL.cmake | 6 | ||||
| -rw-r--r-- | indra/mac_updater/CMakeLists.txt | 3 | ||||
| -rw-r--r-- | install.xml | 12 |
3 files changed, 12 insertions, 9 deletions
diff --git a/indra/cmake/CURL.cmake b/indra/cmake/CURL.cmake index 6e5fed4d52..9aba08e573 100644 --- a/indra/cmake/CURL.cmake +++ b/indra/cmake/CURL.cmake @@ -10,10 +10,10 @@ else (STANDALONE) use_prebuilt_binary(curl) if (WINDOWS) set(CURL_LIBRARIES - debug libcurld - optimized libcurl) + debug libcurld.lib + optimized libcurl.lib) else (WINDOWS) - set(CURL_LIBRARIES curl) + set(CURL_LIBRARIES libcurl.a) endif (WINDOWS) set(CURL_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include) endif (STANDALONE) diff --git a/indra/mac_updater/CMakeLists.txt b/indra/mac_updater/CMakeLists.txt index 44f98e5e18..a4a6b50c6c 100644 --- a/indra/mac_updater/CMakeLists.txt +++ b/indra/mac_updater/CMakeLists.txt @@ -3,6 +3,7 @@ project(mac_updater) include(00-Common) +include(OpenSSL) include(CURL) include(LLCommon) include(LLVFS) @@ -49,6 +50,8 @@ set_target_properties(mac-updater target_link_libraries(mac-updater ${LLVFS_LIBRARIES} + ${OPENSSL_LIBRARIES} + ${CRYPTO_LIBRARIES} ${CURL_LIBRARIES} ${LLCOMMON_LIBRARIES} ) diff --git a/install.xml b/install.xml index 98e983299e..e727ba0e11 100644 --- a/install.xml +++ b/install.xml @@ -233,16 +233,16 @@ <key>darwin</key> <map> <key>md5sum</key> - <string>752e295ccb17f0dcb7c0167db3ad1e69</string> + <string>ca8f0134fa5ab6f34a6eeb8d0896c9b0</string> <key>url</key> - <uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/curl-7.20.1-darwin-20100606.tar.bz2</uri> + <uri>https://s3.amazonaws.com/automated-builds-secondlife-com/hg/repo/brad_curl-autobuild/rev/216961/arch/Darwin/installer/curl-7.21.1-darwin-20101214.tar.bz2</uri> </map> <key>linux</key> <map> <key>md5sum</key> - <string>a20e73f2e7d6a032ff25a5161b1b7394</string> + <string>9c9b629b62bf874d550c430ad678dc04</string> <key>url</key> - <uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/curl-7.20.1-linux-20100527.tar.bz2</uri> + <uri>https://s3.amazonaws.com/automated-builds-secondlife-com/hg/repo/brad_curl-autobuild/rev/216961/arch/Linux/installer/curl-7.21.1-linux-20101215.tar.bz2</uri> </map> <key>linux64</key> <map> @@ -254,9 +254,9 @@ <key>windows</key> <map> <key>md5sum</key> - <string>b28856d3d02ee680353ae440561a6579</string> + <string>48691883065a82d53691d73aae81d4c1</string> <key>url</key> - <uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/curl-7.20.1-windows-20100611.tar.bz2</uri> + <uri>https://s3.amazonaws.com/automated-builds-secondlife-com/hg/repo/brad_curl-autobuild/rev/216961/arch/CYGWIN/installer/curl-7.21.1-windows-20101214.tar.bz2</uri> </map> </map> </map> |