Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master games grimoire by Vlad Glagolev (1191d72dc464b95eb61ac1db48b5087f9b3cb82e)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Vlad Glagolev <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master games grimoire by Vlad Glagolev (1191d72dc464b95eb61ac1db48b5087f9b3cb82e)
  • Date: Thu, 15 May 2008 03:59:54 -0500

GIT changes to master games grimoire by Vlad Glagolev
<stealth AT sourcemage.org>:

games-emulators/dosbox/HISTORY | 4 ++-
games-emulators/dosbox/PRE_BUILD | 5 +++-
games-emulators/dosbox/gcc43.patch | 41
+++++++++++++++++++++++++++++++++++++
3 files changed, 48 insertions(+), 2 deletions(-)

New commits:
commit 1191d72dc464b95eb61ac1db48b5087f9b3cb82e
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

dosbox: fixed compilation with gcc 4.3

diff --git a/games-emulators/dosbox/HISTORY b/games-emulators/dosbox/HISTORY
index bd31e8c..11cd5f1 100644
--- a/games-emulators/dosbox/HISTORY
+++ b/games-emulators/dosbox/HISTORY
@@ -1,3 +1,6 @@
+2008-05-15 Vlad Glagolev <stealth AT sourcemage.org>
+ * PRE_BUILD: added gcc 4.3 patch
+
2007-08-28 Thomas Orgis <sobukus AT sourcemage.org>
* PRE_BUILD, BUILD: Applying a hack for the PIC issue which is just a
name clash with a class definition on Alpha
@@ -59,4 +62,3 @@

2003-08-03 Jimmy Yen <jimmy AT yen.tp>
* Created spell.
-
diff --git a/games-emulators/dosbox/PRE_BUILD
b/games-emulators/dosbox/PRE_BUILD
index 1ffcb5d..e3cc024 100755
--- a/games-emulators/dosbox/PRE_BUILD
+++ b/games-emulators/dosbox/PRE_BUILD
@@ -1,5 +1,8 @@
default_pre_build &&
-cd "$SOURCE_DIRECTORY" &&
+cd $SOURCE_DIRECTORY &&
+
+patch -p0 < $SPELL_DIRECTORY/gcc43.patch &&
+
# applying to version 0.70:
# PIC prob is a simple symbol name clash
find -name '*.cpp' -exec sed -i 's/PIC/BOXPIC/g' '{}' \; &&
diff --git a/games-emulators/dosbox/gcc43.patch
b/games-emulators/dosbox/gcc43.patch
new file mode 100644
index 0000000..8fd3099
--- /dev/null
+++ b/games-emulators/dosbox/gcc43.patch
@@ -0,0 +1,41 @@
+--- src/dos/cdrom_image.cpp.orig 2007-08-22 13:54:35.000000000 +0200
++++ src/dos/cdrom_image.cpp 2008-03-06 21:30:00.000000000 +0100
+@@ -23,7 +23,7 @@
+ #include <cstdio>
+ #include <fstream>
+ #include <iostream>
+-#include <limits.h>
++#include <limits>
+ #include <sstream>
+ #include <vector>
+ #include <sys/stat.h>
+--- src/hardware/gameblaster.cpp.orig 2007-01-10 11:17:37.000000000 +0100
++++ src/hardware/gameblaster.cpp 2008-03-06 21:31:32.000000000 +0100
+@@ -24,6 +24,7 @@
+ #include "hardware.h"
+ #include "setup.h"
+ #include "pic.h"
++#include <cstring>
+
+ #define LEFT 0x00
+ #define RIGHT 0x01
+--- src/hardware/tandy_sound.cpp.orig 2007-06-29 20:21:12.000000000 +0200
++++ src/hardware/tandy_sound.cpp 2008-03-06 21:32:02.000000000 +0100
+@@ -28,6 +28,7 @@
+ #include "setup.h"
+ #include "pic.h"
+ #include "dma.h"
++#include <cstring>
+
+ #define DAC_CLOCK 3570000
+ #define MAX_OUTPUT 0x7fff
+--- src/shell/shell_cmds.cpp.orig 2007-08-17 19:58:46.000000000 +0200
++++ src/shell/shell_cmds.cpp 2008-03-06 21:32:47.000000000 +0100
+@@ -27,6 +27,7 @@
+ #include "regs.h"
+ #include "../dos/drives.h"
+ #include "support.h"
++#include <cstdlib>
+
+ static SHELL_Cmd cmd_list[]={
+ { "CHDIR", 1, &DOS_Shell::CMD_CHDIR,
"SHELL_CMD_CHDIR_HELP"},



  • [SM-Commit] GIT changes to master games grimoire by Vlad Glagolev (1191d72dc464b95eb61ac1db48b5087f9b3cb82e), Vlad Glagolev, 05/15/2008

Archive powered by MHonArc 2.6.24.

Top of Page