dgen-sdl 1.23 fix build. closes #1255

1 files changed, 61 insertions, 38 deletions

diff --git a/packages/dgen/dgen-sdl-1.23/fix-configure-and-make.patch b/packages/dgen/dgen-sdl-1.23/fix-configure-and-make.patch
index a6fff7adf9..4d1fbb6518 100644
--- a/packages/dgen/dgen-sdl-1.23/fix-configure-and-make.patch
+++ b/packages/dgen/dgen-sdl-1.23/fix-configure-and-make.patch
@@ -1,7 +1,8 @@
-diff -urNd ../dgen-sdl-1.23-r0/dgen-sdl-1.23/Makefile.am dgen-sdl-1.23/Makefile.am
---- ../dgen-sdl-1.23-r0/dgen-sdl-1.23/Makefile.am	2001-02-22 00:14:21 +00:00
-+++ dgen-sdl-1.23/Makefile.am	2005-02-24 23:21:05 +00:00
-@@ -5,7 +5,7 @@
+Index: dgen-sdl-1.23/Makefile.am
+===================================================================
+--- dgen-sdl-1.23.orig/Makefile.am
++++ dgen-sdl-1.23/Makefile.am
+@@ -5,7 +5,7 @@ include $(top_srcdir)/Makefile.asm.am
  DIST_SUBDIRS = star musa mz80 sdl
  SUBDIRS = @CPUDIRS@ @INTERFACE@
  
@@ -10,9 +11,10 @@ diff -urNd ../dgen-sdl-1.23-r0/dgen-sdl-1.23/Makefile.am dgen-sdl-1.23/Makefile.
  
  bin_PROGRAMS = dgen tobin
  
-diff -urNd ../dgen-sdl-1.23-r0/dgen-sdl-1.23/Makefile.asm.am dgen-sdl-1.23/Makefile.asm.am
---- ../dgen-sdl-1.23-r0/dgen-sdl-1.23/Makefile.asm.am	2000-01-14 00:55:49 +00:00
-+++ dgen-sdl-1.23/Makefile.asm.am	2005-02-24 23:21:05 +00:00
+Index: dgen-sdl-1.23/Makefile.asm.am
+===================================================================
+--- dgen-sdl-1.23.orig/Makefile.asm.am
++++ dgen-sdl-1.23/Makefile.asm.am
 @@ -1,5 +1,5 @@
  # Tell how to make assembler files
 -SUFFIXES += .asmu .asm
@@ -20,10 +22,11 @@ diff -urNd ../dgen-sdl-1.23-r0/dgen-sdl-1.23/Makefile.asm.am dgen-sdl-1.23/Makef
  
  .asm.o:
  	@NASM@ -f @NASM_FMT@ $<
-diff -urNd ../dgen-sdl-1.23-r0/dgen-sdl-1.23/configure.in dgen-sdl-1.23/configure.in
---- ../dgen-sdl-1.23-r0/dgen-sdl-1.23/configure.in	2001-07-02 19:34:18 +01:00
-+++ dgen-sdl-1.23/configure.in	2005-02-25 00:20:08 +00:00
-@@ -62,41 +62,39 @@
+Index: dgen-sdl-1.23/configure.in
+===================================================================
+--- dgen-sdl-1.23.orig/configure.in
++++ dgen-sdl-1.23/configure.in
+@@ -62,41 +62,39 @@ CPPFLAGS="$CPPFLAGS $SDL_CFLAGS"
  EXTRAOBJS=
  
  dnl Check for SDL joystick
@@ -31,20 +34,15 @@ diff -urNd ../dgen-sdl-1.23-r0/dgen-sdl-1.23/configure.in dgen-sdl-1.23/configur
 -AC_CHECK_HEADER(SDL_joystick.h, JOYSTICK_SUPPORT=SDL,
 -	dnl Check for Linux joystick as a backup
 -	AC_CHECK_HEADER(linux/joystick.h, JOYSTICK_SUPPORT=LINUX))
-+AC_CHECK_HEADER(SDL_joystick.h, JOYSTICK_SUPPORT=SDL, JOYSTICK_SUPPORT=no)
- 
+-
 -dnl Check for X (so we can find the OpenGL headers)
 -AC_PATH_XTRA
 -CFLAGS="$CFLAGS $X_CFLAGS"
 -CXXFLAGS="$CXXFLAGS $X_CFLAGS"
 -LIBS="$LIBS $X_LIBS"
-+#dnl Check for X (so we can find the OpenGL headers)
-+#AC_PATH_XTRA
-+#CFLAGS="$CFLAGS $X_CFLAGS"
-+#CXXFLAGS="$CXXFLAGS $X_CFLAGS"
-+#LIBS="$LIBS $X_LIBS"
++AC_CHECK_HEADER(SDL_joystick.h, JOYSTICK_SUPPORT=SDL, JOYSTICK_SUPPORT=no)
  
- dnl Check for OpenGL support in SDL
+-dnl Check for OpenGL support in SDL
 -AC_ARG_WITH(opengl,
 -	    [  --without-opengl        Don't use SDL OpenGL support],
 -	    OPENGL_SUPPORT=$withval, OPENGL_SUPPORT=yes)
@@ -66,8 +64,14 @@ diff -urNd ../dgen-sdl-1.23-r0/dgen-sdl-1.23/configure.in dgen-sdl-1.23/configur
 -    LIBS=$oldLIBS
 -    CPPFLAGS=$oldCPPFLAGS
 -  fi
--
++#dnl Check for X (so we can find the OpenGL headers)
++#AC_PATH_XTRA
++#CFLAGS="$CFLAGS $X_CFLAGS"
++#CXXFLAGS="$CXXFLAGS $X_CFLAGS"
++#LIBS="$LIBS $X_LIBS"
+ 
 -fi
++dnl Check for OpenGL support in SDL
 +OPENGL_SUPPORT=no
 +#AC_ARG_WITH(opengl,
 +#	    [  --without-opengl        Don't use SDL OpenGL support],
@@ -95,7 +99,7 @@ diff -urNd ../dgen-sdl-1.23-r0/dgen-sdl-1.23/configure.in dgen-sdl-1.23/configur
  
  if test x$OPENGL_SUPPORT \!= xno; then
    AC_DEFINE(SDL_OPENGL_SUPPORT)
-@@ -166,8 +164,11 @@
+@@ -166,8 +164,11 @@ changequote([,])
  				else
  					CHOP_=cat
  				fi
@@ -109,10 +113,11 @@ diff -urNd ../dgen-sdl-1.23-r0/dgen-sdl-1.23/configure.in dgen-sdl-1.23/configur
  
  				dnl Check for MMX
  				AC_ARG_WITH(mmx,
-diff -urNd ../dgen-sdl-1.23-r0/dgen-sdl-1.23/musa/Makefile.am dgen-sdl-1.23/musa/Makefile.am
---- ../dgen-sdl-1.23-r0/dgen-sdl-1.23/musa/Makefile.am	2000-01-29 00:46:22 +00:00
-+++ dgen-sdl-1.23/musa/Makefile.am	2005-02-25 01:10:38 +00:00
-@@ -8,7 +8,10 @@
+Index: dgen-sdl-1.23/musa/Makefile.am
+===================================================================
+--- dgen-sdl-1.23.orig/musa/Makefile.am
++++ dgen-sdl-1.23/musa/Makefile.am
+@@ -8,7 +8,10 @@ noinst_PROGRAMS = m68kmake
  
  noinst_LIBRARIES = libmusa68.a
  
@@ -124,9 +129,10 @@ diff -urNd ../dgen-sdl-1.23-r0/dgen-sdl-1.23/musa/Makefile.am dgen-sdl-1.23/musa
  
  m68kops.c: m68kmake
  	./m68kmake
-diff -urNd ../dgen-sdl-1.23-r0/dgen-sdl-1.23/mz80/Makefile.am dgen-sdl-1.23/mz80/Makefile.am
---- ../dgen-sdl-1.23-r0/dgen-sdl-1.23/mz80/Makefile.am	2000-10-27 00:08:19 +01:00
-+++ dgen-sdl-1.23/mz80/Makefile.am	2005-02-25 00:22:19 +00:00
+Index: dgen-sdl-1.23/mz80/Makefile.am
+===================================================================
+--- dgen-sdl-1.23.orig/mz80/Makefile.am
++++ dgen-sdl-1.23/mz80/Makefile.am
 @@ -3,13 +3,11 @@
  
  include $(top_srcdir)/Makefile.asm.am
@@ -145,10 +151,11 @@ diff -urNd ../dgen-sdl-1.23-r0/dgen-sdl-1.23/mz80/Makefile.am dgen-sdl-1.23/mz80
  
  EXTRA_DIST = mz80.txt
  
-diff -urNd ../dgen-sdl-1.23-r0/dgen-sdl-1.23/sdl/Makefile.am dgen-sdl-1.23/sdl/Makefile.am
---- ../dgen-sdl-1.23-r0/dgen-sdl-1.23/sdl/Makefile.am	2001-02-10 19:34:28 +00:00
-+++ dgen-sdl-1.23/sdl/Makefile.am	2005-02-25 01:26:27 +00:00
-@@ -3,11 +3,14 @@
+Index: dgen-sdl-1.23/sdl/Makefile.am
+===================================================================
+--- dgen-sdl-1.23.orig/sdl/Makefile.am
++++ dgen-sdl-1.23/sdl/Makefile.am
+@@ -3,12 +3,15 @@
  
  EXTRA_DIST = dgenfont.pbm chartfont.c
  
@@ -158,16 +165,18 @@ diff -urNd ../dgen-sdl-1.23-r0/dgen-sdl-1.23/sdl/Makefile.am dgen-sdl-1.23/sdl/M
  noinst_PROGRAMS = pbm2df
  
  noinst_LIBRARIES = libpd.a
-+
+ 
 +pbm2df: pbm2df.c
 +	$(HOSTCC) -o pbm2df pbm2df.c
- 
++
  # built sources
  
-diff -urNd ../dgen-sdl-1.23-r0/dgen-sdl-1.23/star/Makefile.am dgen-sdl-1.23/star/Makefile.am
---- ../dgen-sdl-1.23-r0/dgen-sdl-1.23/star/Makefile.am	2001-07-02 22:48:27 +01:00
-+++ dgen-sdl-1.23/star/Makefile.am	2005-02-24 23:21:05 +00:00
-@@ -7,7 +7,7 @@
+ BUILT_SOURCES = dgenfont.cpp
+Index: dgen-sdl-1.23/star/Makefile.am
+===================================================================
+--- dgen-sdl-1.23.orig/star/Makefile.am
++++ dgen-sdl-1.23/star/Makefile.am
+@@ -7,7 +7,7 @@ include $(top_srcdir)/Makefile.asm.am
  # license)
  EXTRA_DIST = cpudebug.c cpudebug.h star.c starcpu.h stardoc.txt
  
@@ -176,3 +185,17 @@ diff -urNd ../dgen-sdl-1.23-r0/dgen-sdl-1.23/star/Makefile.am dgen-sdl-1.23/star
  
  noinst_LIBRARIES = libstarcpu.a
  
+Index: dgen-sdl-1.23/musa/m68kcpu.h
+===================================================================
+--- dgen-sdl-1.23.orig/musa/m68kcpu.h
++++ dgen-sdl-1.23/musa/m68kcpu.h
+@@ -51,7 +51,8 @@
+ #define int32  long
+ 
+ /* int and unsigned int must be at least 32 bits wide */
+-#define uint   unsigned int
++//#define uint   unsigned int
++typedef unsigned int uint;
+ 
+ 
+ /* Allow for architectures that don't have 8-bit sizes */