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

   1 Source: dleverton
   2 Upstream: not yet (might talk about moving to something less homegrown)
   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.0/config.default.mk~      2009-03-27 18:01:27.000000000 +0000
  10 +++ fizmo-0.6.0/config.default.mk       2009-03-27 22:40:54.000000000 +0000
  11 @@ -3,7 +3,7 @@
  12
  13  CC = gcc
  14  AR = ar
  15 -CFLAGS = -Wall -Wextra
  16 +CFLAGS = $(MY_CFLAGS)
  17
  18  INSTALL_PREFIX = $(HOME)/opt/fizmo-0.6.0
  19
  20 --- fizmo-0.6.0/src/ncursesw/Makefile~  2009-03-25 11:57:57.000000000 +0000
  21 +++ fizmo-0.6.0/src/ncursesw/Makefile   2009-03-27 23:12:47.000000000 +0000
  22 @@ -29,30 +29,23 @@
  23  NCURSEWS_FLAGS =
  24
  25  ifneq ($(ENABLE_X11_IMAGES),)
  26 + X11_IMAGES_MODULES = x11 gtk+-2.0 gdk-pixbuf-2.0 gdk-pixbuf-xlib-2.0
  27   NCURSESW_INC_DIRS +=\
  28 -  -I$(NCURSESW_INC_DIR)\
  29 -  -I$(GLIB_CONFIG_INC_DIR)\
  30 -  -I$(GLIB_INC_DIR)\
  31 -  -I$(GDK_CONFIG_INC_DIR)\
  32 -  -I$(GTK_INC_DIR)\
  33 -  -I$(GTK_INC_DIR)/gtk2\
  34 -  -I$(CAIRO_INC_DIR)\
  35 -  -I$(PANGO_INC_DIR)\
  36 -  -I$(ATK_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 -  -lgdk_pixbuf -lgtk -lgdk -lgmodule -lglib -lXext -lX11 -lgdk_pixbuf_xlib
  46 +  $(shell pkg-config --libs-only-l $(X11_IMAGES_MODULES))
  47  endif
  48
  49
  50  all: fizmo
  51
  52  fizmo: ../fizmo/libfizmo.a ncrsw_if.o $(NCURSESW_SOUND_OBJECT)
  53 -       $(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
  54 +       $(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
  55
  56  ../fizmo/libfizmo.a::
  57         cd ../fizmo ; make libfizmo.a
  58 --- fizmo-0.6.0/src/fizmo/Makefile~     2009-01-20 20:14:39.000000000 +0000
  59 +++ fizmo-0.6.0/src/fizmo/Makefile      2009-03-27 22:50:55.000000000 +0000
  60 @@ -4,7 +4,7 @@
  61  ifneq ($(DISABLE_LIBXML2),)
  62  CFLAGS_LIBXML2 = -DDISABLE_LIBXML2=
  63  else
  64 -CFLAGS_LIBXML2 = -I$(LIBXML2_INC_DIR)
  65 +CFLAGS_LIBXML2 = $(shell pkg-config --cflags libxml-2.0)
  66  endif
  67
  68  ifneq ($(ENABLE_GDB_SYMBOLS),)
  69 --- fizmo-0.6.0/src/fizmo/fizmo.mk~     2009-01-20 20:13:43.000000000 +0000
  70 +++ fizmo-0.6.0/src/fizmo/fizmo.mk      2009-03-27 22:52:05.000000000 +0000
  71 @@ -2,6 +2,6 @@
  72  FIZMO_LIBS = -lm
  73
  74  ifeq ($(DISABLE_LIBXML2),)
  75 - FIZMO_LIBS += -lxml2
  76 + FIZMO_LIBS += $(shell pkg-config --libs-only-l libxml-2.0)
  77  endif
  78
  79 --- fizmo-0.6.0/src/sound-sdl/sound-sdl.mk~     2009-03-25 12:15:50.000000000 +0000
  80 +++ fizmo-0.6.0/src/sound-sdl/sound-sdl.mk      2009-03-27 22:40:14.000000000 +0000
  81 @@ -1,15 +1,11 @@
  82
  83 -SOUND_INTERFACE_CFLAGS = -D_GNU_SOURCE=1 -D_THREAD_SAFE
  84 +SOUND_INTERFACE_MODULES = sdl sndfile
  85 +SOUND_INTERFACE_CFLAGS = $(shell pkg-config --cflags $(SOUND_INTERFACE_MODULES))
  86  #SOUND_INTERFACE_LIBS = -lSDLmain -lSDL_mixer -lSDL
  87 -SOUND_INTERFACE_LIBS = -lSDLmain -lSDL
  88 +SOUND_INTERFACE_LIBS = $(shell pkg-config --libs-only-l $(SOUND_INTERFACE_MODULES))
  89
  90  #SOUND_INTERFACE_LIB_DIRS = -L/opt/local/lib
  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: