diff options
| author | <shinichiro.hamaji@gmail.com> | 2013-02-18 10:56:53 +0000 |
|---|---|---|
| committer | <shinichiro.hamaji@gmail.com> | 2013-02-18 10:56:53 +0000 |
| commit | 478a80caa0cf072d73e268d0bea46428b328943c (patch) | |
| tree | 3cf77346f68c0669c55b97e3fbc5fa8a14be1f98 /Makefile.am | |
| parent | a106e61178d55c4d3b296c332d3f8c1eb43bcc1e (diff) | |
| download | glog-478a80caa0cf072d73e268d0bea46428b328943c.tar.gz glog-478a80caa0cf072d73e268d0bea46428b328943c.tar.bz2 glog-478a80caa0cf072d73e268d0bea46428b328943c.zip | |
Attempt to improve mingw-w64 support
- Set -Isrc/windows for mingw
- Check existence of sigaction, pread, and pwrite
- Provide alternative implementation of pread and pwrite
- Eliminate symlink code for OS_WINDOWS
- Don't check /proc/self/fd if the OS isn't linux
- Don't use MSVC specific declarations in port.h for mingw
git-svn-id: https://google-glog.googlecode.com/svn/trunk@135 eb4d4688-79bd-11dd-afb4-1d65580434c0
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/Makefile.am b/Makefile.am index cff3352..b598fa3 100644 --- a/Makefile.am +++ b/Makefile.am @@ -51,7 +51,8 @@ lib_LTLIBRARIES = # The libraries libglog depends on. COMMON_LIBS = $(PTHREAD_LIBS) $(GFLAGS_LIBS) $(UNWIND_LIBS) # Compile switches for our unittest. -TEST_CFLAGS = $(GTEST_CFLAGS) $(GMOCK_CFLAGS) $(GFLAGS_CFLAGS) $(AM_CXXFLAGS) +TEST_CFLAGS = $(GTEST_CFLAGS) $(GMOCK_CFLAGS) $(GFLAGS_CFLAGS) \ + $(MINGW_CFLAGS) $(AM_CXXFLAGS) # Libraries for our unittest. TEST_LIBS = $(GTEST_LIBS) $(GMOCK_LIBS) $(GFLAGS_LIBS) @@ -195,7 +196,8 @@ libglog_la_SOURCES = $(gloginclude_HEADERS) \ src/base/commandlineflags.h src/googletest.h nodist_libglog_la_SOURCES = $(nodist_gloginclude_HEADERS) -libglog_la_CXXFLAGS = $(PTRHEAD_CFLAGS) $(GFLAGS_CFLAGS) $(AM_CXXFLAGS) -DNDEBUG +libglog_la_CXXFLAGS = $(PTRHEAD_CFLAGS) $(GFLAGS_CFLAGS) $(MINGW_CFLAGS) \ + $(AM_CXXFLAGS) -DNDEBUG libglog_la_LDFLAGS = $(PTRHEAD_CFLAGS) $(GFLAGS_LDFLAGS) libglog_la_LIBADD = $(COMMON_LIBS) |