games-engines/fizmo/files/fizmo-0.7.2-build-system.patch

   1 Source: dleverton
   2 Upstream: mentioned possibility of switching to autotools in future
   3 Purpose: tidy up the build system a bit: make it easier to sed
   4          user-controllable values into the config file (not passing
   5          them on the emake command line anymore as we're now calling
   6          emake multiple times), use glkloader instead of hardcoding
   7          glktermw, etc
   8
   9 --- fizmo-0.7.2b/config.default.mk~     2012-01-27 12:26:17.000000000 +0000
  10 +++ fizmo-0.7.2b/config.default.mk      2012-02-05 22:41:35.000000000 +0000
  11 @@ -1,7 +1,8 @@
  12
  13 -CC = gcc
  14 +CC = @CC@
  15  AR = ar
  16 -override CFLAGS += -Wall -Wextra
  17 +CFLAGS = @CFLAGS@ -Wall -Wextra
  18 +LDFLAGS = @LDFLAGS@
  19
  20  # Since the "fizmo-all" metapackage will install all modules into a separate
  21  # "build" directory -- in order not to install dev-files into the installation
  22 @@ -10,8 +11,8 @@
  23  PKG_CONFIG_PATH \
  24   := $(PKG_CONFIG_PATH):$(dir $(lastword $(MAKEFILE_LIST)))../build/lib/pkgconfig
  25
  26 -prefix = /usr/local
  27 -bindir = $(prefix)/games
  28 +prefix = /usr
  29 +bindir = $(prefix)/games/bin
  30  datarootdir = $(prefix)/share
  31  mandir = $(datarootdir)/man
  32  localedir = $(datarootdir)/fizmo/locales
  33 @@ -19,7 +20,7 @@
  34
  35  # -----
  36  # General settings:
  37 -ENABLE_OPTIMIZATION = 1
  38 +#ENABLE_OPTIMIZATION = 1
  39  #ENABLE_TRACING = 1
  40  #ENABLE_GDB_SYMBOLS = 1
  41  # -----
  42 @@ -31,7 +32,7 @@
  43  LOCALE_SEARCH_PATH = $(localedir)
  44  #ENABLE_STRICT_Z = 1
  45  #THROW_SIGFAULT_ON_ERROR = 1
  46 -#DISABLE_BABEL = 1
  47 +DISABLE_BABEL = @DISABLE_BABEL@
  48  #DISABLE_FILELIST = 1
  49  #DISABLE_BLOCKBUFFER = 1
  50  #DISABLE_COMMAND_HISTORY = 1
  51 @@ -121,34 +122,34 @@
  52  # In case pkg-config has no information about ncursesw, you have to provide
  53  # the required flags below:
  54  NCURSESW_NONPKG_CFLAGS = -I/usr/include/ncursesw
  55 -NCURSESW_NONPKG_LIBS = -L/usr/lib -lncursesw
  56 +NCURSESW_NONPKG_LIBS = -lncursesw
  57  # -----
  58
  59
  60
  61  # -----
  62  # Settings for fizmo-ncursesw (also requires ncursesw, above):
  63 -ENABLE_X11_IMAGES = 1
  64 +ENABLE_X11_IMAGES = @ENABLE_X11_IMAGES@
  65  SOUND_INTERFACE_CONFIGNAME = SOUNDSDL
  66  SOUND_INTERFACE_STRUCT_NAME = sound_interface_sdl
  67  SOUND_INTERFACE_INCLUDE_FILE = sound_sdl/sound_sdl.h
  68 -SOUND_INTERFACE_NAME = libsndifsdl
  69 +SOUND_INTERFACE_NAME = @SOUND_INTERFACE_NAME@
  70  # -----
  71
  72
  73
  74  # -----
  75  # Settings for libglkif:
  76 -LIBGLK_NONPKG_CFLAGS = -I$(HOME)/opt/glktermw
  77 -LIBGLK_NONPKG_LIBS = -L$(HOME)/opt/glktermw
  78 +LIBGLK_NONPKG_CFLAGS = -I/usr/include/glk
  79 +LIBGLK_NONPKG_LIBS =
  80  # -----
  81
  82
  83
  84  # -----
  85  # Settings for fizmo-glkterm (also requires ncursesw, above):
  86 -LIBGLKTERMW_NONPKG_CFLAGS = -I$(HOME)/opt/glktermw
  87 -LIBGLKTERMW_NONPKG_LIBS = -L$(HOME)/opt/glktermw
  88 +LIBGLKTERMW_NONPKG_CFLAGS = -I/usr/include/glk
  89 +LIBGLKTERMW_NONPKG_LIBS =
  90  # -----
  91
  92
  93 --- fizmo-0.7.2b/fizmo-glktermw/src/fizmo-glktermw/Makefile~    2011-11-07 07:01:00.000000000 +0000
  94 +++ fizmo-0.7.2b/fizmo-glktermw/src/fizmo-glktermw/Makefile     2012-02-05 22:41:07.000000000 +0000
  95 @@ -15,7 +15,7 @@
  96  LIBS += $(shell PKG_CONFIG_PATH=$(PKG_CONFIG_PATH) pkg-config --libs libfizmo)
  97  LIBS += $(LIBGLKTERMW_NONPKG_LIBS)
  98  LIBS += $(NCURSESW_NONPKG_LIBS) $(NCURSESW_PKG_LIBS)
  99 -LIBS += -lglkif -lglktermw
 100 +LIBS += -lglkif -lglkloader
 101
 102
 103  fizmo-glktermw: fizmo-glktermw.o
 104 --- fizmo-0.7.2b/fizmo-ncursesw/src/fizmo-ncursesw/Makefile~    2011-11-07 06:59:17.000000000 +0000
 105 +++ fizmo-0.7.2b/fizmo-ncursesw/src/fizmo-ncursesw/Makefile     2012-02-05 22:41:07.000000000 +0000
 106 @@ -4,7 +4,7 @@
 107  include ../../config.mk
 108
 109
 110 -override CFLAGS += -g -O2 $(SOUND_INTERFACE_CFLAGS)
 111 +override CFLAGS += $(SOUND_INTERFACE_CFLAGS)
 112  override CFLAGS += $(shell PKG_CONFIG_PATH=$(PKG_CONFIG_PATH) pkg-config \
 113   --cflags libfizmo)
 114  override CFLAGS += $(shell PKG_CONFIG_PATH=$(PKG_CONFIG_PATH) pkg-config \