proxmox-mirrors/libgit2
1
0
Fork 0
mirror of https://git.proxmox.com/git/libgit2 synced 2025-08-07 06:04:44 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #306 from carlosmn/development

Browse Source 
Fix network MSYS compilation
This commit is contained in:
Vicent Martí 2011-07-06 16:58:06 -07:00
commit dbede305bf
3 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
CMakeLists.txt
View File

@ -53,7 +53,10 @@ IF (MSVC)
SET(CMAKE_C_FLAGS_DEBUG "/Od /DEBUG /MTd") SET(CMAKE_C_FLAGS_DEBUG "/Od /DEBUG /MTd")
SET(CMAKE_C_FLAGS_RELEASE "/MT /O2") SET(CMAKE_C_FLAGS_RELEASE "/MT /O2")
ELSE () ELSE ()
SET(CMAKE_C_FLAGS "-Wall -Wextra -fPIC") SET(CMAKE_C_FLAGS "-Wall -Wextra")
IF (NOT MINGW) # MinGW always does PIC and complains if we tell it to
SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fPIC")
ENDIF ()
SET(CMAKE_C_FLAGS_DEBUG "-g -O0") SET(CMAKE_C_FLAGS_DEBUG "-g -O0")
SET(CMAKE_C_FLAGS_RELEASE "-O2") SET(CMAKE_C_FLAGS_RELEASE "-O2")
ENDIF() ENDIF()
@ -86,6 +89,11 @@ ENDIF ()
# Compile and link libgit2 # Compile and link libgit2
ADD_LIBRARY(git2 ${SRC} ${SRC_ZLIB}) ADD_LIBRARY(git2 ${SRC} ${SRC_ZLIB})
IF (WIN32)
TARGET_LINK_LIBRARIES(git2 ws2_32)
ENDIF ()
TARGET_LINK_LIBRARIES(git2 ${CMAKE_THREAD_LIBS_INIT}) TARGET_LINK_LIBRARIES(git2 ${CMAKE_THREAD_LIBS_INIT})
SET_TARGET_PROPERTIES(git2 PROPERTIES VERSION ${LIBGIT2_VERSION_STRING}) SET_TARGET_PROPERTIES(git2 PROPERTIES VERSION ${LIBGIT2_VERSION_STRING})
SET_TARGET_PROPERTIES(git2 PROPERTIES SOVERSION ${LIBGIT2_VERSION_MAJOR}) SET_TARGET_PROPERTIES(git2 PROPERTIES SOVERSION ${LIBGIT2_VERSION_MAJOR})

3
src/netops.c
View File

@ -23,11 +23,12 @@
* Boston, MA 02110-1301, USA. * Boston, MA 02110-1301, USA.
*/ */
#ifndef _MSC_VER #ifndef _WIN32
# include <sys/types.h> # include <sys/types.h>
# include <sys/socket.h> # include <sys/socket.h>
# include <netdb.h> # include <netdb.h>
#else #else
# define _WIN32_WINNT 0x0501
# include <winsock2.h> # include <winsock2.h>
# include <Ws2tcpip.h> # include <Ws2tcpip.h>
# pragma comment(lib, "Ws2_32.lib") # pragma comment(lib, "Ws2_32.lib")

10
src/transport_git.c
View File

@ -23,16 +23,6 @@
* Boston, MA 02110-1301, USA. * Boston, MA 02110-1301, USA.
*/ */
#ifndef _MSC_VER
# include <sys/types.h>
# include <sys/socket.h>
# include <netdb.h>
#else
# include <winsock2.h>
# include <Ws2tcpip.h>
# pragma comment(lib, "Ws2_32.lib")
#endif
#include "git2/net.h" #include "git2/net.h"
#include "git2/pkt.h" #include "git2/pkt.h"
#include "git2/common.h" #include "git2/common.h"