-Werror is sooo dependent upon the specific compiler

This commit is contained in:
espie 2017-05-04 20:57:05 +00:00
parent aaf442d5e8
commit 1c1c23bdd7

View File

@ -1,6 +1,7 @@
$OpenBSD: patch-makefile,v 1.4 2011/05/08 21:47:44 kili Exp $
--- makefile.orig Sun Apr 17 16:56:56 2011
+++ makefile Sun May 8 15:40:35 2011
$OpenBSD: patch-makefile,v 1.5 2017/05/04 20:57:05 espie Exp $
Index: makefile
--- makefile.orig
+++ makefile
@@ -1,16 +1,16 @@
PROG = blobwars
PAKNAME = blobwars.pak
@ -22,11 +23,13 @@ $OpenBSD: patch-makefile,v 1.4 2011/05/08 21:47:44 kili Exp $
DOCDIR ?= $(PREFIX)/share/doc/$(PROG)/
ICONDIR ?= $(PREFIX)/share/icons/hicolor/
DESKTOPDIR ?= $(PREFIX)/share/applications/
@@ -22,7 +22,7 @@ CXXFLAGS += `sdl-config --cflags` -DVERSION=$(VERSION)
@@ -21,8 +21,8 @@ MEDAL_SERVER_PORT = 80
CXXFLAGS += `sdl-config --cflags` -DVERSION=$(VERSION) -DRELEASE=$(RELEASE) -DUSEPAK=$(USEPAK)
CXXFLAGS += -DPAKNAME=\"$(PAKNAME)\" -DPAKLOCATION=\"$(DATADIR)\" -DUNIX -DGAMEPLAYMANUAL=\"$(DOCDIR)index.html\" -Wall
CXXFLAGS += -DLOCALEDIR=\"$(LOCALEDIR)\" -DMEDAL_SERVER_HOST=\"$(MEDAL_SERVER_HOST)\" -DMEDAL_SERVER_PORT=$(MEDAL_SERVER_PORT)
CXXFLAGS += $(CFLAGS) -Werror
-CXXFLAGS += $(CFLAGS) -Werror
-LIBS = `sdl-config --libs` -lSDL_mixer -lSDL_image -lSDL_ttf -lSDL_net -lz
+CXXFLAGS += $(CFLAGS)
+LIBS = `sdl-config --libs` -lSDL_mixer -lSDL_image -lSDL_ttf -lSDL_net -lz -lintl -liconv
OBJS += CAudio.o