org.handhelds.familiar/packages/dgen/dgen-sdl-1.23/fix-configure-and-make.patch

   1 diff -urNd ../dgen-sdl-1.23-r0/dgen-sdl-1.23/Makefile.am dgen-sdl-1.23/Makefile.am
   2 --- ../dgen-sdl-1.23-r0/dgen-sdl-1.23/Makefile.am       2001-02-22 00:14:21 +00:00
   3 +++ dgen-sdl-1.23/Makefile.am   2005-02-24 23:21:05 +00:00
   4 @@ -5,7 +5,7 @@
   5  DIST_SUBDIRS = star musa mz80 sdl
   6  SUBDIRS = @CPUDIRS@ @INTERFACE@
   7
   8 -INCLUDES += -I$(top_srcdir)/@INTERFACE@
   9 +INCLUDES = -I$(top_srcdir)/@INTERFACE@
  10
  11  bin_PROGRAMS = dgen tobin
  12
  13 diff -urNd ../dgen-sdl-1.23-r0/dgen-sdl-1.23/Makefile.asm.am dgen-sdl-1.23/Makefile.asm.am
  14 --- ../dgen-sdl-1.23-r0/dgen-sdl-1.23/Makefile.asm.am   2000-01-14 00:55:49 +00:00
  15 +++ dgen-sdl-1.23/Makefile.asm.am       2005-02-24 23:21:05 +00:00
  16 @@ -1,5 +1,5 @@
  17  # Tell how to make assembler files
  18 -SUFFIXES += .asmu .asm
  19 +SUFFIXES = .asmu .asm
  20
  21  .asm.o:
  22         @NASM@ -f @NASM_FMT@ $<
  23 diff -urNd ../dgen-sdl-1.23-r0/dgen-sdl-1.23/configure.in dgen-sdl-1.23/configure.in
  24 --- ../dgen-sdl-1.23-r0/dgen-sdl-1.23/configure.in      2001-07-02 19:34:18 +01:00
  25 +++ dgen-sdl-1.23/configure.in  2005-02-25 00:20:08 +00:00
  26 @@ -62,41 +62,39 @@
  27  EXTRAOBJS=
  28
  29  dnl Check for SDL joystick
  30 -JOYSTICK_SUPPORT=no
  31 -AC_CHECK_HEADER(SDL_joystick.h, JOYSTICK_SUPPORT=SDL,
  32 -       dnl Check for Linux joystick as a backup
  33 -       AC_CHECK_HEADER(linux/joystick.h, JOYSTICK_SUPPORT=LINUX))
  34 +AC_CHECK_HEADER(SDL_joystick.h, JOYSTICK_SUPPORT=SDL, JOYSTICK_SUPPORT=no)
  35
  36 -dnl Check for X (so we can find the OpenGL headers)
  37 -AC_PATH_XTRA
  38 -CFLAGS="$CFLAGS $X_CFLAGS"
  39 -CXXFLAGS="$CXXFLAGS $X_CFLAGS"
  40 -LIBS="$LIBS $X_LIBS"
  41 +#dnl Check for X (so we can find the OpenGL headers)
  42 +#AC_PATH_XTRA
  43 +#CFLAGS="$CFLAGS $X_CFLAGS"
  44 +#CXXFLAGS="$CXXFLAGS $X_CFLAGS"
  45 +#LIBS="$LIBS $X_LIBS"
  46
  47  dnl Check for OpenGL support in SDL
  48 -AC_ARG_WITH(opengl,
  49 -           [  --without-opengl        Don't use SDL OpenGL support],
  50 -           OPENGL_SUPPORT=$withval, OPENGL_SUPPORT=yes)
  51 -if test x$OPENGL_SUPPORT \!= xno; then
  52 -  AC_MSG_CHECKING([for OpenGL support in SDL])
  53 -  AC_TRY_COMPILE([#include <SDL.h>], [int foo() { int x = SDL_OPENGL; }],
  54 -                OPENGL_SUPPORT=yes, OPENGL_SUPPORT=no)
  55 -  AC_MSG_RESULT($OPENGL_SUPPORT)
  56 -  # Check for the GL libs
  57 -  if test x$OPENGL_SUPPORT \!= xno; then
  58 -    oldCPPFLAGS=$CPPFLAGS
  59 -    oldLIBS=$LIBS
  60 -    CPPFLAGS="$CPPFLAGS $X_CFLAGS"
  61 -    LIBS="$LIBS $SDL_LIBS"
  62 -    AC_CHECK_LIB(GL, glBegin,
  63 -      AC_CHECK_HEADER(GL/gl.h, , OPENGL_SUPPORT=no),
  64 -      OPENGL_SUPPORT=no
  65 -    )
  66 -    LIBS=$oldLIBS
  67 -    CPPFLAGS=$oldCPPFLAGS
  68 -  fi
  69 -
  70 -fi
  71 +OPENGL_SUPPORT=no
  72 +#AC_ARG_WITH(opengl,
  73 +#          [  --without-opengl        Don't use SDL OpenGL support],
  74 +#          OPENGL_SUPPORT=$withval, OPENGL_SUPPORT=yes)
  75 +#if test x$OPENGL_SUPPORT \!= xno; then
  76 +#  AC_MSG_CHECKING([for OpenGL support in SDL])
  77 +#  AC_TRY_COMPILE([#include <SDL.h>], [int foo() { int x = SDL_OPENGL; }],
  78 +#               OPENGL_SUPPORT=yes, OPENGL_SUPPORT=no)
  79 +#  AC_MSG_RESULT($OPENGL_SUPPORT)
  80 +#  # Check for the GL libs
  81 +#  if test x$OPENGL_SUPPORT \!= xno; then
  82 +#    oldCPPFLAGS=$CPPFLAGS
  83 +#    oldLIBS=$LIBS
  84 +#    CPPFLAGS="$CPPFLAGS $X_CFLAGS"
  85 +#    LIBS="$LIBS $SDL_LIBS"
  86 +#    AC_CHECK_LIB(GL, glBegin,
  87 +#      AC_CHECK_HEADER(GL/gl.h, , OPENGL_SUPPORT=no),
  88 +#      OPENGL_SUPPORT=no
  89 +#    )
  90 +#    LIBS=$oldLIBS
  91 +#    CPPFLAGS=$oldCPPFLAGS
  92 +#  fi
  93 +#
  94 +#fi
  95
  96  if test x$OPENGL_SUPPORT \!= xno; then
  97    AC_DEFINE(SDL_OPENGL_SUPPORT)
  98 @@ -166,8 +164,11 @@
  99                                 else
 100                                         CHOP_=cat
 101                                 fi
 102 -                               AM_CONDITIONAL(NO_USCORE,
 103 -                                              test x$NASM_FMT = xelf)
 104 +#                              AM_CONDITIONAL(NO_USCORE,
 105 +#                                             test x$NASM_FMT = xelf)
 106 +                               if test x$NASM_FMT = xelf; then
 107 +                                       NO_USCORE=yes
 108 +                               fi
 109
 110                                 dnl Check for MMX
 111                                 AC_ARG_WITH(mmx,
 112 diff -urNd ../dgen-sdl-1.23-r0/dgen-sdl-1.23/musa/Makefile.am dgen-sdl-1.23/musa/Makefile.am
 113 --- ../dgen-sdl-1.23-r0/dgen-sdl-1.23/musa/Makefile.am  2000-01-29 00:46:22 +00:00
 114 +++ dgen-sdl-1.23/musa/Makefile.am      2005-02-25 01:10:38 +00:00
 115 @@ -8,7 +8,10 @@
 116
 117  noinst_LIBRARIES = libmusa68.a
 118
 119 -m68kmake_SOURCES = m68kmake.c
 120 +#m68kmake_SOURCES = m68kmake.c
 121 +
 122 +m68kmake: m68kmake.c
 123 +       $(HOSTCC) -o m68kmake m68kmake.c
 124
 125  m68kops.c: m68kmake
 126         ./m68kmake
 127 diff -urNd ../dgen-sdl-1.23-r0/dgen-sdl-1.23/mz80/Makefile.am dgen-sdl-1.23/mz80/Makefile.am
 128 --- ../dgen-sdl-1.23-r0/dgen-sdl-1.23/mz80/Makefile.am  2000-10-27 00:08:19 +01:00
 129 +++ dgen-sdl-1.23/mz80/Makefile.am      2005-02-25 00:22:19 +00:00
 130 @@ -3,13 +3,11 @@
 131
 132  include $(top_srcdir)/Makefile.asm.am
 133  # Since the chop_ script flakes on mz80, we use mz80's builtin facility
 134 -if NO_USCORE
 135 - plain = -l
 136 -else
 137 - plain =
 138 -endif
 139 +if test x$NO_USCORE \!= x; then
 140 + plain=-l
 141 +fi
 142
 143 -INCLUDES += -I..
 144 +INCLUDES = -I..
 145
 146  EXTRA_DIST = mz80.txt
 147
 148 diff -urNd ../dgen-sdl-1.23-r0/dgen-sdl-1.23/sdl/Makefile.am dgen-sdl-1.23/sdl/Makefile.am
 149 --- ../dgen-sdl-1.23-r0/dgen-sdl-1.23/sdl/Makefile.am   2001-02-10 19:34:28 +00:00
 150 +++ dgen-sdl-1.23/sdl/Makefile.am       2005-02-25 01:26:27 +00:00
 151 @@ -3,11 +3,14 @@
 152
 153  EXTRA_DIST = dgenfont.pbm chartfont.c
 154
 155 -INCLUDES += -I..
 156 +INCLUDES = -I..
 157
 158  noinst_PROGRAMS = pbm2df
 159
 160  noinst_LIBRARIES = libpd.a
 161 +
 162 +pbm2df: pbm2df.c
 163 +       $(HOSTCC) -o pbm2df pbm2df.c
 164
 165  # built sources
 166
 167 diff -urNd ../dgen-sdl-1.23-r0/dgen-sdl-1.23/star/Makefile.am dgen-sdl-1.23/star/Makefile.am
 168 --- ../dgen-sdl-1.23-r0/dgen-sdl-1.23/star/Makefile.am  2001-07-02 22:48:27 +01:00
 169 +++ dgen-sdl-1.23/star/Makefile.am      2005-02-24 23:21:05 +00:00
 170 @@ -7,7 +7,7 @@
 171  # license)
 172  EXTRA_DIST = cpudebug.c cpudebug.h star.c starcpu.h stardoc.txt
 173
 174 -INCLUDES += -I..
 175 +INCLUDES = -I..
 176
 177  noinst_LIBRARIES = libstarcpu.a
 178