From 8f4dbb0f3ee942b078562276e972fd959c4a37c2 Mon Sep 17 00:00:00 2001 From: Michael Sterrett Date: Thu, 31 Mar 2016 22:44:19 -0400 Subject: games-simulation/simutrans: version bump Package-Manager: portage-2.2.26 --- .../files/simutrans-0.120.1.3-Makefile.patch | 89 ++++++++++++++++++++++ 1 file changed, 89 insertions(+) create mode 100644 games-simulation/simutrans/files/simutrans-0.120.1.3-Makefile.patch (limited to 'games-simulation/simutrans/files') diff --git a/games-simulation/simutrans/files/simutrans-0.120.1.3-Makefile.patch b/games-simulation/simutrans/files/simutrans-0.120.1.3-Makefile.patch new file mode 100644 index 000000000000..d1ff41f33feb --- /dev/null +++ b/games-simulation/simutrans/files/simutrans-0.120.1.3-Makefile.patch @@ -0,0 +1,89 @@ +--- Makefile.orig ++++ Makefile +@@ -81,8 +81,6 @@ + ifeq ($(findstring $(OSTYPE), amiga haiku mac),) + CFLAGS += -minline-all-stringops + endif +-else +- CFLAGS += -O + endif + + ifdef DEBUG +@@ -101,6 +99,7 @@ + endif + else + CFLAGS += -DNDEBUG ++ CXXFLAGS += -DNDEBUG + endif + + ifneq ($(PROFILE),) +@@ -114,6 +113,7 @@ + ifneq ($(MULTI_THREAD),) + ifeq ($(shell expr $(MULTI_THREAD) \>= 1), 1) + CFLAGS += -DMULTI_THREAD ++ CXXFLAGS += -DMULTI_THREAD + ifeq ($(OSTYPE),mingw) + #use lpthreadGC2d for debug alternatively + LDFLAGS += -lpthreadGC2 +@@ -132,11 +132,13 @@ + endif + ifneq ($(REV),) + CFLAGS += -DREVISION="$(REV)" ++ CXXFLAGS += -DREVISION="$(REV)" + endif + endif + endif + + CFLAGS += -Wall -W -Wcast-qual -Wpointer-arith -Wcast-align $(FLAGS) ++CXXFLAGS += -Wall -W -Wcast-qual -Wpointer-arith -Wcast-align $(FLAGS) + CCFLAGS += -Wstrict-prototypes + + +@@ -492,6 +494,7 @@ + SDL_LDFLAGS := $(shell $(SDL_CONFIG) --libs) + endif + CFLAGS += $(SDL_CFLAGS) ++ CXXFLAGS += $(SDL_CFLAGS) + LIBS += $(SDL_LDFLAGS) + endif + +@@ -523,6 +526,7 @@ + SDL_LDFLAGS := $(shell $(SDL2_CONFIG) --libs) + endif + CFLAGS += $(SDL_CFLAGS) ++ CXXFLAGS += $(SDL_CFLAGS) + LIBS += $(SDL_LDFLAGS) + endif + +@@ -538,6 +542,7 @@ + SDL_LDFLAGS := $(shell $(SDL_CONFIG) --libs) + endif + CFLAGS += $(SDL_CFLAGS) ++ CXXFLAGS += $(SDL_CFLAGS) + LIBS += $(SDL_LDFLAGS) -lSDL_mixer + endif + +@@ -564,6 +569,7 @@ + SDL_LDFLAGS := $(shell $(SDL_CONFIG) --libs) + endif + CFLAGS += $(SDL_CFLAGS) ++ CXXFLAGS += $(SDL_CFLAGS) + LIBS += $(SDL_LDFLAGS) -lglew32 + ifeq ($(OSTYPE),mingw) + LIBS += -lopengl32 +@@ -579,6 +585,7 @@ + endif + + CFLAGS += -DCOLOUR_DEPTH=$(COLOUR_DEPTH) ++CXXFLAGS += -DCOLOUR_DEPTH=$(COLOUR_DEPTH) + + ifneq ($(findstring $(OSTYPE), cygwin mingw),) + SOURCES += simres.rc +@@ -586,7 +593,6 @@ + endif + + CCFLAGS += $(CFLAGS) +-CXXFLAGS += $(CFLAGS) + + BUILDDIR ?= build/$(CFG) + PROGDIR ?= $(BUILDDIR) -- cgit v1.2.3