adam/cobm
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Removed SMPEG dependancy.

Browse Source 
Added --enable-debug support from Mudrony (with additions).


git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@85 8092fc87-c524-0410-9efc-e669fe64eaf9
This commit is contained in:
meep-eep
2002-09-26 23:26:19 +00:00
parent 4c25e97d22
commit 1d1b0f15db
24 changed files with 122 additions and 109 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sc2/configure.ac
+22 -9
View File
@@ -67,12 +67,9 @@ AC_CHECK_FUNCS([strupr])
# Check for SDL # Check for SDL
SDL_VERSION=1.2.2 SDL_VERSION=1.2.2
SMPEG_VERSION=0.4.0
AM_PATH_SDL($SDL_VERSION, , AC_MSG_ERROR([*** SDL version $SDL_VERSION not found!])) AM_PATH_SDL($SDL_VERSION, , AC_MSG_ERROR([*** SDL version $SDL_VERSION not found!]))
AM_PATH_SMPEG($SMPEG_VERSION, , AC_MSG_ERROR([*** smpeg version $SMPEG_VERSION not found!]))
AC_CHECK_LIB(SDL_mixer, main, , AC_MSG_ERROR([Your system is missing libSDL_mixer!]),`sdl-config --libs`) AC_CHECK_LIB(SDL_mixer, main, , AC_MSG_ERROR([Your system is missing libSDL_mixer!]),`sdl-config --libs`)
AC_CHECK_LIB(SDL_image, main, , AC_MSG_ERROR([Your system is missing libSDL_image!]),`sdl-config --libs`) AC_CHECK_LIB(SDL_image, main, , AC_MSG_ERROR([Your system is missing libSDL_image!]),`sdl-config --libs`)
AC_CHECK_LIB(smpeg, main, , AC_MSG_ERROR([Your system is missing libsmpeg!]),`smpeg-config --libs`)
#AC_CHECK_HEADERS(SDL/SDL_image.h, , AC_MSG_ERROR([Your system is missing SDL_image.h!])) #AC_CHECK_HEADERS(SDL/SDL_image.h, , AC_MSG_ERROR([Your system is missing SDL_image.h!]))
#AC_CHECK_HEADERS(SDL/SDL_mixer.h, , AC_MSG_ERROR([Your system is missing SDL_mixer.h!])) #AC_CHECK_HEADERS(SDL/SDL_mixer.h, , AC_MSG_ERROR([Your system is missing SDL_mixer.h!]))
@@ -112,14 +109,14 @@ esac
AC_MSG_CHECKING(for OpenGL support) AC_MSG_CHECKING(for OpenGL support)
have_opengl=no have_opengl=no
AC_TRY_COMPILE([ AC_TRY_COMPILE([
#if defined(__APPLE__) && defined(__MACH__) #if defined(__APPLE__) && defined(__MACH__)
#include <OpenGL/gl.h> #include <OpenGL/gl.h>
#else #else
#include <GL/gl.h> #include <GL/gl.h>
#endif #endif
],[ ],[
],[ ],[
have_opengl=yes have_opengl=yes
]) ])
AC_MSG_RESULT($have_opengl) AC_MSG_RESULT($have_opengl)
GL_LIBS=$SYS_GL_LIBS GL_LIBS=$SYS_GL_LIBS
@@ -175,6 +172,22 @@ else
AC_DEFINE_UNQUOTED(PACKAGE_LOCALE_DIR, "${prefix}/${DATADIRNAME}/locale", "Locale files") AC_DEFINE_UNQUOTED(PACKAGE_LOCALE_DIR, "${prefix}/${DATADIRNAME}/locale", "Locale files")
fi fi
# --------------------------------------------------------------------------
# User selectable features (conditionals)
AC_ARG_ENABLE(debug,
[ --enable-debug Turn on debugging],
[case "${enableval}" in
yes) debug=true ; AC_DEFINE(DEBUG,,Include debugging code) ;;
no) debug=false ;;
*) AC_MSG_ERROR(bad value ${enableval} for --enable-debug) ;;
esac],
[debug=false])
AM_CONDITIONAL(DEBUG, test x$debug = xtrue)
if [ "x$debug" = "xtrue" ]; then
CFLAGS="$CFLAGS -g"
fi
# -------------------------------------------------------------------------- # --------------------------------------------------------------------------
# Output configuration # Output configuration
sc2/src/Makefile.am
+2 -2
View File
@@ -2,7 +2,7 @@ SUBDIRS = sc2code
#CFLAGS = #CFLAGS =
INCLUDES = @SDL_CFLAGS@ @SMPEG_CFLAGS@ \ INCLUDES = @SDL_CFLAGS@ \
-I$(top_srcdir)/src \ -I$(top_srcdir)/src \
-I$(top_srcdir)/src/sc2code \ -I$(top_srcdir)/src/sc2code \
-I$(top_srcdir)/src/sc2code/libs -I$(top_srcdir)/src/sc2code/libs
@@ -10,6 +10,6 @@ INCLUDES = @SDL_CFLAGS@ @SMPEG_CFLAGS@ \
bin_PROGRAMS = sc2 bin_PROGRAMS = sc2
sc2_SOURCES = port.c starcon2.c sc2_SOURCES = port.c starcon2.c
sc2_LDADD = sc2code/libsc2.la @SDL_LIBS@ @GL_LIBS@ @SMPEG_LIBS@ sc2_LDADD = sc2code/libsc2.la @SDL_LIBS@ @GL_LIBS@
noinst_HEADERS = port.h noinst_HEADERS = port.h
sc2/src/sc2code/Makefile.am
+1 -1
View File
@@ -8,7 +8,7 @@ INCLUDES = \
-I$(top_srcdir)/src \ -I$(top_srcdir)/src \
-I$(top_srcdir)/src/sc2code \ -I$(top_srcdir)/src/sc2code \
-I$(top_srcdir)/src/sc2code/libs \ -I$(top_srcdir)/src/sc2code/libs \
@SDL_CFLAGS@ @SMPEG_CFLAGS@ @SDL_CFLAGS@
noinst_LTLIBRARIES = libsc2.la noinst_LTLIBRARIES = libsc2.la
sc2/src/sc2code/comm/Makefile.am
+1 -1
View File
@@ -10,7 +10,7 @@ RACES = \
EXTRA_DIRS = $(RACES) EXTRA_DIRS = $(RACES)
INCLUDES = @SDL_CFLAGS@ @SMPEG_CFLAGS@ \ INCLUDES = @SDL_CFLAGS@ \
-I$(top_srcdir)/src \ -I$(top_srcdir)/src \
-I$(top_srcdir)/src/sc2code \ -I$(top_srcdir)/src/sc2code \
-I$(top_srcdir)/src/sc2code/libs -I$(top_srcdir)/src/sc2code/libs
sc2/src/sc2code/libs/Makefile.am
+1 -1
View File
@@ -6,7 +6,7 @@ noinst_HEADERS = \
memlib.h reslib.h sndlib.h strlib.h tasklib.h threadlib.h \ memlib.h reslib.h sndlib.h strlib.h tasklib.h threadlib.h \
timelib.h vargs.h vidlib.h misc.h timelib.h vargs.h vidlib.h misc.h
INCLUDES = @SDL_CFLAGS@ @SMPEG_CFLAGS@ \ INCLUDES = @SDL_CFLAGS@ \
-I$(top_srcdir)/src \ -I$(top_srcdir)/src \
-I$(top_srcdir)/src/sc2code \ -I$(top_srcdir)/src/sc2code \
-I$(top_srcdir)/src/sc2code/libs -I$(top_srcdir)/src/sc2code/libs
sc2/src/sc2code/libs/decomp/Makefile.am
+1 -1
View File
@@ -3,7 +3,7 @@
# Written by Mudry <mudry@user.sf.net>, protected by GNU GPL. # Written by Mudry <mudry@user.sf.net>, protected by GNU GPL.
# CVS $ Id: $ # CVS $ Id: $
INCLUDES = @SDL_CFLAGS@ @SMPEG_CFLAGS@ \ INCLUDES = @SDL_CFLAGS@ \
-I$(top_srcdir)/src \ -I$(top_srcdir)/src \
-I$(top_srcdir)/src/sc2code \ -I$(top_srcdir)/src/sc2code \
-I$(top_srcdir)/src/sc2code/libs -I$(top_srcdir)/src/sc2code/libs
sc2/src/sc2code/libs/graphics/Makefile.am
+2 -2
View File
@@ -2,7 +2,7 @@ SUBDIRS = sdl
#CFLAGS = #CFLAGS =
INCLUDES = @SDL_CFLAGS@ @SMPEG_CFLAGS@ \ INCLUDES = @SDL_CFLAGS@ \
-I$(top_srcdir)/src \ -I$(top_srcdir)/src \
-I$(top_srcdir)/src/sc2code \ -I$(top_srcdir)/src/sc2code \
-I$(top_srcdir)/src/sc2code/libs -I$(top_srcdir)/src/sc2code/libs
@@ -16,7 +16,7 @@ libgraphics_la_SOURCES = clipline.c context.c drawable.c filegfx.c font.c \
libgraphics_la_LIBADD = sdl/libsdl.la libgraphics_la_LIBADD = sdl/libsdl.la
#libgraphics_la_LDFLAGS = @SMPEG_LIBS@ #libgraphics_la_LDFLAGS =
noinst_HEADERS = context.h display.h drawable.h font.h gfxintrn.h \ noinst_HEADERS = context.h display.h drawable.h font.h gfxintrn.h \
gfx_common.h cmap.h gfx_common.h cmap.h
sc2/src/sc2code/libs/graphics/sdl/Makefile.am
+1 -1
View File
@@ -1,6 +1,6 @@
#CFLAGS = #CFLAGS =
INCLUDES = @SDL_CFLAGS@ @SMPEG_CFLAGS@ \ INCLUDES = @SDL_CFLAGS@ \
-I$(top_srcdir)/src \ -I$(top_srcdir)/src \
-I$(top_srcdir)/src/sc2code \ -I$(top_srcdir)/src/sc2code \
-I$(top_srcdir)/src/sc2code/libs -I$(top_srcdir)/src/sc2code/libs
sc2/src/sc2code/libs/input/Makefile.am
+1 -1
View File
@@ -5,7 +5,7 @@
SUBDIRS = sdl SUBDIRS = sdl
INCLUDES = @SDL_CFLAGS@ @SMPEG_CFLAGS@ \ INCLUDES = @SDL_CFLAGS@ \
-I$(top_srcdir)/src \ -I$(top_srcdir)/src \
-I$(top_srcdir)/src/sc2code \ -I$(top_srcdir)/src/sc2code \
-I$(top_srcdir)/src/sc2code/libs -I$(top_srcdir)/src/sc2code/libs
sc2/src/sc2code/libs/input/sdl/Makefile.am
+1 -1
View File
@@ -3,7 +3,7 @@
# Written by Mudry <mudry@user.sf.net>, protected by GNU GPL. # Written by Mudry <mudry@user.sf.net>, protected by GNU GPL.
# CVS $ Id: $ # CVS $ Id: $
INCLUDES = @SDL_CFLAGS@ @SMPEG_CFLAGS@ \ INCLUDES = @SDL_CFLAGS@ \
-I$(top_srcdir)/src \ -I$(top_srcdir)/src \
-I$(top_srcdir)/src/sc2code \ -I$(top_srcdir)/src/sc2code \
-I$(top_srcdir)/src/sc2code/libs -I$(top_srcdir)/src/sc2code/libs
sc2/src/sc2code/libs/math/Makefile.am
+1 -1
View File
@@ -3,7 +3,7 @@
# Written by Mudry <mudry@user.sf.net>, protected by GNU GPL. # Written by Mudry <mudry@user.sf.net>, protected by GNU GPL.
# CVS $ Id: $ # CVS $ Id: $
INCLUDES = @SDL_CFLAGS@ @SMPEG_CFLAGS@ \ INCLUDES = @SDL_CFLAGS@ \
-I$(top_srcdir)/src \ -I$(top_srcdir)/src \
-I$(top_srcdir)/src/sc2code \ -I$(top_srcdir)/src/sc2code \
-I$(top_srcdir)/src/sc2code/libs -I$(top_srcdir)/src/sc2code/libs
sc2/src/sc2code/libs/memory/Makefile.am
+1 -1
View File
@@ -3,7 +3,7 @@
# Written by Mudry <mudry@user.sf.net>, protected by GNU GPL. # Written by Mudry <mudry@user.sf.net>, protected by GNU GPL.
# CVS $ Id: $ # CVS $ Id: $
INCLUDES = @SDL_CFLAGS@ @SMPEG_CFLAGS@ \ INCLUDES = @SDL_CFLAGS@ \
-I$(top_srcdir)/src \ -I$(top_srcdir)/src \
-I$(top_srcdir)/src/sc2code \ -I$(top_srcdir)/src/sc2code \
-I$(top_srcdir)/src/sc2code/libs -I$(top_srcdir)/src/sc2code/libs
sc2/src/sc2code/libs/resource/Makefile.am
+1 -1
View File
@@ -7,7 +7,7 @@ INCLUDES = \
-I$(top_srcdir)/src \ -I$(top_srcdir)/src \
-I$(top_srcdir)/src/sc2code \ -I$(top_srcdir)/src/sc2code \
-I$(top_srcdir)/src/sc2code/libs \ -I$(top_srcdir)/src/sc2code/libs \
@SDL_CFLAGS@ @SMPEG_CFLAGS@ @SDL_CFLAGS@
noinst_LTLIBRARIES = libresource.la noinst_LTLIBRARIES = libresource.la
libresource_la_SOURCES = getres.c loadres.c resdata.c resinit.c direct.c filecntl.c libresource_la_SOURCES = getres.c loadres.c resdata.c resinit.c direct.c filecntl.c
sc2/src/sc2code/libs/sound/Makefile.am
+1 -1
View File
@@ -5,7 +5,7 @@
SUBDIRS = sdl SUBDIRS = sdl
INCLUDES = @SDL_CFLAGS@ @SMPEG_CFLAGS@ \ INCLUDES = @SDL_CFLAGS@ \
-I$(top_srcdir)/src \ -I$(top_srcdir)/src \
-I$(top_srcdir)/src/sc2code \ -I$(top_srcdir)/src/sc2code \
-I$(top_srcdir)/src/sc2code/libs -I$(top_srcdir)/src/sc2code/libs
sc2/src/sc2code/libs/sound/sdl/Makefile.am
+1 -1
View File
@@ -3,7 +3,7 @@
# Written by Mudry <mudry@user.sf.net>, protected by GNU GPL. # Written by Mudry <mudry@user.sf.net>, protected by GNU GPL.
# CVS $ Id: $ # CVS $ Id: $
INCLUDES = @SDL_CFLAGS@ @SMPEG_CFLAGS@ \ INCLUDES = @SDL_CFLAGS@ \
-I$(top_srcdir)/src \ -I$(top_srcdir)/src \
-I$(top_srcdir)/src/sc2code \ -I$(top_srcdir)/src/sc2code \
-I$(top_srcdir)/src/sc2code/libs -I$(top_srcdir)/src/sc2code/libs
sc2/src/sc2code/libs/strings/Makefile.am
+1 -1
View File
@@ -7,7 +7,7 @@ INCLUDES = \
-I$(top_srcdir)/src \ -I$(top_srcdir)/src \
-I$(top_srcdir)/src/sc2code \ -I$(top_srcdir)/src/sc2code \
-I$(top_srcdir)/src/sc2code/libs \ -I$(top_srcdir)/src/sc2code/libs \
@SDL_CFLAGS@ @SMPEG_CFLAGS@ @SDL_CFLAGS@
noinst_LTLIBRARIES = libstrings.la noinst_LTLIBRARIES = libstrings.la
libstrings_la_SOURCES = getstr.c sfileins.c sresins.c strings.c libstrings_la_SOURCES = getstr.c sfileins.c sresins.c strings.c
sc2/src/sc2code/libs/task/Makefile.am
+1 -1
View File
@@ -1,4 +1,4 @@
INCLUDES = @SDL_CFLAGS@ @SMPEG_CFLAGS@ \ INCLUDES = @SDL_CFLAGS@ \
-I$(top_srcdir)/src \ -I$(top_srcdir)/src \
-I$(top_srcdir)/src/sc2code \ -I$(top_srcdir)/src/sc2code \
-I$(top_srcdir)/src/sc2code/libs -I$(top_srcdir)/src/sc2code/libs
sc2/src/sc2code/libs/threads/Makefile.am
+1 -1
View File
@@ -1,6 +1,6 @@
SUBDIRS = sdl SUBDIRS = sdl
INCLUDES = @SDL_CFLAGS@ @SMPEG_CFLAGS@ \ INCLUDES = @SDL_CFLAGS@ \
-I$(top_srcdir)/src \ -I$(top_srcdir)/src \
-I$(top_srcdir)/src/sc2code \ -I$(top_srcdir)/src/sc2code \
-I$(top_srcdir)/src/sc2code/libs -I$(top_srcdir)/src/sc2code/libs
sc2/src/sc2code/libs/threads/sdl/Makefile.am
+1 -1
View File
@@ -1,4 +1,4 @@
INCLUDES = @SDL_CFLAGS@ @SMPEG_CFLAGS@ \ INCLUDES = @SDL_CFLAGS@ \
-I$(top_srcdir)/src \ -I$(top_srcdir)/src \
-I$(top_srcdir)/src/sc2code \ -I$(top_srcdir)/src/sc2code \
-I$(top_srcdir)/src/sc2code/libs -I$(top_srcdir)/src/sc2code/libs
sc2/src/sc2code/libs/time/Makefile.am
+1 -1
View File
@@ -1,6 +1,6 @@
SUBDIRS = sdl SUBDIRS = sdl
INCLUDES = @SDL_CFLAGS@ @SMPEG_CFLAGS@ \ INCLUDES = @SDL_CFLAGS@ \
-I$(top_srcdir)/src \ -I$(top_srcdir)/src \
-I$(top_srcdir)/src/sc2code \ -I$(top_srcdir)/src/sc2code \
-I$(top_srcdir)/src/sc2code/libs -I$(top_srcdir)/src/sc2code/libs
sc2/src/sc2code/libs/time/sdl/Makefile.am
+1 -1
View File
@@ -1,4 +1,4 @@
INCLUDES = @SDL_CFLAGS@ @SMPEG_CFLAGS@ \ INCLUDES = @SDL_CFLAGS@ \
-I$(top_srcdir)/src \ -I$(top_srcdir)/src \
-I$(top_srcdir)/src/sc2code \ -I$(top_srcdir)/src/sc2code \
-I$(top_srcdir)/src/sc2code/libs -I$(top_srcdir)/src/sc2code/libs
sc2/src/sc2code/libs/video/Makefile.am
+1 -1
View File
@@ -3,7 +3,7 @@
# Written by Mudry <mudry@user.sf.net>, protected by GNU GPL. # Written by Mudry <mudry@user.sf.net>, protected by GNU GPL.
# CVS $ Id: $ # CVS $ Id: $
INCLUDES = @SDL_CFLAGS@ @SMPEG_CFLAGS@ \ INCLUDES = @SDL_CFLAGS@ \
-I$(top_srcdir)/src \ -I$(top_srcdir)/src \
-I$(top_srcdir)/src/sc2code \ -I$(top_srcdir)/src/sc2code \
-I$(top_srcdir)/src/sc2code/libs -I$(top_srcdir)/src/sc2code/libs
sc2/src/sc2code/planets/Makefile.am
+1 -1
View File
@@ -3,7 +3,7 @@
# Written by Mudry <mudry@user.sf.net>, protected by GNU GPL. # Written by Mudry <mudry@user.sf.net>, protected by GNU GPL.
# CVS $ Id: $ # CVS $ Id: $
INCLUDES = @SDL_CFLAGS@ @SMPEG_CFLAGS@ \ INCLUDES = @SDL_CFLAGS@ \
-I/usr/include/SDL \ -I/usr/include/SDL \
-I$(top_srcdir)/src \ -I$(top_srcdir)/src \
-I$(top_srcdir)/src/sc2code \ -I$(top_srcdir)/src/sc2code \
sc2/src/sc2code/ships/Makefile.am
+1 -1
View File
@@ -10,7 +10,7 @@ RACES = androsyn arilou blackurq chenjesu chmmr druuge human ilwrath \
EXTRA_DIRS = $(RACES) EXTRA_DIRS = $(RACES)
INCLUDES = @SDL_CFLAGS@ @SMPEG_CFLAGS@ \ INCLUDES = @SDL_CFLAGS@ \
-I$(top_srcdir)/src \ -I$(top_srcdir)/src \
-I$(top_srcdir)/src/sc2code \ -I$(top_srcdir)/src/sc2code \
-I$(top_srcdir)/src/sc2code/libs -I$(top_srcdir)/src/sc2code/libs