diff options
| author | Tony Kelman <tony@kelman.net> | 2015-03-16 14:49:23 -0700 |
|---|---|---|
| committer | Tony Kelman <tony@kelman.net> | 2015-03-16 14:59:20 -0700 |
| commit | 547517d7f9c7519681c67eb89cb6343a4457eb27 (patch) | |
| tree | e31736eae9157909834800bf447292a9b72447c7 | |
| parent | d612e48ecc74a2b9140a3d7f4357537af3c6465e (diff) | |
| download | libgit2-547517d7f9c7519681c67eb89cb6343a4457eb27.tar.gz | |
use a different .def file for 64 bit
| -rw-r--r-- | CMakeLists.txt | 10 | ||||
| -rw-r--r-- | deps/winhttp/winhttp64.def | 29 |
2 files changed, 37 insertions, 2 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index f7db9ffa2..facd68b8c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -166,10 +166,16 @@ IF (WIN32 AND WINHTTP) SET(LIBWINHTTP_PATH "${CMAKE_CURRENT_BINARY_DIR}/deps/winhttp") FILE(MAKE_DIRECTORY ${LIBWINHTTP_PATH}) + IF ("${CMAKE_SIZEOF_VOID_P}" EQUAL "8") + set(WINHTTP_DEF "${CMAKE_CURRENT_SOURCE_DIR}/deps/winhttp/winhttp64.def") + ELSE() + set(WINHTTP_DEF "${CMAKE_CURRENT_SOURCE_DIR}/deps/winhttp/winhttp.def") + ENDIF() + ADD_CUSTOM_COMMAND( OUTPUT ${LIBWINHTTP_PATH}/libwinhttp.a - COMMAND ${DLLTOOL} -d ${CMAKE_CURRENT_SOURCE_DIR}/deps/winhttp/winhttp.def -k -D winhttp.dll -l libwinhttp.a - DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/deps/winhttp/winhttp.def + COMMAND ${DLLTOOL} -d ${WINHTTP_DEF} -k -D winhttp.dll -l libwinhttp.a + DEPENDS ${WINHTTP_DEF} WORKING_DIRECTORY ${LIBWINHTTP_PATH} ) diff --git a/deps/winhttp/winhttp64.def b/deps/winhttp/winhttp64.def new file mode 100644 index 000000000..bfad3a0ce --- /dev/null +++ b/deps/winhttp/winhttp64.def @@ -0,0 +1,29 @@ +LIBRARY WINHTTP +EXPORTS +WinHttpAddRequestHeaders +WinHttpCheckPlatform +WinHttpCloseHandle +WinHttpConnect +WinHttpCrackUrl +WinHttpCreateUrl +WinHttpDetectAutoProxyConfigUrl +WinHttpGetDefaultProxyConfiguration +WinHttpGetIEProxyConfigForCurrentUser +WinHttpGetProxyForUrl +WinHttpOpen +WinHttpOpenRequest +WinHttpQueryAuthSchemes +WinHttpQueryDataAvailable +WinHttpQueryHeaders +WinHttpQueryOption +WinHttpReadData +WinHttpReceiveResponse +WinHttpSendRequest +WinHttpSetCredentials +WinHttpSetDefaultProxyConfiguration +WinHttpSetOption +WinHttpSetStatusCallback +WinHttpSetTimeouts +WinHttpTimeFromSystemTime +WinHttpTimeToSystemTime +WinHttpWriteData |