From 4d093af454d8160ef0c56bffbc498edba93f9aa4 Mon Sep 17 00:00:00 2001 From: "Alejandro V. Garcia" Date: Sat, 16 Nov 2013 11:00:23 +0000 Subject: [PATCH] revert makefile changes git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@7674 e016b1c5-ed68-44aa-a2f7-31cac88cffde --- source/src/Makefile | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/source/src/Makefile b/source/src/Makefile index 0cd4f6e1..07de5c2b 100644 --- a/source/src/Makefile +++ b/source/src/Makefile @@ -1,10 +1,6 @@ CXXFLAGS= -O3 -fomit-frame-pointer -ifneq (,$(findstring MINGW,$(PLATFORM))) - CXXFLAGS+= -Wall -fsigned-char -else - CXX=clang++ # Use clang++, as g++ optimizations cause crashes... - override CXXFLAGS+= -Wall -fsigned-char -endif +CXX=clang++ # Use clang++, as g++ optimizations cause crashes... +override CXXFLAGS+= -Wall -fsigned-char PLATFORM= $(shell uname -s) PLATFORM_PREFIX=native @@ -22,7 +18,7 @@ MV=mv ifneq (,$(findstring MINGW,$(PLATFORM))) WINDRES= windres CLIENT_INCLUDES= $(INCLUDES) -I../include -CLIENT_LIBS= -mwindows -L../lib -lSDL -lSDL_image -lzdll -lopengl32 -lenet -lOpenAL32 -llibvorbisfile -llibintl -lws2_32 -lwinmm -llibcurl +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 # clang++ doesn't use this...