Commit 3e71febb authored by Tobias Hansen's avatar Tobias Hansen

New upstream version 2.2.2

parent 5d45ff39
......@@ -612,3 +612,18 @@ Engine:
Development Kit:
* Allow sprite banks larger than 255 images.
----------------------
2.2.2 - Bugfix release
----------------------
Engine:
* Fix MOD playback (fixes intro song of "Out of Order").
* Replace GLEE by GLEW as OpenGL loading library.
* Improved support for Pandora, Raspberry Pi and ODroid (by ptitSeb).
* Fix freeze function when the game window is scaled down.
* Handle https URLs in launch().
* Fix configure.ac to work with Automake 1.15
Development Kit:
* Fix a possible segfault in project manager due to uninitialized variable (Debian bug #880853).
......@@ -25,7 +25,7 @@
#include <glib-object.h>
#include <glib.h>
#include <GLee.h>
#include <GL/glew.h>
#define GL_GLEXT_PROTOTYPES
#include <GL/gl.h>
#include <GL/glu.h>
......
......@@ -43,7 +43,6 @@ sludge_spritebankeditor_SOURCES = \
sludge_translationeditor_SOURCES = \
TranslationEditorMain.cpp TranslationEditorMain.h \
SludgeTranslationEditor.cpp SludgeTranslationEditor.h \
SludgeGLApplication.cpp SludgeGLApplication.h \
SludgeApplication.cpp SludgeApplication.h \
Common.cpp Common.h ../source/DevKit/Common/interface.h \
../source/DevKit/TranslationEditor/translator.cpp ../source/DevKit/TranslationEditor/translator.h \
......@@ -144,7 +143,7 @@ EXTRA_DIST = \
../images/floorIcon/floorIcon.ico ../images/zIcon/zIcon.ico \
../images/spriteIcon/spriteIcon.ico ../images/ProjIcon/ProjIcon.ico
AM_CPPFLAGS = -I$(top_srcdir)/source/CommonCode -I$(top_srcdir)/source/DevKit/Common -I$(top_srcdir)/source/DevKit/Compiler -I$(top_srcdir)/source/DevKit/ProjectManager -I$(top_srcdir)/source/DevKit/GraphicalTools -I$(top_srcdir)/source/DevKit/TranslationEditor @GTK_CFLAGS@ @LIBPNG_CFLAGS@
AM_CPPFLAGS = -I$(top_srcdir)/source/CommonCode -I$(top_srcdir)/source/DevKit/Common -I$(top_srcdir)/source/DevKit/Compiler -I$(top_srcdir)/source/DevKit/ProjectManager -I$(top_srcdir)/source/DevKit/GraphicalTools -I$(top_srcdir)/source/DevKit/TranslationEditor @GTK_CFLAGS@ @LIBPNG_CFLAGS@ @GLEW_CFLAGS@
if COND_WIN32
AM_CPPFLAGS += \
......@@ -154,9 +153,9 @@ AM_CPPFLAGS += \
AM_LDFLAGS = \
-Wl,-subsystem,windows
sludge_floormaker_LDADD = FloorMakerResources.o @GTK_LIBS@ @LIBPNG_LIBS@ @GLEE_LIBS@
sludge_zbuffermaker_LDADD = ZBufferMakerResources.o @GTK_LIBS@ @LIBPNG_LIBS@ @GLEE_LIBS@
sludge_spritebankeditor_LDADD = SpriteBankEditorResources.o @GTK_LIBS@ @LIBPNG_LIBS@ @GLEE_LIBS@
sludge_floormaker_LDADD = FloorMakerResources.o @GTK_LIBS@ @LIBPNG_LIBS@ @GLEW_LIBS@
sludge_zbuffermaker_LDADD = ZBufferMakerResources.o @GTK_LIBS@ @LIBPNG_LIBS@ @GLEW_LIBS@
sludge_spritebankeditor_LDADD = SpriteBankEditorResources.o @GTK_LIBS@ @LIBPNG_LIBS@ @GLEW_LIBS@
sludge_translationeditor_LDADD = TranslationEditorResources.o @GTK_LIBS@ @LIBPNG_LIBS@
sludge_projectmanager_LDADD = ProjectManagerResources.o @GTK_LIBS@ @LIBPNG_LIBS@
else
......@@ -164,9 +163,9 @@ AM_CPPFLAGS += \
-std=c++0x \
-DDATADIR='"$(pkgdatadir)/"'
sludge_floormaker_LDADD = @GTK_LIBS@ @LIBPNG_LIBS@ @GLEE_LIBS@
sludge_zbuffermaker_LDADD = @GTK_LIBS@ @LIBPNG_LIBS@ @GLEE_LIBS@
sludge_spritebankeditor_LDADD = @GTK_LIBS@ @LIBPNG_LIBS@ @GLEE_LIBS@
sludge_floormaker_LDADD = @GTK_LIBS@ @LIBPNG_LIBS@ @GLEW_LIBS@
sludge_zbuffermaker_LDADD = @GTK_LIBS@ @LIBPNG_LIBS@ @GLEW_LIBS@
sludge_spritebankeditor_LDADD = @GTK_LIBS@ @LIBPNG_LIBS@ @GLEW_LIBS@
sludge_translationeditor_LDADD = @GTK_LIBS@ @LIBPNG_LIBS@
sludge_projectmanager_LDADD = @GTK_LIBS@ @LIBPNG_LIBS@
endif
......
This diff is collapsed.
......@@ -25,7 +25,7 @@
#include <glib-object.h>
#include <glib.h>
#include <GLee.h>
#include <GL/glew.h>
#define GL_GLEXT_PROTOTYPES
#include <GL/gl.h>
#include <GL/glu.h>
......
......@@ -25,7 +25,7 @@
#include <glib-object.h>
#include <glib.h>
#include <GLee.h>
#include <GL/glew.h>
#define GL_GLEXT_PROTOTYPES
#include <GL/gl.h>
#include <GL/glu.h>
......@@ -226,6 +226,15 @@ void SludgeGLApplication::on_drawingarea1_realize(GtkWidget *theWidget)
glViewport (0, 0, theWidget->allocation.width, theWidget->allocation.height);
/* Your one-time OpenGL initialization code goes here */
// Initialise GLEW
GLenum glewErr = glewInit();
if (GLEW_OK != glewErr)
{
g_critical ("Couldn't initialize GLEW.\n");
return;
}
x = y = 0;
w = theWidget->allocation.width;
h = theWidget->allocation.height;
......
......@@ -57,6 +57,7 @@ SludgeProjectManager::SludgeProjectManager()
{
if (!initSuccess) return;
numResources = 0;
resourceList[0] = NULL;
fileList[0] = NULL;
......
......@@ -25,7 +25,7 @@
#include <glib-object.h>
#include <glib.h>
#include <GLee.h>
#include <GL/glew.h>
#define GL_GLEXT_PROTOTYPES
#include <GL/gl.h>
#include <GL/glu.h>
......
......@@ -25,7 +25,7 @@
#include <glib-object.h>
#include <glib.h>
#include <GLee.h>
#include <GL/glew.h>
#define GL_GLEXT_PROTOTYPES
#include <GL/gl.h>
#include <GL/glu.h>
......
......@@ -25,7 +25,7 @@
#include <glib-object.h>
#include <glib.h>
#include <GLee.h>
#include <GL/glew.h>
#define GL_GLEXT_PROTOTYPES
#include <GL/gl.h>
#include <GL/glu.h>
......
......@@ -25,7 +25,7 @@
#include <glib-object.h>
#include <glib.h>
#include <GLee.h>
#include <GL/glew.h>
#define GL_GLEXT_PROTOTYPES
#include <GL/gl.h>
#include <GL/glu.h>
......
# Makefile.in generated by automake 1.14.1 from Makefile.am.
# Makefile.in generated by automake 1.15 from Makefile.am.
# @configure_input@
# Copyright (C) 1994-2013 Free Software Foundation, Inc.
# Copyright (C) 1994-2014 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
......@@ -15,7 +15,17 @@
@SET_MAKE@
VPATH = @srcdir@
am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
am__is_gnu_make = { \
if test -z '$(MAKELEVEL)'; then \
false; \
elif test -n '$(MAKE_HOST)'; then \
true; \
elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
true; \
else \
false; \
fi; \
}
am__make_running_with_option = \
case $${target_option-} in \
?) ;; \
......@@ -77,11 +87,11 @@ NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
subdir = GTK_Dev_Kit/support
DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
......@@ -138,6 +148,7 @@ am__installdirs = "$(DESTDIR)$(applicationsdir)" \
DATA = $(applications_DATA) $(gtksourceview3specs_DATA) \
$(gtksourceviewspecs_DATA) $(nobase_icons_DATA)
am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
am__DIST_COMMON = $(srcdir)/Makefile.in
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
AMTAR = @AMTAR@
......@@ -164,7 +175,8 @@ EGREP = @EGREP@
ENGINE_CFLAGS = @ENGINE_CFLAGS@
ENGINE_LIBS = @ENGINE_LIBS@
EXEEXT = @EXEEXT@
GLEE_LIBS = @GLEE_LIBS@
GLEW_CFLAGS = @GLEW_CFLAGS@
GLEW_LIBS = @GLEW_LIBS@
GLIB_CFLAGS = @GLIB_CFLAGS@
GLIB_LIBS = @GLIB_LIBS@
GL_CFLAGS = @GL_CFLAGS@
......@@ -236,6 +248,7 @@ pdfdir = @pdfdir@
prefix = @prefix@
program_transform_name = @program_transform_name@
psdir = @psdir@
runstatedir = @runstatedir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
srcdir = @srcdir@
......@@ -378,7 +391,6 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu GTK_Dev_Kit/support/Makefile'; \
$(am__cd) $(top_srcdir) && \
$(AUTOMAKE) --gnu GTK_Dev_Kit/support/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
*config.status*) \
......@@ -644,6 +656,8 @@ uninstall-am: uninstall-applicationsDATA \
uninstall-applicationsDATA uninstall-gtksourceview3specsDATA \
uninstall-gtksourceviewspecsDATA uninstall-nobase_iconsDATA
.PRECIOUS: Makefile
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
......
......@@ -24,33 +24,27 @@ Linux
Dependencies (Engine)
=====================
Dependencies of the OpenSLUDGE engine are SDL, OpenGL, GLee, libGLU,
libpng, libvpx and xdg-utils. OpenAL sound support requires OpenAL and
Alure (>= 1.1) with Vorbis, FLAC and DUMB support enabled.
Dependencies of the OpenSLUDGE engine are SDL, OpenGL, GLEW, libGLU,
libpng, libvpx and xdg-utils. OpenAL sound support requires OpenAL, DUMB and
Alure (>= 1.1) with Vorbis and FLAC support enabled.
On Debian and Ubuntu the correspoding packages are libsdl1.2-dev,
mesa-common-dev, glee-dev (only available in Debian Squeeze / Ubuntu 10.10
or above, but these packages can also be used for older releases of the
distributions), libglu1-mesa-dev, libpng12-dev, libvpx-dev, xdg-utils,
libopenal-dev, libalure-dev (version 1.1 required, only available in Debian
Wheezy / Ubuntu 11.10 or above, the packages can be used for older releases),
libvorbis-dev, libflac-dev and libdumb1-dev.
To use OpenGL ES 2 as graphics library, the dependencies OpenGL, GLee
mesa-common-dev, libglew-dev, libglu1-mesa-dev, libpng12-dev, libvpx-dev, xdg-utils,
libopenal-dev, libalure-dev, libvorbis-dev, libflac-dev and libdumb1-dev.
To use OpenGL ES 2 as graphics library, the dependencies OpenGL, GLEW
and libGLU are replaced by OpenGL ES 2 and EGL. That means in the above list
for Debian and Ubuntu mesa-common-dev, glee-dev and libglu1-mesa-dev are
for Debian and Ubuntu mesa-common-dev, libglew-dev and libglu1-mesa-dev are
replaced by libgles2-mesa-dev.
Dependencies (Dev Kit)
======================
Dependencies of the OpenSLUDGE Dev Kit are GTK+ (>= 2.16), GtkGLExt,
GLee and libpng.
GLEW and libpng.
On Debian and Ubuntu the correspoding packages are libgtk2.0-dev
libgtkglext1-dev, glee-dev (only available in Debian Squeeze / Ubuntu 10.10
or above, but these packages can also be used for older releases of the
distributions) and libpng12-dev.
libgtkglext1-dev, libglew-dev and libpng12-dev.
Installing OpenSLUDGE
=====================
......
# Makefile.in generated by automake 1.14.1 from Makefile.am.
# Makefile.in generated by automake 1.15 from Makefile.am.
# @configure_input@
# Copyright (C) 1994-2013 Free Software Foundation, Inc.
# Copyright (C) 1994-2014 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
......@@ -15,7 +15,17 @@
@SET_MAKE@
VPATH = @srcdir@
am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
am__is_gnu_make = { \
if test -z '$(MAKELEVEL)'; then \
false; \
elif test -n '$(MAKE_HOST)'; then \
true; \
elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
true; \
else \
false; \
fi; \
}
am__make_running_with_option = \
case $${target_option-} in \
?) ;; \
......@@ -77,15 +87,12 @@ NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
subdir = .
DIST_COMMON = INSTALL NEWS README AUTHORS ChangeLog \
$(srcdir)/Makefile.in $(srcdir)/Makefile.am \
$(top_srcdir)/configure $(am__configure_deps) \
$(srcdir)/config.h.in $(dist_doc_DATA) COPYING compile depcomp \
install-sh missing
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
DIST_COMMON = $(srcdir)/Makefile.am $(top_srcdir)/configure \
$(am__configure_deps) $(dist_doc_DATA) $(am__DIST_COMMON)
am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
configure.lineno config.status.lineno
mkinstalldirs = $(install_sh) -d
......@@ -178,6 +185,9 @@ ETAGS = etags
CTAGS = ctags
CSCOPE = cscope
DIST_SUBDIRS = source GTK_Dev_Kit doc
am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/config.h.in AUTHORS \
COPYING ChangeLog INSTALL NEWS README compile depcomp \
install-sh missing
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
distdir = $(PACKAGE)-$(VERSION)
top_distdir = $(distdir)
......@@ -245,7 +255,8 @@ EGREP = @EGREP@
ENGINE_CFLAGS = @ENGINE_CFLAGS@
ENGINE_LIBS = @ENGINE_LIBS@
EXEEXT = @EXEEXT@
GLEE_LIBS = @GLEE_LIBS@
GLEW_CFLAGS = @GLEW_CFLAGS@
GLEW_LIBS = @GLEW_LIBS@
GLIB_CFLAGS = @GLIB_CFLAGS@
GLIB_LIBS = @GLIB_LIBS@
GL_CFLAGS = @GL_CFLAGS@
......@@ -317,6 +328,7 @@ pdfdir = @pdfdir@
prefix = @prefix@
program_transform_name = @program_transform_name@
psdir = @psdir@
runstatedir = @runstatedir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
srcdir = @srcdir@
......@@ -350,7 +362,6 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu Makefile'; \
$(am__cd) $(top_srcdir) && \
$(AUTOMAKE) --gnu Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
*config.status*) \
......@@ -593,15 +604,15 @@ dist-xz: distdir
$(am__post_remove_distdir)
dist-tarZ: distdir
@echo WARNING: "Support for shar distribution archives is" \
"deprecated." >&2
@echo WARNING: "Support for distribution archives compressed with" \
"legacy program 'compress' is deprecated." >&2
@echo WARNING: "It will be removed altogether in Automake 2.0" >&2
tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
$(am__post_remove_distdir)
dist-shar: distdir
@echo WARNING: "Support for distribution archives compressed with" \
"legacy program 'compress' is deprecated." >&2
@echo WARNING: "Support for shar distribution archives is" \
"deprecated." >&2
@echo WARNING: "It will be removed altogether in Automake 2.0" >&2
shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz
$(am__post_remove_distdir)
......@@ -637,17 +648,17 @@ distcheck: dist
esac
chmod -R a-w $(distdir)
chmod u+w $(distdir)
mkdir $(distdir)/_build $(distdir)/_inst
mkdir $(distdir)/_build $(distdir)/_build/sub $(distdir)/_inst
chmod a-w $(distdir)
test -d $(distdir)/_build || exit 0; \
dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \
&& dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \
&& am__cwd=`pwd` \
&& $(am__cd) $(distdir)/_build \
&& ../configure \
&& $(am__cd) $(distdir)/_build/sub \
&& ../../configure \
$(AM_DISTCHECK_CONFIGURE_FLAGS) \
$(DISTCHECK_CONFIGURE_FLAGS) \
--srcdir=.. --prefix="$$dc_install_base" \
--srcdir=../.. --prefix="$$dc_install_base" \
&& $(MAKE) $(AM_MAKEFLAGS) \
&& $(MAKE) $(AM_MAKEFLAGS) dvi \
&& $(MAKE) $(AM_MAKEFLAGS) check \
......@@ -825,6 +836,8 @@ uninstall-am: uninstall-dist_docDATA
mostlyclean mostlyclean-generic pdf pdf-am ps ps-am tags \
tags-am uninstall uninstall-am uninstall-dist_docDATA
.PRECIOUS: Makefile
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
......
......@@ -3,9 +3,6 @@ For installation instructions, see INSTALL.
SLUDGE (except the GTK Dev Kit) is licenced under GNU LGPL version 2.1.
The GTK Dev Kit is licensed under GNU GPL version 3 or later.
You can natter to other people about OpenSLUDGE at
http://www.adventuredevelopers.com/forum/ if you like.
Enjoy!
- Tim (and Rikard (and Tobias))
- Tim, Rikard and Tobias
This diff is collapsed.
......@@ -3,7 +3,7 @@
scriptversion=2012-10-14.11; # UTC
# Copyright (C) 1999-2013 Free Software Foundation, Inc.
# Copyright (C) 1999-2014 Free Software Foundation, Inc.
# Written by Tom Tromey <tromey@cygnus.com>.
#
# This program is free software; you can redistribute it and/or modify
......
......@@ -6,6 +6,9 @@
/* Define to 1 if you have the `atexit' function. */
#undef HAVE_ATEXIT
/* Define to 1 if you have the <dumb.h> header file. */
#undef HAVE_DUMB_H
/* Define to 1 if you have the <EGL/egl.h> header file. */
#undef HAVE_EGL_EGL_H
......@@ -15,9 +18,6 @@
/* Define to 1 if you have the <getopt.h> header file. */
#undef HAVE_GETOPT_H
/* Define to 1 if you have the <GLee.h> header file. */
#undef HAVE_GLEE_H
/* Define to 1 if you have the <GLES2/gl2.h> header file. */
#undef HAVE_GLES2_GL2_H
......
This diff is collapsed.
......@@ -2,9 +2,9 @@
# Process this file with autoconf to produce a configure script.
AC_PREREQ([2.55])
AC_INIT([SLUDGE], [2.2.1], [tobias.han@gmx.de], [sludge], [http://opensludge.github.io/])
AC_INIT([SLUDGE], [2.2.2], [tobias.han@gmx.de], [sludge], [http://opensludge.github.io/])
AC_CONFIG_SRCDIR([source/CommonCode/tga.cpp])
AM_INIT_AUTOMAKE
AM_INIT_AUTOMAKE([subdir-objects])
AC_CONFIG_HEADERS([config.h])
m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])])
......@@ -19,6 +19,9 @@ AC_ARG_ENABLE([engine], [AC_HELP_STRING([--disable-engine], [don't build the SLU
AC_ARG_ENABLE([devkit], [AC_HELP_STRING([--enable-devkit], [build the SLUDGE DevKit])])
AC_ARG_ENABLE([doc], [AC_HELP_STRING([--enable-doc], [install the SLUDGE documentation])])
AC_ARG_ENABLE([gles2], [AC_HELP_STRING([--enable-gles2], [build engine using OpenGL ES 2.0])])
AC_ARG_ENABLE([pandora], [AC_HELP_STRING([--enable-pandora], [enable hacks for OpenPandora])])
AC_ARG_ENABLE([rpi], [AC_HELP_STRING([--enable-rpi], [enable Raspberry-PI support])])
AC_ARG_ENABLE([odroid], [AC_HELP_STRING([--enable-odroid], [enable ODroid support])])
# Set default targets:
if test "x$enable_engine" = x; then
......@@ -33,6 +36,24 @@ fi
if test "x$enable_gles2" = x; then
enable_gles2="no"
fi
if test "x$enable_pandora" = x; then
enable_pandora="no"
fi
if test "x$enable_rpi" = x; then
enable_rpi="no"
fi
if test "x$enable_odroid" = x; then
enable_odroid="no"
fi
if test "x$enable_pandora" = xyes; then
enable_gles2="yes"
fi
if test "x$enable_rpi" = xyes; then
enable_gles2="yes"
fi
if test "x$enable_odroid" = xyes; then
enable_gles2="yes"
fi
# Are we cross compiling for windows?
case "${host}" in
......@@ -50,22 +71,20 @@ fi
# Checks for libraries.
if test "x$enable_gles2" = xno; then
AC_CHECK_LIB([glee], [GLeeInit], [GLEE_LIBS="-lglee"], [AC_CHECK_LIB([GLee], [GLeeInit], [GLEE_LIBS="-lGLee"], [AC_MSG_ERROR([cannot find glee library])])])
AC_SUBST([GLEE_LIBS])
PKG_CHECK_MODULES([GLEW], [glew])
else
if test "x$enable_devkit" = xyes; then
AC_CHECK_LIB([glee], [GLeeInit], [GLEE_LIBS="-lglee"], [AC_CHECK_LIB([GLee], [GLeeInit], [GLEE_LIBS="-lGLee"], [AC_MSG_ERROR([cannot find glee library (needed for devkit)])])])
AC_SUBST([GLEE_LIBS])
PKG_CHECK_MODULES([GLEW], [glew])
fi
fi
if test "x$enable_engine" = xyes; then
PKG_CHECK_MODULES([ENGINE], [sdl alure >= 1.1 openal vorbis ogg])
AC_CHECK_LIB([vpx], [vpx_codec_decode], [ENGINE_LIBS+=" -lvpx"], [AC_MSG_ERROR([cannot find vpx library])])
PKG_CHECK_MODULES([ENGINE], [sdl alure >= 1.1 openal vorbis ogg vpx])
AC_CHECK_LIB([dumb], [duh_render], [ENGINE_LIBS="$ENGINE_LIBS -ldumb"], [AC_MSG_ERROR([cannot find DUMB library])])
if test "x$enable_gles2" = xyes; then
AC_CHECK_LIB([GLESv2], [glEnable], [ENGINE_LIBS+=" -lGLESv2"], [AC_MSG_ERROR([cannot find GLESv2 library])])
AC_CHECK_LIB([EGL], [eglInitialize], [ENGINE_LIBS+=" -lEGL"], [AC_MSG_ERROR([cannot find EGL library])])
AC_CHECK_LIB([X11], [XOpenDisplay], [ENGINE_LIBS+=" -lX11"], [AC_MSG_ERROR([cannot find X11 library])])
AC_CHECK_LIB([GLESv2], [glEnable], [ENGINE_LIBS="$ENGINE_LIBS -lGLESv2"], [AC_MSG_ERROR([cannot find GLESv2 library])])
AC_CHECK_LIB([EGL], [eglInitialize], [ENGINE_LIBS="$ENGINE_LIBS -lEGL"], [AC_MSG_ERROR([cannot find EGL library])])
AC_CHECK_LIB([X11], [XOpenDisplay], [ENGINE_LIBS="$ENGINE_LIBS -lX11"], [AC_MSG_ERROR([cannot find X11 library])])
else
PKG_CHECK_MODULES([GL], [gl glu])
fi
......@@ -82,20 +101,13 @@ PKG_CHECK_MODULES([LIBPNG], [libpng])
AC_CHECK_HEADERS([limits.h malloc.h stddef.h stdint.h stdlib.h string.h sys/time.h unistd.h], [], [AC_MSG_ERROR([cannot find one or more of these header files: limits.h malloc.h stddef.h stdint.h stdlib.h string.h sys/time.h unistd.h])])
AC_CHECK_HEADERS([getopt.h], [], [AC_MSG_ERROR([cannot find getopt header files])])
if test "x$enable_gles2" = xno; then
AC_CHECK_HEADERS([GLee.h], [], [AC_MSG_ERROR([cannot find glee header files])])
else
if test "x$enable_devkit" = xyes; then
AC_CHECK_HEADERS([GLee.h], [], [AC_MSG_ERROR([cannot find glee header files (needed for devkit)])])
fi
fi
if test "x$enable_engine" = xyes; then
AC_CHECK_HEADERS([SDL/SDL.h SDL/SDL_syswm.h], [], [AC_MSG_ERROR([cannot find SDL header files])])
AC_CHECK_HEADERS([AL/alure.h], [], [AC_MSG_ERROR([cannot find alure header files])])
AC_CHECK_HEADERS([vpx/vpx_decoder.h], [], [AC_MSG_ERROR([cannot find vpx header files])])
AC_CHECK_HEADERS([vorbis/codec.h], [], [AC_MSG_ERROR([cannot find vorbis header files])])
AC_CHECK_HEADERS([ogg/ogg.h], [], [AC_MSG_ERROR([cannot find ogg header files])])
AC_CHECK_HEADERS([dumb.h], [], [AC_MSG_ERROR([cannot find DUMB header files])])
if test "x$enable_gles2" = xyes; then
AC_CHECK_HEADERS([GLES2/gl2.h], [], [AC_MSG_ERROR([cannot find gles2 header files])])
AC_CHECK_HEADERS([EGL/egl.h], [], [AC_MSG_ERROR([cannot find egl header files])])
......@@ -123,6 +135,9 @@ AM_CONDITIONAL([COND_ENGINE], [test "x$enable_engine" = xyes])
AM_CONDITIONAL([COND_DEVKIT], [test "x$enable_devkit" = xyes])
AM_CONDITIONAL([COND_DOC], [test "x$enable_doc" = xyes])
AM_CONDITIONAL([COND_GLES2], [test "x$enable_gles2" = xyes])
AM_CONDITIONAL([COND_PANDORA], [test "x$enable_pandora" = xyes])
AM_CONDITIONAL([COND_RPI], [test "x$enable_rpi" = xyes])
AM_CONDITIONAL([COND_ODROID], [test "x$enable_odroid" = xyes])
AC_CONFIG_FILES([Makefile
source/Makefile
......@@ -134,7 +149,7 @@ AC_OUTPUT
echo "
SLUDGE configuration complete.
Note that Alure needs VorbisFile, FLAC and DUMB to provide full sound support for the SLUDGE engine.
Note that Alure needs VorbisFile and FLAC to provide full sound support for the SLUDGE engine.
Will build..."
if test x"$WIN32" = xyes; then
......
......@@ -3,7 +3,7 @@
scriptversion=2013-05-30.07; # UTC
# Copyright (C) 1999-2013 Free Software Foundation, Inc.
# Copyright (C) 1999-2014 Free Software Foundation, Inc.
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
......
# Makefile.in generated by automake 1.14.1 from Makefile.am.
# Makefile.in generated by automake 1.15 from Makefile.am.
# @configure_input@
# Copyright (C) 1994-2013 Free Software Foundation, Inc.
# Copyright (C) 1994-2014 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
......@@ -15,7 +15,17 @@
@SET_MAKE@
VPATH = @srcdir@
am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
am__is_gnu_make = { \
if test -z '$(MAKELEVEL)'; then \
false; \
elif test -n '$(MAKE_HOST)'; then \
true; \
elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
true; \
else \
false; \
fi; \
}
am__make_running_with_option = \
case $${target_option-} in \
?) ;; \
......@@ -77,12 +87,12 @@ NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
subdir = doc
DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
$(nobase_dist_doc_DATA)
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
DIST_COMMON = $(srcdir)/Makefile.am $(nobase_dist_doc_DATA) \
$(am__DIST_COMMON)
mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
......@@ -136,6 +146,7 @@ am__uninstall_files_from_dir = { \
am__installdirs = "$(DESTDIR)$(docdir)"
DATA = $(nobase_dist_doc_DATA)
am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
am__DIST_COMMON = $(srcdir)/Makefile.in
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
AMTAR = @AMTAR@
......@@ -162,7 +173,8 @@ EGREP = @EGREP@
ENGINE_CFLAGS = @ENGINE_CFLAGS@
ENGINE_LIBS = @ENGINE_LIBS@
EXEEXT = @EXEEXT@
GLEE_LIBS = @GLEE_LIBS@
GLEW_CFLAGS = @GLEW_CFLAGS@
GLEW_LIBS = @GLEW_LIBS@
GLIB_CFLAGS = @GLIB_CFLAGS@
GLIB_LIBS = @GLIB_LIBS@
GL_CFLAGS = @GL_CFLAGS@
......@@ -234,6 +246,7 @@ pdfdir = @pdfdir@
prefix = @prefix@
program_transform_name = @program_transform_name@
psdir = @psdir@
runstatedir = @runstatedir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
srcdir = @srcdir@
......@@ -523,7 +536,6 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/Makefile'; \
$(am__cd) $(top_srcdir) && \
$(AUTOMAKE) --gnu doc/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
*config.status*) \
......@@ -719,6 +731,8 @@ uninstall-am: uninstall-nobase_dist_docDATA
mostlyclean-generic pdf pdf-am ps ps-am tags-am uninstall \
uninstall-am uninstall-nobase_dist_docDATA
.PRECIOUS: Makefile
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
......
......@@ -22,22 +22,18 @@ You are hereby given permission to use, redistribute and/or modify SLUDGE under
</P>
<P>
For more information, visit the SLUDGE website or speak your mind on the Adventure Developers SLUDGE forum.
</P>
<P>
<A TARGET=_blank HREF="http://opensludge.github.io">http://opensludge.github.io</A>
For more information, visit the SLUDGE website.
</P>
<P>
<A TARGET=_blank HREF="http://www.adventuredevelopers.com/forum/">http://www.adventuredevelopers.com/forum/</A>
<A TARGET=_blank HREF="http://opensludge.github.io">http://opensludge.github.io</A>
</P>
<P>
For all other Hungry Software related goings-on, this is the site to be explored:
</P>
<P>
<P>
<A TARGET=_blank HREF="http://www.hungrysoftware.com/">http://www.hungrysoftware.com/</A>
</P>
......
......@@ -41,6 +41,10 @@
text-align:center;
padding-top:20px;
}
#searchBar{
text-align:center;
padding-top:20px;
}
/****************************************************************************************
* LAYOUT CSS FOR THE MENU
......@@ -217,6 +221,15 @@
<div id="topBar">
<img src="images/Sludge_128x128x32.png" alt="SLUDGE Logo" />
</div>
<div id="searchBar">
<form class="ddg" name="x" action="https://duckduckgo.com/" target="Frame">
<input type="hidden" value="opensludge.github.io/opensludge/doc" name="sites"></input>
<input type="hidden" value="1" name="kh"></input>
<input type="hidden" value="-1" name="kn"></input>
<input type="hidden" value="1" name="kac"></input>
<input type="search" placeholder="Search" name="q"></input>
</form>
</div>
<div id="leftColumn">
<ul id="SLUDGE_listMenu">
<li class="hasChildren"><a href="index.html" target="Frame">Welcome to SLUDGE!</a>
......
......@@ -12,80 +12,84 @@
<P>
SLUDGE's <a href="setScale.html">setScale</a> command is a useful little blighter. However, if you're still thinking in terms of "I want the character to be 100% here and 25% here" it might seem a little confusing. Here's a quick rundown of how to use it successfully.
</P>
SLUDGE's <a href="setScale.html">setScale</a> command is a useful little blighter. However, if you're still thinking in terms of "I want the character to be 100% here and 25% here" it might seem a little confusing. Here's a quick rundown of how to use it successfully.
</P>
<H3>Finding The Horizon</H3>
<H3>Finding The Horizon</H3>
<P>
<P>
Load your scene into a paint program. Now, draw a line along the horizon - you may need to imagine one, which is fine. Basically, the horizon is the line at which the size of a character will become zero... the edge of the world, if you like. Take the following room...
</P>
</P>
<P>
<IMG SRC="images/theroom.gif" alt="Welcome to the Tutorial City Art Gallery"><BR>
<IMG SRC="images/theroom.gif" alt="Welcome to the Tutorial City Art Gallery"><BR>
Fig. 1: Welcome to the Tutorial City Art Gallery
</P>
<P>