castle-combat-SDL_net.patch

   1 diff -Nru castle-combat-0.7.4-orig/configure.in castle-combat-0.7.4/configure.in
   2 --- castle-combat-0.7.4-orig/configure.in       2003-06-24 21:28:56.000000000 +0200
   3 +++ castle-combat-0.7.4/configure.in    2004-02-13 15:36:16.511523883 +0100
   4 @@ -56,7 +56,7 @@
   5
   6  ######## Set compiler flags and libraries
   7  CFLAGS="$CFLAGS $SDL_CFLAGS -DDATADIR=\"\\\"$datadir/castle-combat\\\"\" -Wall"
   8 -LIBS="-LSDL_net -lSDL_net $SDL_LIBS $LIBS $INETLIB"
   9 +LIBS="-lSDL_net $SDL_LIBS $LIBS $INETLIB"
  10
  11  AC_SUBST(SOUND)
  12
  13 @@ -64,7 +64,6 @@
  14  AC_OUTPUT([
  15  Makefile
  16  src/Makefile
  17 -src/SDL_net/Makefile
  18  data/Makefile
  19  data/gfx/Makefile
  20  data/sound/Makefile
  21 diff -Nru castle-combat-0.7.4-orig/src/main.c castle-combat-0.7.4/src/main.c
  22 --- castle-combat-0.7.4-orig/src/main.c 2003-06-24 21:27:34.000000000 +0200
  23 +++ castle-combat-0.7.4/src/main.c      2004-02-13 15:29:50.063062345 +0100
  24 @@ -24,7 +24,7 @@
  25  #include "main.h"
  26  #include "options.h"
  27  #include "time.h"
  28 -#include "SDL_net/SDL_net.h"
  29 +#include <SDL/SDL_net.h>
  30  #include "server.h"
  31
  32      int fullscreen=1, CityDestroyed[6]={0,0,0,0,0,0},
  33 diff -Nru castle-combat-0.7.4-orig/src/Makefile.am castle-combat-0.7.4/src/Makefile.am
  34 --- castle-combat-0.7.4-orig/src/Makefile.am    2002-03-06 15:02:37.000000000 +0100
  35 +++ castle-combat-0.7.4/src/Makefile.am 2004-02-13 15:21:08.816141243 +0100
  36 @@ -1,6 +1,6 @@
  37  bin_PROGRAMS = castle-combat castle-combat-server
  38
  39 -SUBDIRS = SDL_net
  40 +#SUBDIRS = SDL_net
  41
  42  castle_combat_LDADD = -lz -lpng @SOUND@
  43
  44 diff -Nru castle-combat-0.7.4-orig/src/net.c castle-combat-0.7.4/src/net.c
  45 --- castle-combat-0.7.4-orig/src/net.c  2003-05-02 14:56:54.000000000 +0200
  46 +++ castle-combat-0.7.4/src/net.c       2004-02-13 15:30:09.229654050 +0100
  47 @@ -1,4 +1,4 @@
  48 -#include "SDL_net/SDL_net.h"
  49 +#include <SDL/SDL_net.h>
  50  #include "main.h"
  51  #include "server.h"
  52  #include "string.h"
  53 diff -Nru castle-combat-0.7.4-orig/src/server.c castle-combat-0.7.4/src/server.c
  54 --- castle-combat-0.7.4-orig/src/server.c       2003-05-02 13:50:32.000000000 +0200
  55 +++ castle-combat-0.7.4/src/server.c    2004-02-13 15:32:56.181006375 +0100
  56 @@ -1,4 +1,4 @@
  57 -#include "SDL_net/SDL_net.h"
  58 +#include <SDL/SDL_net.h>
  59  #include "netdefs.h"
  60  #include "stdlib.h"
  61