From 71d081fd16d617dfd13855073bf4dbb7a848caa4 Mon Sep 17 00:00:00 2001 From: RandumKiwi Date: Tue, 22 Oct 2013 19:19:27 +0000 Subject: [PATCH] clang++ is default git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@7614 e016b1c5-ed68-44aa-a2f7-31cac88cffde --- source/src/Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/source/src/Makefile b/source/src/Makefile index 1ba1442d..07de5c2b 100644 --- a/source/src/Makefile +++ b/source/src/Makefile @@ -1,4 +1,5 @@ CXXFLAGS= -O3 -fomit-frame-pointer +CXX=clang++ # Use clang++, as g++ optimizations cause crashes... override CXXFLAGS+= -Wall -fsigned-char PLATFORM= $(shell uname -s) @@ -20,7 +21,7 @@ CLIENT_INCLUDES= $(INCLUDES) -I../include CLIENT_LIBS= -mwindows -L../lib -lSDL -lSDL_image -lzdll -lopengl32 -lenet -lOpenAL32 -llibvorbisfile -llibintl -lws2_32 -lwinmm -lcurl else USRLIB=$(shell if [ -e /usr/lib64 ]; then echo "/usr/lib64"; else echo "/usr/lib"; fi) -override CXXFLAGS+= -rdynamic +# override CXXFLAGS+= -rdynamic # clang++ doesn't use this... CLIENT_INCLUDES= $(INCLUDES) -I/usr/include `sdl-config --cflags` -idirafter ../include CLIENT_LIBS= -L../enet/.libs -lenet -L$(USRLIB) -lX11 `sdl-config --libs` -lSDL_image -lz -lGL -lopenal -lvorbisfile -lcurl endif