Open-Harbor/osrm-backend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 3 Wiki Activity

Merge pull request #1271 from alex85k/mingw-full

Browse Source 
Support building tools on Windows, more MinGW
This commit is contained in:
Dennis Luxen 2014-11-17 09:18:40 +01:00
commit c3f9dc7400
3 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Algorithms/StronglyConnectedComponents.h
View File

@ -50,7 +50,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include <tbb/parallel_sort.h> #include <tbb/parallel_sort.h>
#ifdef __APPLE__ #if defined(__APPLE__) || defined (_WIN32)
#include <gdal.h> #include <gdal.h>
#include <ogrsf_frmts.h> #include <ogrsf_frmts.h>
#else #else

5
CMakeLists.txt
View File

@ -248,6 +248,11 @@ target_link_libraries(OSRM ${STXXL_LIBRARY})
target_link_libraries(osrm-extract ${STXXL_LIBRARY}) target_link_libraries(osrm-extract ${STXXL_LIBRARY})
target_link_libraries(osrm-prepare ${STXXL_LIBRARY}) target_link_libraries(osrm-prepare ${STXXL_LIBRARY})
if(MINGW)
# STXXL needs OpenMP library
target_link_libraries(osrm-extract gomp)
endif()
find_package( OSMPBF REQUIRED ) find_package( OSMPBF REQUIRED )
include_directories(${OSMPBF_INCLUDE_DIR}) include_directories(${OSMPBF_INCLUDE_DIR})
target_link_libraries(osrm-extract ${OSMPBF_LIBRARY}) target_link_libraries(osrm-extract ${OSMPBF_LIBRARY})

13
Tools/io-benchmark.cpp
View File

@ -70,21 +70,22 @@ void RunStatistics(std::vector<double> &timings_vector, Statistics &stats)
int main(int argc, char *argv[]) int main(int argc, char *argv[])
{ {
LogPolicy::GetInstance().Unmute();
boost::filesystem::path test_path;
try
{
SimpleLogger().Write() << "starting up engines, " << g_GIT_DESCRIPTION;
#ifdef __FreeBSD__ #ifdef __FreeBSD__
SimpleLogger().Write() << "Not supported on FreeBSD"; SimpleLogger().Write() << "Not supported on FreeBSD";
return 0; return 0;
#endif #endif
#ifdef WIN32 #ifdef _WIN32
SimpleLogger().Write() << "Not supported on Windows"; SimpleLogger().Write() << "Not supported on Windows";
return 0; return 0;
#else #else
LogPolicy::GetInstance().Unmute();
boost::filesystem::path test_path;
try
{
SimpleLogger().Write() << "starting up engines, " << g_GIT_DESCRIPTION;
if (1 == argc) if (1 == argc)
{ {
SimpleLogger().Write(logWARNING) << "usage: " << argv[0] << " /path/on/device"; SimpleLogger().Write(logWARNING) << "usage: " << argv[0] << " /path/on/device";