* [gentoo-commits] gentoo-x86 commit in games-simulation/simutrans/files: simutrans-0.112.3-overflow.patch simutrans-0.112.3-Makefile.patch simutrans-0.120.0.1-Makefile.patch
@ 2015-04-12 20:42 Michael Sterrett (mr_bones_)
0 siblings, 0 replies; only message in thread
From: Michael Sterrett (mr_bones_) @ 2015-04-12 20:42 UTC (permalink / raw
To: gentoo-commits
mr_bones_ 15/04/12 20:42:02
Modified: simutrans-0.112.3-overflow.patch
simutrans-0.112.3-Makefile.patch
Added: simutrans-0.120.0.1-Makefile.patch
Log:
version bump (bug #520650)
(Portage version: 2.2.14/cvs/Linux x86_64, unsigned Manifest commit)
Revision Changes Path
1.2 games-simulation/simutrans/files/simutrans-0.112.3-overflow.patch
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-simulation/simutrans/files/simutrans-0.112.3-overflow.patch?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-simulation/simutrans/files/simutrans-0.112.3-overflow.patch?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-simulation/simutrans/files/simutrans-0.112.3-overflow.patch?r1=1.1&r2=1.2
Index: simutrans-0.112.3-overflow.patch
===================================================================
RCS file: /var/cvsroot/gentoo-x86/games-simulation/simutrans/files/simutrans-0.112.3-overflow.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- simutrans-0.112.3-overflow.patch 28 May 2013 23:20:05 -0000 1.1
+++ simutrans-0.112.3-overflow.patch 12 Apr 2015 20:42:02 -0000 1.2
@@ -1,5 +1,5 @@
---- besch/reader/obj_reader.cc.orig 2013-01-22 17:22:02.509818038 -0500
-+++ besch/reader/obj_reader.cc 2013-01-22 17:22:58.650846577 -0500
+--- besch/reader/obj_reader.cc.orig
++++ besch/reader/obj_reader.cc
@@ -308,7 +308,7 @@
void obj_reader_t::skip_nodes(FILE *fp,uint32 version)
{
1.2 games-simulation/simutrans/files/simutrans-0.112.3-Makefile.patch
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-simulation/simutrans/files/simutrans-0.112.3-Makefile.patch?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-simulation/simutrans/files/simutrans-0.112.3-Makefile.patch?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-simulation/simutrans/files/simutrans-0.112.3-Makefile.patch?r1=1.1&r2=1.2
Index: simutrans-0.112.3-Makefile.patch
===================================================================
RCS file: /var/cvsroot/gentoo-x86/games-simulation/simutrans/files/simutrans-0.112.3-Makefile.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- simutrans-0.112.3-Makefile.patch 28 May 2013 23:20:05 -0000 1.1
+++ simutrans-0.112.3-Makefile.patch 12 Apr 2015 20:42:02 -0000 1.2
@@ -1,5 +1,5 @@
---- Makefile.orig 2013-05-28 17:58:03.379228527 -0400
-+++ Makefile 2013-05-28 17:58:24.768491369 -0400
+--- Makefile.orig
++++ Makefile
@@ -88,8 +88,6 @@
endif
endif
1.1 games-simulation/simutrans/files/simutrans-0.120.0.1-Makefile.patch
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-simulation/simutrans/files/simutrans-0.120.0.1-Makefile.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-simulation/simutrans/files/simutrans-0.120.0.1-Makefile.patch?rev=1.1&content-type=text/plain
Index: simutrans-0.120.0.1-Makefile.patch
===================================================================
--- 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)
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2015-04-12 20:42 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-04-12 20:42 [gentoo-commits] gentoo-x86 commit in games-simulation/simutrans/files: simutrans-0.112.3-overflow.patch simutrans-0.112.3-Makefile.patch simutrans-0.120.0.1-Makefile.patch Michael Sterrett (mr_bones_)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox