From 5bb896392f1338a013fa895d9260cc7c21f3585d Mon Sep 17 00:00:00 2001 From: Spoike Date: Mon, 30 Sep 2013 00:03:16 +0000 Subject: [PATCH] git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@4489 fc73d0e0-1445-4013-8a0c-d673dee63da5 --- engine/Makefile | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/engine/Makefile b/engine/Makefile index 8b30cb057..effafec86 100644 --- a/engine/Makefile +++ b/engine/Makefile @@ -277,7 +277,7 @@ RELEASE_DIR=$(BASE_DIR)/release DEBUG_DIR=$(BASE_DIR)/debug PROFILE_DIR=$(BASE_DIR)/profile -ALL_CFLAGS=$(HAVECONFIG) $(VISIBILITY_FLAGS)$(CFLAGS) $(BASE_CFLAGS) $(WCFLAGS) +ALL_CFLAGS=$(HAVECONFIG) $(VISIBILITY_FLAGS) $(CFLAGS) $(BASE_CFLAGS) $(WCFLAGS) #cheap compile-everything-in-one-unit (compile becomes preprocess only) ifneq ($(WPO),) @@ -308,6 +308,16 @@ ifeq ($(FTE_TARGET),morphos) endif ifeq ($(FTE_TARGET),bsd) BASELDFLAGS=-lm + VISIBILITY_FLAGS=-fvisibility=hidden +endif +ifeq ($(FTE_TARGET),linux) + VISIBILITY_FLAGS=-fvisibility=hidden +endif +ifeq ($(FTE_TARGET),droid) + VISIBILITY_FLAGS=-fvisibility=hidden +endif +ifeq ($(FTE_TARGET),macosx) + VISIBILITY_FLAGS=-fvisibility=hidden endif BASELDFLAGS ?= -lm -ldl -lpthread @@ -330,6 +340,7 @@ endif IMAGELDFLAGS ?= -lpng -ljpeg OGGVORBISLDFLAGS ?= -lvorbisfile -lvorbis -logg +VISIBILITY_FLAGS?= #BASELDFLAGS=-lm -lz XLDFLAGS=$(IMAGELDFLAGS) @@ -338,11 +349,9 @@ XLDFLAGS=$(IMAGELDFLAGS) ifeq ($(FTE_TARGET),vc) WARNINGFLAGS=-W3 -D_CRT_SECURE_NO_WARNINGS GNUC_FUNCS= - VISIBILITY_FLAGS= else WARNINGFLAGS=-Wall -Wno-pointer-sign -Wno-unknown-pragmas -Wno-format-zero-length GNUC_FUNCS= -Dstrnicmp=strncasecmp -Dstricmp=strcasecmp - VISIBILITY_FLAGS=-fvisibility=hidden endif SDL_INCLUDES=-I$(LIBS_DIR)/sdl/include -I/usr/include/SDL -I$(LIBS_DIR)/sdl/include/SDL