games-engines/fizmo/files/fizmo-0.6.9-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: use pkg-config, and respect
   4          MY_CFLAGS (we don't just pass CFLAGS on the emake command
   5          line because some places do "CFLAGS +=" without "override",
   6          and it seems more robust to do it this way rather than patch
   7          the override in)
   8
   9 --- fizmo-0.6.9/config.default.mk~      2011-04-26 10:00:33.000000000 +0100
  10 +++ fizmo-0.6.9/config.default.mk       2011-05-15 15:25:58.000000000 +0100
  11 @@ -3,7 +3,7 @@
  12
  13  CC = gcc
  14  AR = ar
  15 -CFLAGS = -Wall -Wextra
  16 +CFLAGS = $(MY_CFLAGS)
  17
  18  INSTALL_PREFIX = $(DESTDIR)/usr
  19
  20 --- fizmo-0.6.9/src/ncursesw/Makefile~  2011-04-26 10:00:34.000000000 +0100
  21 +++ fizmo-0.6.9/src/ncursesw/Makefile   2011-05-15 15:28:55.000000000 +0100
  22 @@ -36,24 +36,16 @@
  23  endif
  24
  25  ifneq ($(ENABLE_X11_IMAGES),)
  26 + X11_IMAGES_MODULES = x11 gtk+-2.0 gdk-pixbuf-2.0 gdk-pixbuf-xlib-2.0 glib-2.0
  27   NCURSESW_INC_DIRS +=\
  28 -  -I$(GLIB_CONFIG_INC_DIR)\
  29 -  -I$(GLIB_INC_DIR)\
  30 -  -I$(GDK_CONFIG_INC_DIR)\
  31 -  -I$(GTK_INC_DIR)\
  32 -  -I$(GTK_INC_DIR)/gtk2\
  33 -  -I$(CAIRO_INC_DIR)\
  34 -  -I$(PANGO_INC_DIR)\
  35 -  -I$(ATK_INC_DIR)\
  36 -  -I$(GDKPIXBUF_INC_DIR)
  37 +  $(shell pkg-config --cflags $(X11_IMAGES_MODULES))
  38
  39   NCURSEWS_FLAGS += -DENABLE_X11_IMAGES=1
  40
  41 - NCURSESW_LIB_DIRS += -L$(X11_LIB_DIR) -L$(GDK_PIXBUF_LIB_DIR)
  42 + NCURSESW_LIB_DIRS += $(shell pkg-config --libs-only-L --libs-only-other $(X11_IMAGES_MODULES))
  43
  44   NCURSESW_LIBS += \
  45 -  -lgobject-2.0 -lgmodule-2.0 -lglib-2.0 -lgdk_pixbuf_xlib-2.0 \
  46 -  -lgdk_pixbuf-2.0 -lX11 -lgtk-x11-2.0
  47 +  $(shell pkg-config --libs-only-l $(X11_IMAGES_MODULES))
  48
  49  #  If these above won't work, try the "official" full set:
  50  #  -lgtk-x11-2.0 -lgdk-x11-2.0 -latk-1.0 -lgio-2.0 -lgdk_pixbuf-2.0 \
  51 @@ -67,7 +59,7 @@
  52  all: fizmo
  53
  54  fizmo: ../fizmo/libfizmo.a ncrsw_if.o $(NCURSESW_SOUND_OBJECT)
  55 -       $(CC) $(CFLAGS) ncrsw_if.o $(NCURSESW_SOUND_OBJECT) -L../fizmo $(NCURSESW_LIB_DIRS) $(SOUND_INTERFACE_LIB_DIRS) -lfizmo $(FIZMO_LIBS) $(NCURSESW_LIBS) $(SOUND_INTERFACE_LIBS) -o fizmo
  56 +       $(CC) $(LDFLAGS) ncrsw_if.o $(NCURSESW_SOUND_OBJECT) -L../fizmo $(NCURSESW_LIB_DIRS) $(SOUND_INTERFACE_LIB_DIRS) -lfizmo $(FIZMO_LIBS) $(NCURSESW_LIBS) $(SOUND_INTERFACE_LIBS) -o fizmo
  57
  58  ../fizmo/libfizmo.a::
  59         cd ../fizmo ; make libfizmo.a
  60 --- fizmo-0.6.9/src/fizmo/Makefile~     2009-10-13 20:07:24.000000000 +0100
  61 +++ fizmo-0.6.9/src/fizmo/Makefile      2011-05-15 15:25:58.000000000 +0100
  62 @@ -4,7 +4,7 @@
  63  ifneq ($(DISABLE_LIBXML2),)
  64  CFLAGS_LIBXML2 = -DDISABLE_LIBXML2=
  65  else
  66 -CFLAGS_LIBXML2 = -I$(LIBXML2_INC_DIR)
  67 +CFLAGS_LIBXML2 = $(shell pkg-config --cflags libxml-2.0)
  68  endif
  69
  70  ifneq ($(ENABLE_GDB_SYMBOLS),)
  71 --- fizmo-0.6.9/src/fizmo/fizmo.mk~     2009-01-20 20:13:43.000000000 +0000
  72 +++ fizmo-0.6.9/src/fizmo/fizmo.mk      2011-05-15 15:25:58.000000000 +0100
  73 @@ -2,6 +2,6 @@
  74  FIZMO_LIBS = -lm
  75
  76  ifeq ($(DISABLE_LIBXML2),)
  77 - FIZMO_LIBS += -lxml2
  78 + FIZMO_LIBS += $(shell pkg-config --libs-only-l libxml-2.0)
  79  endif
  80
  81 --- fizmo-0.6.9/src/sound-sdl/sound-sdl.mk~     2009-03-28 13:03:06.000000000 +0000
  82 +++ fizmo-0.6.9/src/sound-sdl/sound-sdl.mk      2011-05-15 15:25:58.000000000 +0100
  83 @@ -1,13 +1,9 @@
  84
  85 -SOUND_INTERFACE_CFLAGS = -D_GNU_SOURCE=1 -D_THREAD_SAFE
  86 -SOUND_INTERFACE_LIBS = -lSDLmain -lSDL
  87 +SOUND_INTERFACE_MODULES = sdl sndfile
  88 +SOUND_INTERFACE_CFLAGS = $(shell pkg-config --cflags $(SOUND_INTERFACE_MODULES))
  89 +SOUND_INTERFACE_LIBS = $(shell pkg-config --libs-only-l $(SOUND_INTERFACE_MODULES))
  90
  91 -SOUND_INTERFACE_LIB_DIRS = -L$(SDL_LIB_DIR)
  92 -
  93 -ifneq ($(SNDFILE_LIB_DIR),)
  94 -SOUND_INTERFACE_LIB_DIRS += -L$(SNDFILE_LIB_DIR)
  95 -SOUND_INTERFACE_LIBS += -lsndfile
  96 -endif
  97 +SOUND_INTERFACE_LIB_DIRS = $(shell pkg-config --libs-only-L --libs-only-other $(SOUND_INTERFACE_MODULES))
  98
  99  ifdef __APPLE__
 100  # Include Lib-Dir from Macports: