File fix-makefile.patch of Package brainparty

Overview Repositories Revisions Requests Users Attributes Meta

File fix-makefile.patch of Package brainparty

diff -Nur brainparty/Makefile new/Makefile
--- brainparty/Makefile	2010-03-02 14:42:51.000000000 +0100
+++ new/Makefile	2016-06-28 12:19:02.135625975 +0200
@@ -2,31 +2,33 @@
 OBJFILES := $(patsubst %.cpp,%.o,$(wildcard *.cpp))
 
 ifeq ($(MACHINE),Darwin)
-	INCLUDES = -I/Library/Frameworks/SDL.framework/Headers -I/Library/Frameworks/SDL_image.framework/Headers -I/Library/Frameworks/SDL_mixer.framework/Headers -I/Library/Frameworks/SDL_ttf.framework/Headers -I/System/Library/Frameworks/OpenGL.framework/Headers
-	LIBS = -m32 -framework SDL -framework SDL_image -framework SDL_mixer -framework SDL_ttf -framework Cocoa -framework OpenGL
+	INCLUDES := -I/Library/Frameworks/SDL.framework/Headers -I/Library/Frameworks/SDL_image.framework/Headers -I/Library/Frameworks/SDL_mixer.framework/Headers -I/Library/Frameworks/SDL_ttf.framework/Headers -I/System/Library/Frameworks/OpenGL.framework/Headers
+
+	LIBS     := -m32 -framework SDL -framework SDL_image -framework SDL_mixer -framework SDL_ttf -framework Cocoa -framework OpenGL
 
 	# SDL isn't in a great state on 64-bit Macs, so force 32-bit for now
-	CXXFLAGS = -g -c -m32 -Wno-deprecated
+	m_CXXFLAGS = -g -c -m32 -Wno-deprecated
 
 	# to compile on OS X you need to include this Objective C file
 	OSXCOMPAT = SDLMain.m
 else
-	INCLUDES = `sdl-config --cflags` -I/usr/X11R6/include
-	LIBS = `sdl-config --libs` -lGL -lGLU -lSDL_mixer -lSDL_ttf -lSDL_gfx -lSDL_image 
-	CXXFLAGS = -g -c -Wno-deprecated
-	OSXCOMPAT = 
+	INCLUDES   := `sdl-config --cflags` -I/usr/X11R6/include
+	LIBS       := `sdl-config --libs` -lGL -lGLU -lSDL_mixer -lSDL_ttf -lSDL_gfx -lSDL_image
+	m_CXXFLAGS := -g -std=c++98 -Wno-deprecated
+	OSXCOMPAT  := 
 endif
 
 # object files have corresponding source files
-CXX = g++
+CXX        ?= g++
+m_CXXFLAGS := $(m_CXXFLAGS) $(CXXFLAGS)
 
 all: brainparty
 
 brainparty: $(OBJFILES)
-	$(CXX) -o brainparty $(INCLUDES) $(LIBS) $(OSXCOMPAT) $(OBJFILES)
+	$(CXX) -o brainparty $(OBJFILES) $(OSXCOMPAT) $(LIBS)
 
 %.o: %.cpp
-	$(CXX) $(CXXFLAGS) $(INCLUDES) -o $@ $<
+	$(CXX) -c -o $@ $(m_CXXFLAGS) $(INCLUDES) $<
 
 clean:
 	rm -f brainparty *.o

Places

File fix-makefile.patch of Package brainparty

Places