Merge branch 'mingw-support' of https://github.com/alex85k/Project-OSRM into alex85k-mingw-support
This commit is contained in:
		
						commit
						accaf6e77e
					
				| @ -117,7 +117,7 @@ if(CMAKE_BUILD_TYPE MATCHES Release) | ||||
| 
 | ||||
|     # Since gcc 4.9 the LTO format is non-standart ('slim'), so we need to use the build-in tools | ||||
|     if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU" AND | ||||
|         NOT "${CMAKE_CXX_COMPILER_VERSION}" VERSION_LESS "4.9.0") | ||||
|         NOT "${CMAKE_CXX_COMPILER_VERSION}" VERSION_LESS "4.9.0" AND NOT MINGW) | ||||
|       message(STATUS "Using gcc specific binutils for LTO.") | ||||
|       set(CMAKE_AR     "/usr/bin/gcc-ar") | ||||
|       set(CMAKE_RANLIB "/usr/bin/gcc-ranlib") | ||||
| @ -137,7 +137,7 @@ elseif("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU") | ||||
|   # using GCC | ||||
|   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -pedantic -fPIC") | ||||
|   if (WIN32) # using mingw | ||||
|     add_definitions(-DM_PI=3.141592653589793238462643383) # define M_PI | ||||
|     add_definitions(-D_USE_MATH_DEFINES) # define M_PI, M_1_PI etc. | ||||
|     add_definitions(-DWIN32) | ||||
|     SET(OPTIONAL_SOCKET_LIBS ws2_32 wsock32) | ||||
|   endif() | ||||
|  | ||||
		Loading…
	
		Reference in New Issue
	
	Block a user