King_DuckZ/Loki
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Cygwin fixes: build with mingw 3.4.4 and 4.3.2

Browse source 
git-svn-id: svn://svn.code.sf.net/p/loki-lib/code/trunk@950 7ec92016-0320-0410-acc4-a06ded1c099a
This commit is contained in:
syntheticpp 2009-01-26 19:45:54 +00:00
parent 6968fcd422
commit 797f97f415
3 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
include/loki/CachedFactory.h
View file

@ -37,7 +37,7 @@
#define D( x ) ; #define D( x ) ;
#endif #endif
#ifdef _MSC_VER #if defined(_MSC_VER) || defined(__CYGWIN__)
#include <time.h> #include <time.h>
#endif #endif

6
src/LevelMutex.cpp
View file

@ -20,6 +20,8 @@
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
#if !defined(__CYGWIN__) || (defined(__CYGWIN__) && __GNUC__ > 3)
#include <loki/LevelMutex.h> #include <loki/LevelMutex.h>
#include <algorithm> #include <algorithm>
@ -1148,3 +1150,7 @@ bool MultiMutexLocker::Unlock( void )
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
} // end namespace Loki } // end namespace Loki
#endif

1
src/Makefile
View file

@ -31,6 +31,7 @@ ifeq ($(OS), GNU)
SHARED_LIB_VERSIONED := libloki.so.$(VERSION) SHARED_LIB_VERSIONED := libloki.so.$(VERSION)
override LDFLAGS += --shared -Wl,-soname=$(SHARED_LIB_VERSIONED) -fPIC override LDFLAGS += --shared -Wl,-soname=$(SHARED_LIB_VERSIONED) -fPIC
LDLIBS := -lpthread LDLIBS := -lpthread
else
ifeq ($(OS), HP-UX) ifeq ($(OS), HP-UX)
SHARED_LIB_BASE := libloki.so SHARED_LIB_BASE := libloki.so
SHARED_LIB_VERSIONED := libloki.so.$(VERSION) SHARED_LIB_VERSIONED := libloki.so.$(VERSION)