eukara/fteqw
1
0
Fork 0
forked from fte/fteqw
Code Pull requests Activity

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.

Browse source 
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@4486 fc73d0e0-1445-4013-8a0c-d673dee63da5
This commit is contained in:
Spoike 2013-09-29 17:07:57 +00:00
parent 89ed71b134
commit dad407a8c3
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
engine/Makefile
View file

@ -277,7 +277,7 @@ RELEASE_DIR=$(BASE_DIR)/release
DEBUG_DIR=$(BASE_DIR)/debug DEBUG_DIR=$(BASE_DIR)/debug
PROFILE_DIR=$(BASE_DIR)/profile 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) #cheap compile-everything-in-one-unit (compile becomes preprocess only)
ifneq ($(WPO),) ifneq ($(WPO),)
@ -334,13 +334,15 @@ OGGVORBISLDFLAGS ?= -lvorbisfile -lvorbis -logg
#BASELDFLAGS=-lm -lz #BASELDFLAGS=-lm -lz
XLDFLAGS=$(IMAGELDFLAGS) XLDFLAGS=$(IMAGELDFLAGS)
#hack some other arguments based upon the toolchain
ifeq ($(FTE_TARGET),vc) ifeq ($(FTE_TARGET),vc)
WARNINGFLAGS=-W3 -D_CRT_SECURE_NO_WARNINGS WARNINGFLAGS=-W3 -D_CRT_SECURE_NO_WARNINGS
GNUC_FUNCS= GNUC_FUNCS=
VISIBILITY_FLAGS=
else else
WARNINGFLAGS=-Wall -Wno-pointer-sign -Wno-unknown-pragmas -Wno-format-zero-length WARNINGFLAGS=-Wall -Wno-pointer-sign -Wno-unknown-pragmas -Wno-format-zero-length
GNUC_FUNCS= -Dstrnicmp=strncasecmp -Dstricmp=strcasecmp GNUC_FUNCS= -Dstrnicmp=strncasecmp -Dstricmp=strcasecmp
VISIBILITY_FLAGS=-fvisibility=hidden
endif endif
SDL_INCLUDES=-I$(LIBS_DIR)/sdl/include -I/usr/include/SDL -I$(LIBS_DIR)/sdl/include/SDL SDL_INCLUDES=-I$(LIBS_DIR)/sdl/include -I/usr/include/SDL -I$(LIBS_DIR)/sdl/include/SDL