Merge branch 'development' into dtls

* development:
  Fix -fPIC when cross-compiling to windows
This commit is contained in:
Manuel Pégourié-Gonnard 2015-02-18 18:14:53 +00:00
commit cabf4b83ab

View file

@ -17,10 +17,15 @@ endif
# To compile on Plan9:
# CFLAGS += -D_BSD_EXTENSION
# if were running on Windows build for Windows
ifdef WINDOWS
WINDOWS_BUILD=1
endif
# To compile as a shared library:
ifdef SHARED
# all code is position-indep with mingw, avoid warning about useless flag
ifndef WINDOWS
ifndef WINDOWS_BUILD
CFLAGS += -fPIC
endif
endif
@ -31,14 +36,6 @@ DLEXT=so
# OSX shared library extension:
# DLEXT=dylib
#
# if we running on Windows build
# for Windows
#
ifdef WINDOWS
WINDOWS_BUILD=1
endif
# Windows shared library extension:
ifdef WINDOWS_BUILD
DLEXT=dll