From dad407a8c3508dbb07818e97b1e00327fa08af8e Mon Sep 17 00:00:00 2001 From: Spoike Date: Sun, 29 Sep 2013 17:07:57 +0000 Subject: [PATCH] hide our internals properly, to avoid issues with symbol name conflicts (which is currently crashing quake2 gamecode). Why the fuck this option isn't enabled by default I have no idea. git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@4486 fc73d0e0-1445-4013-8a0c-d673dee63da5 --- engine/Makefile | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/engine/Makefile b/engine/Makefile index 8d64366a7..8b30cb057 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) $(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),) @@ -334,13 +334,15 @@ OGGVORBISLDFLAGS ?= -lvorbisfile -lvorbis -logg #BASELDFLAGS=-lm -lz XLDFLAGS=$(IMAGELDFLAGS) +#hack some other arguments based upon the toolchain 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