From c75ce210ea0a08a00e7dc727b78ee6f7a9e8db67 Mon Sep 17 00:00:00 2001 From: alex85k Date: Sun, 16 Nov 2014 21:33:41 +0500 Subject: [PATCH] support building tools on Windows --- Algorithms/StronglyConnectedComponents.h | 2 +- CMakeLists.txt | 5 +++++ Tools/io-benchmark.cpp | 13 +++++++------ 3 files changed, 13 insertions(+), 7 deletions(-) diff --git a/Algorithms/StronglyConnectedComponents.h b/Algorithms/StronglyConnectedComponents.h index 681f78fa3..4bee59109 100644 --- a/Algorithms/StronglyConnectedComponents.h +++ b/Algorithms/StronglyConnectedComponents.h @@ -50,7 +50,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include -#ifdef __APPLE__ +#if defined(__APPLE__) || defined (_WIN32) #include #include #else diff --git a/CMakeLists.txt b/CMakeLists.txt index 81b72a558..839f70503 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -248,6 +248,11 @@ target_link_libraries(OSRM ${STXXL_LIBRARY}) target_link_libraries(osrm-extract ${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 ) include_directories(${OSMPBF_INCLUDE_DIR}) target_link_libraries(osrm-extract ${OSMPBF_LIBRARY}) diff --git a/Tools/io-benchmark.cpp b/Tools/io-benchmark.cpp index b43800055..241f3c84e 100644 --- a/Tools/io-benchmark.cpp +++ b/Tools/io-benchmark.cpp @@ -70,21 +70,22 @@ void RunStatistics(std::vector &timings_vector, Statistics &stats) 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__ SimpleLogger().Write() << "Not supported on FreeBSD"; return 0; #endif -#ifdef WIN32 +#ifdef _WIN32 SimpleLogger().Write() << "Not supported on Windows"; return 0; #else + LogPolicy::GetInstance().Unmute(); + boost::filesystem::path test_path; + try + { + SimpleLogger().Write() << "starting up engines, " << g_GIT_DESCRIPTION; + if (1 == argc) { SimpleLogger().Write(logWARNING) << "usage: " << argv[0] << " /path/on/device";