From 8fed9e47d16b2d7dc33e326a4ce401de72c989c2 Mon Sep 17 00:00:00 2001 From: Rolzad73 Date: Sat, 28 Jan 2017 04:50:07 -0500 Subject: [PATCH] - Travis PSP build broke, attempt to fix --- projects/mtg/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/projects/mtg/Makefile b/projects/mtg/Makefile index 692836175..7b60dc481 100644 --- a/projects/mtg/Makefile +++ b/projects/mtg/Makefile @@ -80,7 +80,7 @@ OBJS += objs/TestSuiteAI.o INCDIR = -I../../JGE/include -I../../JGE/src -I/usr/X11/include -I../../projects/mtg/include -I/usr/include/boost -I../../JGE/src/zipFS LIBDIR = -L../../JGE/lib/linux -L../../JGE -L/usr/X11/lib LIBS = -ljge -lfreetype -ljpeg -lgif -lpng -lz -lm -lstdc++ -lhgetools -lGL -lGLU -lX11 -lpthread $(FMOD) -CFLAGS = $(INCDIR) -DLINUX -DUSE_PRECOMPILED_HEADERS=1 -DTIXML_USE_STL +CFLAGS = $(INCDIR) -DLINUX -DUSE_PRECOMPILED_HEADERS=1 -DTIXML_USE_STL -Wno-nonnull-compare ASFLAGS = $(CXXFLAGS) @@ -91,7 +91,7 @@ OBJS += objs/TestSuiteAI.o INCDIR = -I../../JGE/include -I../../JGE/src -I/usr/X11/include -I../../projects/mtg/include -I../../Boost -I../../JGE/src/zipFS LIBDIR = -L../../JGE/lib/linux -L../../JGE -L/usr/X11/lib -L../../Boost/lib LIBS = -ljge -lfreetype -ljpeg -lgif -lpng -lz -lm -lstdc++ -lhgetools -lGL -lGLU -lX11 -lboost_thread $(FMOD) -CFLAGS = $(INCDIR) -DLINUX -DUSE_PRECOMPILED_HEADERS=1 +CFLAGS = $(INCDIR) -DLINUX -DUSE_PRECOMPILED_HEADERS=1 -Wno-nonnull-compare ASFLAGS = $(CXXFLAGS) @@ -99,7 +99,7 @@ all: $(DEFAULT_RULE) endif -CFLAGS := -Wall -W -Werror -Wno-unused -Wno-deprecated-declarations -Wno-nonnull-compare $(CFLAGS) +CFLAGS := -Wall -W -Werror -Wno-unused -Wno-deprecated-declarations $(CFLAGS) CXXFLAGS += $(CFLAGS) # -fno-exceptions