From 58d2417c959c7ed305a2e229ce406660ab6d13df Mon Sep 17 00:00:00 2001 From: Sven Gestegard Robertz <sven.robertz@cs.lth.se> Date: Wed, 29 Apr 2015 15:30:52 +0200 Subject: [PATCH] added version 2014 to os_compat.mk --- lib/c/os_compat.mk | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/lib/c/os_compat.mk b/lib/c/os_compat.mk index f07be3d..505c7a2 100644 --- a/lib/c/os_compat.mk +++ b/lib/c/os_compat.mk @@ -1,10 +1,12 @@ ## Macros UNAME_S=$(shell uname -s) +VERSION=2014 +LIBVERSION=2014 ifeq ($(UNAME_S),Linux) CC=$(CROSS_COMPILE)gcc LD=$(CROSS_COMPILE)gcc - CFLAGS=-std=c99 -g -Wall -Werror -O3 -I. + CFLAGS=-std=c99 -g -Wall -Werror -O3 -I. CFLAGS_TEST=$(CFLAGS) -Itest LDFLAGS=-L.. LDLIBS=-llabcomm$(LIBVERSION) -lrt @@ -15,17 +17,18 @@ else ifeq ($(UNAME_S),Darwin) CC=$(CROSS_COMPILE)gcc LD=$(CROSS_COMPILE)gcc CFLAGS=-g -Wall -Werror -O3 -I. -Itest \ - -DLABCOMM_COMPAT=\"labcomm$(LIBVERSION)_compat_osx.h\" \ - -DLABCOMM_OS_DARWIN=1 -# -Wno-tautological-compare -Wno-unused-function - CFLAGS+=-std=c99 - LDFLAGS=-L.. + -DLABCOMM_COMPAT=\"labcomm$(VERSION)_compat_osx.h\" \ + -DLABCOMM_OS_DARWIN=1 \ + -Wno-unused-function +# -Wno-tautological-compare + CFLAGS+=-std=c99 + LDFLAGS=-L.. LDLIBS=-llabcomm$(LIBVERSION) - MAKESHARED=clang -o $1 -shared -Wl,-install_name,$2 $3 -lc + MAKESHARED=clang -o $1 -shared -Wl,-install_name,$2 $3 -lc else ifneq ($(findstring CYGWIN,$(UNAME_S)),) CC=$(CROSS_COMPILE)gcc LD=$(CROSS_COMPILE)ld - CFLAGS=-std=c99 -g -Wall -Werror -O3 -I. + CFLAGS=-std=c99 -g -Wall -Werror -O3 -I. LDFLAGS=-L.. LDLIBS=-llabcomm$(LIBVERSION) -lrt ALL_DEPS:=$(filter-out %.so.1, $(ALL_DEPS)) # No -fPIC supported in windows? -- GitLab