diff options
| author | Alain Linden <alain@lindenlab.com> | 2011-02-24 12:27:58 -0800 |
|---|---|---|
| committer | Alain Linden <alain@lindenlab.com> | 2011-02-24 12:27:58 -0800 |
| commit | 1db3f3b5cede4971049a91f5cb99f76fd0952b54 (patch) | |
| tree | f35a877066f212dcb69e4419ed3a267862be3024 | |
| parent | f939b95d0c7b257a67bfc605d0cd590b3f442df8 (diff) | |
integrate xmlrpc-epi into windows build.
| -rw-r--r-- | autobuild.xml | 6 | ||||
| -rw-r--r-- | indra/cmake/XmlRpcEpi.cmake | 5 | ||||
| -rw-r--r-- | indra/newview/CMakeLists.txt | 2 |
3 files changed, 9 insertions, 4 deletions
diff --git a/autobuild.xml b/autobuild.xml index c030ee1117..9b670e5875 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -1478,7 +1478,7 @@ <key>license</key> <string>xmlrpc-epi</string> <key>license_file</key> - <string>LICENSES/xmlrpc.txt</string> + <string>LICENSES/xmlrpc-epi.txt</string> <key>name</key> <string>xmlrpc-epi</string> <key>platforms</key> @@ -1512,9 +1512,9 @@ <key>archive</key> <map> <key>hash</key> - <string>ea06e2f1c1ed59a2d2b6cdb6f459d1c0</string> + <string>5181d1a8f2516928ac064d72acf164a4</string> <key>url</key> - <string>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/xmlrpc-epi-0.51-windows-20101001a.tar.bz2</string> + <string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-xmlrpc-epi/rev/222021/arch/CYGWIN/installer/xmlrpc_epi-0.54.1-windows-20110224.tar.bz2</string> </map> <key>name</key> <string>windows</string> diff --git a/indra/cmake/XmlRpcEpi.cmake b/indra/cmake/XmlRpcEpi.cmake index 107d1926ba..5bd4848245 100644 --- a/indra/cmake/XmlRpcEpi.cmake +++ b/indra/cmake/XmlRpcEpi.cmake @@ -9,7 +9,10 @@ if (STANDALONE) else (STANDALONE) use_prebuilt_binary(xmlrpc-epi) if (WINDOWS) - set(XMLRPCEPI_LIBRARIES xmlrpcepi) + set(XMLRPCEPI_LIBRARIES + debug xmlrpc-epid + optimized xmlrpc-epi + ) else (WINDOWS) set(XMLRPCEPI_LIBRARIES xmlrpc-epi) endif (WINDOWS) diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt index db029f9de7..1f07af0608 100644 --- a/indra/newview/CMakeLists.txt +++ b/indra/newview/CMakeLists.txt @@ -10,6 +10,7 @@ include(DirectX) include(OpenSSL) include(DragDrop) include(ELFIO) +include(EXPAT) include(FMOD) include(OPENAL) include(FindOpenGL) @@ -1681,6 +1682,7 @@ target_link_libraries(${VIEWER_BINARY_NAME} ${SMARTHEAP_LIBRARY} ${UI_LIBRARIES} ${WINDOWS_LIBRARIES} + ${EXPAT_LIBRARIES} ${XMLRPCEPI_LIBRARIES} ${ELFIO_LIBRARIES} ${OPENSSL_LIBRARIES} |