blockout/automake.diff

82 lines
3.2 KiB
Diff

From: Jan Engelhardt <jengelh@medozas.de>
Date: 2012-03-25 16:12:52.925160061 +0200
---
BlockOut/Makefile.am | 11 +++++++++++
ImageLib/src/Makefile.am | 12 ++++++++++++
ImageLib/src/png/hpng.c | 2 +-
Makefile.am | 3 +++
configure.ac | 12 ++++++++++++
5 files changed, 39 insertions(+), 1 deletion(-)
Index: BL_SRC/BlockOut/Makefile.am
===================================================================
--- /dev/null
+++ BL_SRC/BlockOut/Makefile.am
@@ -0,0 +1,11 @@
+# -*- Makefile -*-
+
+AM_CPPFLAGS = -D_DEBUG -Dlinux -I../ImageLib/src -I. \
+ ${libSDL_CFLAGS} ${libSDL_mixer_CFLAGS}
+
+bin_PROGRAMS = blockout
+blockout_SOURCES = \
+ BlockOrientation.h BlockOut.cpp BlockOut.h BotMatrix.cpp BotMatrix.h BotPlayer.cpp BotPlayer.h BotPlayerAI.cpp EditControl.cpp EditControl.h GLApp/GLApp.cpp GLApp/GLApp.h GLApp/GLFont.cpp GLApp/GLFont.h GLApp/GLMatrix.cpp GLApp/GLMatrix.h GLApp/GLSprite.cpp GLApp/GLSprite.h Game.cpp Game.h Http.cpp Http.h InitPolyCube.cpp Menu.cpp Menu.h MenuGraphics.cpp MenuGrid.cpp MenuGrid.h MenuPage.h PageChangeSetup.cpp PageChooseSetup.cpp PageControls.cpp PageCredits.cpp PageGSOptions.cpp PageHallOfFame.cpp PageHallOfFameOnLine.cpp PageHttp.cpp PageMainMenu.cpp PageOptions.cpp PageScoreDetails.cpp PageStartGame.cpp Pit.cpp Pit.h PolyCube.cpp PolyCube.h SetupManager.cpp SetupManager.h SoundManager.cpp SoundManager.h Sprites.cpp Sprites.h Types.h Utils.cpp
+blockout_LDADD = \
+ ../ImageLib/src/libimagelib.la \
+ ${libGL_LIBS} ${libGLU_LIBS} ${libSDL_LIBS} ${libSDL_mixer_LIBS}
Index: BL_SRC/ImageLib/src/Makefile.am
===================================================================
--- /dev/null
+++ BL_SRC/ImageLib/src/Makefile.am
@@ -0,0 +1,12 @@
+# -*- Makefile -*-
+
+AM_CPPFLAGS = -I. ${libpng_CFLAGS}
+
+noinst_LTLIBRARIES = libimagelib.la
+
+libimagelib_la_SOURCES = \
+ gif/gif.cpp gif/gif.h \
+ jpg/H2v2.cpp jpg/idct.cpp jpg/jpegdecoder.cpp jpg/jpegdecodermain.cpp jpg/jpegdecoder.h jpg/main.h \
+ png/hpng.c png/hpng.h \
+ CImage.cpp CImage.h
+libimagelib_la_LIBADD = ${libpng_LIBS}
Index: BL_SRC/ImageLib/src/png/hpng.c
===================================================================
--- BL_SRC.orig/ImageLib/src/png/hpng.c
+++ BL_SRC/ImageLib/src/png/hpng.c
@@ -1,6 +1,6 @@
#include <malloc.h>
#include <math.h>
-#include "png/png.h"
+#include <png.h>
#include "hpng.h"
char PngErrorMessage[1024];
Index: BL_SRC/Makefile.am
===================================================================
--- /dev/null
+++ BL_SRC/Makefile.am
@@ -0,0 +1,3 @@
+# -*- Makefile -*-
+
+SUBDIRS = ImageLib/src BlockOut
Index: BL_SRC/configure.ac
===================================================================
--- /dev/null
+++ BL_SRC/configure.ac
@@ -0,0 +1,12 @@
+AC_INIT([blockout], [2.4])
+AC_CONFIG_AUX_DIR([build-aux])
+AM_INIT_AUTOMAKE([-Wall foreign subdir-objects tar-pax no-dist-gzip dist-xz])
+LT_INIT
+AC_PROG_CXX
+PKG_CHECK_MODULES([libGL], [gl])
+PKG_CHECK_MODULES([libGLU], [glu])
+PKG_CHECK_MODULES([libSDL], [sdl >= 1.2.12])
+PKG_CHECK_MODULES([libSDL_mixer], [SDL_mixer >= 1.2.8])
+PKG_CHECK_MODULES([libpng], [libpng])
+AC_CONFIG_FILES([Makefile ImageLib/src/Makefile BlockOut/Makefile])
+AC_OUTPUT