livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update zlib and openssl libraries, update and add libidn support to curl 

--HG--
branch : Mac64
meow-7.2.2
Cinder 2014-05-27 20:25:27 -06:00
parent 0164b2d537
commit cc271a11f6
2 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
autobuild.xml
View File

@ -398,9 +398,9 @@
<key>archive</key>
<map>
<key>hash</key>
<string>2367231226757031ef71c58d6e47df55</string>
<string>196983904562c6192a240cfce16af59e</string>
<key>url</key>
<string>http://bitbucket.org/cinderblocks/darwin64-libs/downloads/curl-7.37.0-darwin-20140521u.tar.bz2</string>
<string>http://bitbucket.org/cinderblocks/darwin64-libs/downloads/curl-7.37.0-darwin-20140527u.tar.bz2</string>
</map>
<key>name</key>
<string>darwin</string>
@ -2096,9 +2096,9 @@
<key>archive</key>
<map>
<key>hash</key>
<string>75a77beadd5dbf5f12a2c59c64763045</string>
<string>097e50aedd67890ad1afddf087cb0fdc</string>
<key>url</key>
<string>http://bitbucket.org/cinderblocks/darwin64-libs/downloads/openssl-1.0.1g-darwin-20140521u.tar.bz2</string>
<string>http://bitbucket.org/cinderblocks/darwin64-libs/downloads/openssl-1.0.1g-darwin-20140527u.tar.bz2</string>
</map>
<key>name</key>
<string>darwin</string>
@ -2548,9 +2548,9 @@
<key>archive</key>
<map>
<key>hash</key>
<string>ff0a653d6d3ad99523ad6e478691532b</string>
<string>40f752c0c22c02a5b29217245d6bc230</string>
<key>url</key>
<string>http://downloads.phoenixviewer.com/zlib-1.2.6-darwin-20131028u.tar.bz2</string>
<string>http://bitbucket.org/cinderblocks/darwin64-libs/downloads/zlib-1.2.8-darwin-20140527u.tar.bz2</string>
</map>
<key>name</key>
<string>darwin</string>

6
indra/cmake/CURL.cmake
View File

@ -14,6 +14,12 @@ else (STANDALONE)
optimized libcurl.lib)
else (WINDOWS)
set(CURL_LIBRARIES libcurl.a)
if (DARWIN)
list(APPEND CURL_LIBRARIES
idn
iconv
)
endif (DARWIN)
endif (WINDOWS)
set(CURL_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include)
endif (STANDALONE)