Fix benchmarks build and google test build (nw)

This commit is contained in:
Miodrag Milanovic 2016-09-03 14:54:15 +02:00
parent 854ac627c2
commit 22df94bf67
2 changed files with 3 additions and 9 deletions

View File

@ -396,16 +396,10 @@
# include <io.h>
# endif
// In order to avoid having to include <windows.h>, use forward declaration
#if GTEST_OS_WINDOWS_MINGW
// MinGW defined _CRITICAL_SECTION and _RTL_CRITICAL_SECTION as two
// separate (equivalent) structs, instead of using typedef
typedef struct _CRITICAL_SECTION GTEST_CRITICAL_SECTION;
#else
// Assume CRITICAL_SECTION is a typedef of _RTL_CRITICAL_SECTION.
// This assumption is verified by
// WindowsTypesTest.CRITICAL_SECTIONIs_RTL_CRITICAL_SECTION.
typedef struct _RTL_CRITICAL_SECTION GTEST_CRITICAL_SECTION;
#endif
#else
// This assumes that non-Windows OSes provide unistd.h. For OSes where this
// is not the case, we need to include headers that provide the functions

View File

@ -29,15 +29,15 @@ project "benchmark"
MAME_DIR .. "3rdparty/benchmark/src/benchmark.cc",
MAME_DIR .. "3rdparty/benchmark/src/colorprint.cc",
MAME_DIR .. "3rdparty/benchmark/src/commandlineflags.cc",
MAME_DIR .. "3rdparty/benchmark/src/complexity.cc",
MAME_DIR .. "3rdparty/benchmark/src/console_reporter.cc",
MAME_DIR .. "3rdparty/benchmark/src/csv_reporter.cc",
MAME_DIR .. "3rdparty/benchmark/src/json_reporter.cc",
MAME_DIR .. "3rdparty/benchmark/src/log.cc",
MAME_DIR .. "3rdparty/benchmark/src/reporter.cc",
MAME_DIR .. "3rdparty/benchmark/src/sleep.cc",
MAME_DIR .. "3rdparty/benchmark/src/string_util.cc",
MAME_DIR .. "3rdparty/benchmark/src/sysinfo.cc",
MAME_DIR .. "3rdparty/benchmark/src/walltime.cc",
MAME_DIR .. "3rdparty/benchmark/src/sysinfo.cc",
MAME_DIR .. "3rdparty/benchmark/src/timers.cc",
MAME_DIR .. "3rdparty/benchmark/src/re_std.cc",
}