* [gentoo-commits] proj/gamerlay:master commit in: games-action/d2x-rebirth/files/, games-action/d1x-rebirth/files/
@ 2013-08-05 14:31 Vadim A. Misbakh-Soloviov
0 siblings, 0 replies; only message in thread
From: Vadim A. Misbakh-Soloviov @ 2013-08-05 14:31 UTC (permalink / raw
To: gentoo-commits
commit: fd0488fa5fc817a475245e72df052243f3057ee1
Author: Alexander S. Turenko <alextux <AT> bk <DOT> ru>
AuthorDate: Mon Aug 5 14:30:39 2013 +0000
Commit: Vadim A. Misbakh-Soloviov <mva <AT> mva <DOT> name>
CommitDate: Mon Aug 5 14:30:39 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gamerlay.git;a=commit;h=fd0488fa
[games-action/d{1,2}-rebirth] Fix patch files.
Signed-off-by: Vadim A. Misbakh-Soloviov <mva <AT> mva.name>
---
.../files/d1x-rebirth-0.57.3-flags.patch | 12 ++++----
.../files/d1x-rebirth-0.58.1-flags.patch | 36 +++++++++++-----------
.../files/d2x-rebirth-0.57.3-flags.patch | 12 ++++----
.../files/d2x-rebirth-0.58.1-flags.patch | 36 +++++++++++-----------
4 files changed, 48 insertions(+), 48 deletions(-)
diff --git a/games-action/d1x-rebirth/files/d1x-rebirth-0.57.3-flags.patch b/games-action/d1x-rebirth/files/d1x-rebirth-0.57.3-flags.patch
index ae7d460..b8aaa72 100644
--- a/games-action/d1x-rebirth/files/d1x-rebirth-0.57.3-flags.patch
+++ b/games-action/d1x-rebirth/files/d1x-rebirth-0.57.3-flags.patch
@@ -1,21 +1,21 @@
--- d1x-rebirth_v0.57.3-src/SConstruct
+++ d1x-rebirth_v0.57.3-src/SConstruct
@@ -390,7 +390,6 @@
- env.Append(CPPFLAGS = ['-g'])
+ env.Append(CPPFLAGS = ['-g'])
else:
- env.Append(CPPDEFINES = ['NDEBUG', 'RELEASE'])
+ env.Append(CPPDEFINES = ['NDEBUG', 'RELEASE'])
- env.Append(CPPFLAGS = ['-O2'])
-
+
# profiler?
if (profiler == 1):
@@ -419,8 +418,9 @@
print '\n'
-
+
env.Append(CPPDEFINES = [('SHAREPATH', '\\"' + str(sharepath) + '\\"')])
+env.Append(LINKFLAGS = [str(lflags)])
# finally building program...
-env.Program(target=str(target), source = common_sources, LIBS = libs, LINKFLAGS = str(lflags))
+env.Program(target=str(target), source = common_sources, LIBS = libs)
if (sys.platform != 'darwin'):
- env.Install(BIN_DIR, str(target))
- env.Alias('install', BIN_DIR)
+ env.Install(BIN_DIR, str(target))
+ env.Alias('install', BIN_DIR)
diff --git a/games-action/d1x-rebirth/files/d1x-rebirth-0.58.1-flags.patch b/games-action/d1x-rebirth/files/d1x-rebirth-0.58.1-flags.patch
index 5dd5ca9..e852d1e 100644
--- a/games-action/d1x-rebirth/files/d1x-rebirth-0.58.1-flags.patch
+++ b/games-action/d1x-rebirth/files/d1x-rebirth-0.58.1-flags.patch
@@ -1,27 +1,27 @@
--- d1x-rebirth_v0.58.1-src/SConstruct
+++ d1x-rebirth_v0.58.1-src/SConstruct
@@ -218,7 +218,6 @@
- env.Append(CPPFLAGS = ['-g'])
- else:
- env.Append(CPPDEFINES = ['NDEBUG', 'RELEASE'])
+ env.Append(CPPFLAGS = ['-g'])
+ else:
+ env.Append(CPPDEFINES = ['NDEBUG', 'RELEASE'])
- env.Append(CPPFLAGS = ['-O2'])
-
- # profiler?
- if (self.user_settings.profiler == 1):
+
+ # profiler?
+ if (self.user_settings.profiler == 1):
@@ -352,6 +351,7 @@
- self.common_sources += self.sources_use_udp
-
- env.Append(CPPDEFINES = [('SHAREPATH', '\\"' + str(self.user_settings.sharepath) + '\\"')])
+ self.common_sources += self.sources_use_udp
+
+ env.Append(CPPDEFINES = [('SHAREPATH', '\\"' + str(self.user_settings.sharepath) + '\\"')])
+ env.Append(LINKFLAGS = [str(self.platform_settings.lflags)])
-
- def _register_program(self,dxxstr,program_specific_objects=[]):
- env = self.env
+
+ def _register_program(self,dxxstr,program_specific_objects=[]):
+ env = self.env
@@ -364,7 +364,7 @@
- versid_cppdefines.append(('DESCENT_VERSION_EXTRA', '\\"%s\\"' % self.user_settings.extra_version))
- objects.append(self.env.StaticObject(target='%s%s%s' % (self.user_settings.builddir, 'main/vers_id', self.env["OBJSUFFIX"]), source='main/vers_id.c', CPPDEFINES=versid_cppdefines))
- # finally building program...
+ versid_cppdefines.append(('DESCENT_VERSION_EXTRA', '\\"%s\\"' % self.user_settings.extra_version))
+ objects.append(self.env.StaticObject(target='%s%s%s' % (self.user_settings.builddir, 'main/vers_id', self.env["OBJSUFFIX"]), source='main/vers_id.c', CPPDEFINES=versid_cppdefines))
+ # finally building program...
- env.Program(target='%s%s' % (self.user_settings.builddir, str(exe_target)), source = objects, LIBS = self.platform_settings.libs, LINKFLAGS = str(self.platform_settings.lflags))
+ env.Program(target='%s%s' % (self.user_settings.builddir, str(exe_target)), source = objects, LIBS = self.platform_settings.libs)
- if (sys.platform != 'darwin'):
- env.Install(self.user_settings.BIN_DIR, str(exe_target))
- env.Alias('install', self.user_settings.BIN_DIR)
+ if (sys.platform != 'darwin'):
+ env.Install(self.user_settings.BIN_DIR, str(exe_target))
+ env.Alias('install', self.user_settings.BIN_DIR)
diff --git a/games-action/d2x-rebirth/files/d2x-rebirth-0.57.3-flags.patch b/games-action/d2x-rebirth/files/d2x-rebirth-0.57.3-flags.patch
index 0284dcb..4853376 100644
--- a/games-action/d2x-rebirth/files/d2x-rebirth-0.57.3-flags.patch
+++ b/games-action/d2x-rebirth/files/d2x-rebirth-0.57.3-flags.patch
@@ -1,21 +1,21 @@
--- d2x-rebirth_v0.57.3-src/SConstruct
+++ d2x-rebirth_v0.57.3-src/SConstruct
@@ -399,7 +399,6 @@
- env.Append(CPPFLAGS = ['-g'])
+ env.Append(CPPFLAGS = ['-g'])
else:
- env.Append(CPPDEFINES = ['NDEBUG', 'RELEASE'])
+ env.Append(CPPDEFINES = ['NDEBUG', 'RELEASE'])
- env.Append(CPPFLAGS = ['-O2'])
-
+
# profiler?
if (profiler == 1):
@@ -428,8 +427,9 @@
print '\n'
-
+
env.Append(CPPDEFINES = [('SHAREPATH', '\\"' + str(sharepath) + '\\"')])
+env.Append(LINKFLAGS = [str(lflags)])
# finally building program...
-env.Program(target=str(target), source = common_sources, LIBS = libs, LINKFLAGS = str(lflags))
+env.Program(target=str(target), source = common_sources, LIBS = libs)
if (sys.platform != 'darwin'):
- env.Install(BIN_DIR, str(target))
- env.Alias('install', BIN_DIR)
+ env.Install(BIN_DIR, str(target))
+ env.Alias('install', BIN_DIR)
diff --git a/games-action/d2x-rebirth/files/d2x-rebirth-0.58.1-flags.patch b/games-action/d2x-rebirth/files/d2x-rebirth-0.58.1-flags.patch
index caa80ea..3d54761 100644
--- a/games-action/d2x-rebirth/files/d2x-rebirth-0.58.1-flags.patch
+++ b/games-action/d2x-rebirth/files/d2x-rebirth-0.58.1-flags.patch
@@ -1,27 +1,27 @@
--- d2x-rebirth_v0.58.1-src/SConstruct
+++ d2x-rebirth_v0.58.1-src/SConstruct
@@ -220,7 +220,6 @@
- env.Append(CPPFLAGS = ['-g'])
- else:
- env.Append(CPPDEFINES = ['NDEBUG', 'RELEASE'])
+ env.Append(CPPFLAGS = ['-g'])
+ else:
+ env.Append(CPPDEFINES = ['NDEBUG', 'RELEASE'])
- env.Append(CPPFLAGS = ['-O2'])
-
- # profiler?
- if (self.user_settings.profiler == 1):
+
+ # profiler?
+ if (self.user_settings.profiler == 1):
@@ -354,6 +353,7 @@
- self.common_sources += self.sources_use_udp
-
- env.Append(CPPDEFINES = [('SHAREPATH', '\\"' + str(self.user_settings.sharepath) + '\\"')])
+ self.common_sources += self.sources_use_udp
+
+ env.Append(CPPDEFINES = [('SHAREPATH', '\\"' + str(self.user_settings.sharepath) + '\\"')])
+ env.Append(LINKFLAGS = [str(self.platform_settings.lflags)])
-
- def _register_program(self,dxxstr,program_specific_objects=[]):
- env = self.env
+
+ def _register_program(self,dxxstr,program_specific_objects=[]):
+ env = self.env
@@ -368,7 +368,7 @@
- versid_cppdefines.append(('DESCENT_VERSION_EXTRA', '\\"%s\\"' % self.user_settings.extra_version))
- objects.append(self.env.StaticObject(target='%s%s%s' % (self.user_settings.builddir, 'main/vers_id', self.env["OBJSUFFIX"]), source='main/vers_id.c', CPPDEFINES=versid_cppdefines))
- # finally building program...
+ versid_cppdefines.append(('DESCENT_VERSION_EXTRA', '\\"%s\\"' % self.user_settings.extra_version))
+ objects.append(self.env.StaticObject(target='%s%s%s' % (self.user_settings.builddir, 'main/vers_id', self.env["OBJSUFFIX"]), source='main/vers_id.c', CPPDEFINES=versid_cppdefines))
+ # finally building program...
- env.Program(target='%s%s' % (self.user_settings.builddir, str(exe_target)), source = objects, LIBS = self.platform_settings.libs, LINKFLAGS = str(self.platform_settings.lflags))
+ env.Program(target='%s%s' % (self.user_settings.builddir, str(exe_target)), source = objects, LIBS = self.platform_settings.libs)
- if (sys.platform != 'darwin'):
- if self.user_settings.register_install_target:
- install_dir = os.path.join(self.user_settings.DESTDIR or '', self.user_settings.BIN_DIR)
+ if (sys.platform != 'darwin'):
+ if self.user_settings.register_install_target:
+ install_dir = os.path.join(self.user_settings.DESTDIR or '', self.user_settings.BIN_DIR)
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2013-08-05 14:31 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-08-05 14:31 [gentoo-commits] proj/gamerlay:master commit in: games-action/d2x-rebirth/files/, games-action/d1x-rebirth/files/ Vadim A. Misbakh-Soloviov
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox