diff options
| author |  Nicolas "Pixel" Noble <pixel@nobis-crew.org> | 2015-08-04 23:13:43 +0200 |
|---|---|---|
| committer | Nicolas "Pixel" Noble <pixel@nobis-crew.org> | 2015-08-04 23:13:53 +0200 |
| commit | 2ed6878412d54ad1a6509de45d6351a3f697bb48 (patch) | |
| tree | e817f0c6730c30eb8e5e9797c6b637188dd3d790 /Makefile | |
| parent | 8956e606fbf30846ff07ac732cfb02d8d85b5e25 (diff) | |
Fixing environments where pkg-config isn't installed.
Depending on the presence of pkg-config, we're not necessarily doing the right thing in the Makefile. Zlib is a pkg-config dependency, but libm, libpthread, librt aren't.
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 62 |
1 files changed, 41 insertions, 21 deletions
@@ -268,34 +268,21 @@ INCLUDES = . include $(GENDIR) LDFLAGS += -Llibs/$(CONFIG) ifeq ($(SYSTEM),Darwin) -ifneq ($(wildcard /usr/local/ssl/include),) -INCLUDES += /usr/local/ssl/include -endif -ifneq ($(wildcard /opt/local/include),) -INCLUDES += /opt/local/include -endif -ifneq ($(wildcard /usr/local/include),) -INCLUDES += /usr/local/include -endif -LIBS = m z -ifneq ($(wildcard /usr/local/ssl/lib),) -LDFLAGS += -L/usr/local/ssl/lib -endif -ifneq ($(wildcard /opt/local/lib),) -LDFLAGS += -L/opt/local/lib -endif -ifneq ($(wildcard /usr/local/lib),) -LDFLAGS += -L/usr/local/lib -endif +LIBS += m endif ifeq ($(SYSTEM),Linux) -LIBS = rt m z pthread +LIBS += rt m pthread LDFLAGS += -pthread endif ifeq ($(SYSTEM),MINGW32) -LIBS = m z pthread +LIBS += m pthread +LDFLAGS += -pthread +endif + +ifeq ($(SYSTEM),FreeBSD) +LIBS += pthread LDFLAGS += -pthread endif @@ -387,6 +374,39 @@ ZLIB_CHECK_CMD = $(PKG_CONFIG) --exists zlib PROTOBUF_CHECK_CMD = $(PKG_CONFIG) --atleast-version=3.0.0-alpha-3 protobuf else # HAS_PKG_CONFIG +ifeq ($(SYSTEM),Darwin) +ifneq ($(wildcard /usr/local/ssl/include),) +INCLUDES += /usr/local/ssl/include +endif +ifneq ($(wildcard /opt/local/include),) +INCLUDES += /opt/local/include +endif +ifneq ($(wildcard /usr/local/include),) +INCLUDES += /usr/local/include +endif +ifneq ($(wildcard /usr/local/ssl/lib),) +LDFLAGS += -L/usr/local/ssl/lib +endif +ifneq ($(wildcard /opt/local/lib),) +LDFLAGS += -L/opt/local/lib +endif +ifneq ($(wildcard /usr/local/lib),) +LDFLAGS += -L/usr/local/lib +endif +endif + +ifeq ($(SYSTEM),Linux) +LIBS += z +endif + +ifeq ($(SYSTEM),MINGW32) +LIBS += z +endif + +ifeq ($(SYSTEM),FreeBSD) +LIBS += z +endif + ifeq ($(SYSTEM),MINGW32) OPENSSL_LIBS = ssl32 eay32 else |