Commit 5f2a107b by Orgad Shaneh Committed by Dominic Hamon

Fix cross-compilation with mingw/linux (#758)

parent 40fce80e
...@@ -33,7 +33,7 @@ endif() ...@@ -33,7 +33,7 @@ endif()
# We need extra libraries on Windows # We need extra libraries on Windows
if(${CMAKE_SYSTEM_NAME} MATCHES "Windows") if(${CMAKE_SYSTEM_NAME} MATCHES "Windows")
target_link_libraries(benchmark Shlwapi) target_link_libraries(benchmark shlwapi)
endif() endif()
set(include_install_dir "include") set(include_install_dir "include")
......
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
#include "internal_macros.h" #include "internal_macros.h"
#ifdef BENCHMARK_OS_WINDOWS #ifdef BENCHMARK_OS_WINDOWS
#include <Windows.h> #include <windows.h>
#include <io.h> #include <io.h>
#else #else
#include <unistd.h> #include <unistd.h>
......
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
#include "internal_macros.h" #include "internal_macros.h"
#ifdef BENCHMARK_OS_WINDOWS #ifdef BENCHMARK_OS_WINDOWS
#include <Windows.h> #include <windows.h>
#endif #endif
namespace benchmark { namespace benchmark {
......
...@@ -15,9 +15,9 @@ ...@@ -15,9 +15,9 @@
#include "internal_macros.h" #include "internal_macros.h"
#ifdef BENCHMARK_OS_WINDOWS #ifdef BENCHMARK_OS_WINDOWS
#include <Shlwapi.h> #include <shlwapi.h>
#include <VersionHelpers.h> #include <versionhelpers.h>
#include <Windows.h> #include <windows.h>
#else #else
#include <fcntl.h> #include <fcntl.h>
#include <sys/resource.h> #include <sys/resource.h>
......
...@@ -16,9 +16,9 @@ ...@@ -16,9 +16,9 @@
#include "internal_macros.h" #include "internal_macros.h"
#ifdef BENCHMARK_OS_WINDOWS #ifdef BENCHMARK_OS_WINDOWS
#include <Shlwapi.h> #include <shlwapi.h>
#include <VersionHelpers.h> #include <versionhelpers.h>
#include <Windows.h> #include <windows.h>
#else #else
#include <fcntl.h> #include <fcntl.h>
#include <sys/resource.h> #include <sys/resource.h>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment