Fix to --enable-debug in Unix automake
Deon Ramsey
parent
8dea2ef531
commit
d0d8badfc4
|
|
@ -334,3 +334,6 @@ Code:
|
|||
Code:
|
||||
* Rewrote texture font code; texfont.cpp is gone, everything now in
|
||||
texturefont.cpp
|
||||
|
||||
1.1.5
|
||||
* fixed problems with '--enable-debug' under Unix automake (dramsey)
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
# Makefile.in generated automatically by automake 1.4 from Makefile.am
|
||||
# Makefile.in generated automatically by automake 1.4-p5 from Makefile.am
|
||||
|
||||
# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
|
||||
# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
|
||||
# This Makefile.in is free software; the Free Software Foundation
|
||||
# gives unlimited permission to copy and/or distribute it,
|
||||
# with or without modifications, as long as this notice is preserved.
|
||||
|
|
@ -110,7 +110,7 @@ mkinstalldirs
|
|||
|
||||
DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
|
||||
|
||||
TAR = gtar
|
||||
TAR = tar
|
||||
GZIP_ENV = --best
|
||||
all: all-redirect
|
||||
.SUFFIXES:
|
||||
|
|
@ -212,7 +212,7 @@ maintainer-clean-recursive:
|
|||
dot_seen=no; \
|
||||
rev=''; list='$(SUBDIRS)'; for subdir in $$list; do \
|
||||
rev="$$subdir $$rev"; \
|
||||
test "$$subdir" = "." && dot_seen=yes; \
|
||||
test "$$subdir" != "." || dot_seen=yes; \
|
||||
done; \
|
||||
test "$$dot_seen" = "no" && rev=". $$rev"; \
|
||||
target=`echo $@ | sed s/-recursive//`; \
|
||||
|
|
|
|||
|
|
@ -0,0 +1,4 @@
|
|||
#undef HAVE_LIBSM
|
||||
|
||||
#undef CONFIG_DATA_DIR
|
||||
|
||||
|
|
@ -1,6 +1,6 @@
|
|||
dnl aclocal.m4 generated automatically by aclocal 1.4
|
||||
dnl aclocal.m4 generated automatically by aclocal 1.4-p5
|
||||
|
||||
dnl Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
|
||||
dnl Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
|
||||
dnl This file is free software; the Free Software Foundation
|
||||
dnl gives unlimited permission to copy and/or distribute it,
|
||||
dnl with or without modifications, as long as this notice is preserved.
|
||||
|
|
@ -19,7 +19,7 @@ dnl PARTICULAR PURPOSE.
|
|||
dnl Usage:
|
||||
dnl AM_INIT_AUTOMAKE(package,version, [no-define])
|
||||
|
||||
AC_DEFUN(AM_INIT_AUTOMAKE,
|
||||
AC_DEFUN([AM_INIT_AUTOMAKE],
|
||||
[AC_REQUIRE([AC_PROG_INSTALL])
|
||||
PACKAGE=[$1]
|
||||
AC_SUBST(PACKAGE)
|
||||
|
|
@ -47,7 +47,7 @@ AC_REQUIRE([AC_PROG_MAKE_SET])])
|
|||
# Check to make sure that the build environment is sane.
|
||||
#
|
||||
|
||||
AC_DEFUN(AM_SANITY_CHECK,
|
||||
AC_DEFUN([AM_SANITY_CHECK],
|
||||
[AC_MSG_CHECKING([whether build environment is sane])
|
||||
# Just in case
|
||||
sleep 1
|
||||
|
|
@ -88,7 +88,7 @@ AC_MSG_RESULT(yes)])
|
|||
|
||||
dnl AM_MISSING_PROG(NAME, PROGRAM, DIRECTORY)
|
||||
dnl The program must properly implement --version.
|
||||
AC_DEFUN(AM_MISSING_PROG,
|
||||
AC_DEFUN([AM_MISSING_PROG],
|
||||
[AC_MSG_CHECKING(for working $2)
|
||||
# Run test in a subshell; some versions of sh will print an error if
|
||||
# an executable is not found, even if stderr is redirected.
|
||||
|
|
@ -104,7 +104,7 @@ AC_SUBST($1)])
|
|||
|
||||
# Like AC_CONFIG_HEADER, but automatically create stamp file.
|
||||
|
||||
AC_DEFUN(AM_CONFIG_HEADER,
|
||||
AC_DEFUN([AM_CONFIG_HEADER],
|
||||
[AC_PREREQ([2.12])
|
||||
AC_CONFIG_HEADER([$1])
|
||||
dnl When config.status generates a header, we must update the stamp-h file.
|
||||
|
|
@ -144,7 +144,7 @@ AC_DEFUN([AM_ACLOCAL_INCLUDE],
|
|||
|
||||
# Define a conditional.
|
||||
|
||||
AC_DEFUN(AM_CONDITIONAL,
|
||||
AC_DEFUN([AM_CONDITIONAL],
|
||||
[AC_SUBST($1_TRUE)
|
||||
AC_SUBST($1_FALSE)
|
||||
if $2; then
|
||||
|
|
|
|||
61
config.h.in
61
config.h.in
|
|
@ -1,55 +1,54 @@
|
|||
/* config.h.in. Generated automatically from configure.in by autoheader. */
|
||||
|
||||
/* Define if you have the ANSI C header files. */
|
||||
#undef STDC_HEADERS
|
||||
|
||||
/* Define if your processor stores words with the most significant
|
||||
byte first (like Motorola and SPARC, unlike Intel and VAX). */
|
||||
#undef WORDS_BIGENDIAN
|
||||
|
||||
/* Define if the X Window System is missing or not being used. */
|
||||
#undef X_DISPLAY_MISSING
|
||||
|
||||
#undef HAVE_LIBSM
|
||||
|
||||
#undef CONFIG_DATA_DIR
|
||||
|
||||
/* Define if you have the <GL/gl.h> header file. */
|
||||
#undef HAVE_GL_GL_H
|
||||
|
||||
/* Define if you have the <GL/glut.h> header file. */
|
||||
#undef HAVE_GL_GLUT_H
|
||||
|
||||
/* Define if you have the <X11/SM/SMlib.h> header file. */
|
||||
#undef HAVE_X11_SM_SMLIB_H
|
||||
|
||||
/* Define if you have the <byteswap.h> header file. */
|
||||
/* Define if you have the <byteswap.h> header file. */
|
||||
#undef HAVE_BYTESWAP_H
|
||||
|
||||
/* Define if you have the GL library (-lGL). */
|
||||
/* Define if you have the <GL/glut.h> header file. */
|
||||
#undef HAVE_GL_GLUT_H
|
||||
|
||||
/* Define if you have the <GL/gl.h> header file. */
|
||||
#undef HAVE_GL_GL_H
|
||||
|
||||
/* Define if you have the `GL' library (-lGL). */
|
||||
#undef HAVE_LIBGL
|
||||
|
||||
/* Define if you have the GLU library (-lGLU). */
|
||||
/* Define if you have the `GLU' library (-lGLU). */
|
||||
#undef HAVE_LIBGLU
|
||||
|
||||
/* Define if you have the MesaGL library (-lMesaGL). */
|
||||
#undef HAVE_LIBMESAGL
|
||||
|
||||
/* Define if you have the MesaGLU library (-lMesaGLU). */
|
||||
#undef HAVE_LIBMESAGLU
|
||||
|
||||
/* Define if you have the glut library (-lglut). */
|
||||
/* Define if you have the `glut' library (-lglut). */
|
||||
#undef HAVE_LIBGLUT
|
||||
|
||||
/* Define if you have the jpeg library (-ljpeg). */
|
||||
/* Define if you have the `jpeg' library (-ljpeg). */
|
||||
#undef HAVE_LIBJPEG
|
||||
|
||||
/* Define if you have the png library (-lpng). */
|
||||
/* Define if you have the `MesaGL' library (-lMesaGL). */
|
||||
#undef HAVE_LIBMESAGL
|
||||
|
||||
/* Define if you have the `MesaGLU' library (-lMesaGLU). */
|
||||
#undef HAVE_LIBMESAGLU
|
||||
|
||||
/* Define if you have the `png' library (-lpng). */
|
||||
#undef HAVE_LIBPNG
|
||||
|
||||
/* Define if you have the <X11/SM/SMlib.h> header file. */
|
||||
#undef HAVE_X11_SM_SMLIB_H
|
||||
|
||||
/* Name of package */
|
||||
#undef PACKAGE
|
||||
|
||||
/* Define if you have the ANSI C header files. */
|
||||
#undef STDC_HEADERS
|
||||
|
||||
/* Version number of package */
|
||||
#undef VERSION
|
||||
|
||||
/* Define if your processor stores words with the most significant byte first
|
||||
(like Motorola and SPARC, unlike Intel and VAX). */
|
||||
#undef WORDS_BIGENDIAN
|
||||
|
||||
/* Define if the X Window System is missing or not being used. */
|
||||
#undef X_DISPLAY_MISSING
|
||||
|
|
|
|||
|
|
@ -50,7 +50,7 @@ dnl alpha*-*-linux-*) CELESTIA_CFLAGS="$CELESTIA_CFLAGS -mieee";;
|
|||
dnl esac
|
||||
|
||||
AC_ARG_ENABLE(debug, [ --enable-debug Produce an executable with debugging symbols],
|
||||
[CELESTIA_CFLAGS="-g -Wall"; CELESTIA_CXXFLAGS="-g -Wall"],
|
||||
[CELESTIA_CFLAGS="-g -Wall -DDEBUG"; CELESTIA_CXXFLAGS="-g -Wall -DDEBUG"],
|
||||
[CELESTIA_CPPFLAGS="$CELESTIA_CPPFLAGS -DCELESTIA_NO_ASSERT=1"])
|
||||
|
||||
AC_ARG_ENABLE(pedantic, [ --enable-pedantic Enable -pedantic (and -ansi for C) when compiling], CELESTIA_CFLAGS="$CELESTIA_CFLAGS -ansi -pedantic"; CELESTIA_CXXFLAGS="$CELESTIA_CXXFLAGS -pedantic")
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
# Makefile.in generated automatically by automake 1.4 from Makefile.am
|
||||
# Makefile.in generated automatically by automake 1.4-p5 from Makefile.am
|
||||
|
||||
# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
|
||||
# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
|
||||
# This Makefile.in is free software; the Free Software Foundation
|
||||
# gives unlimited permission to copy and/or distribute it,
|
||||
# with or without modifications, as long as this notice is preserved.
|
||||
|
|
@ -100,7 +100,7 @@ DIST_COMMON = Makefile.am Makefile.in
|
|||
|
||||
DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
|
||||
|
||||
TAR = gtar
|
||||
TAR = tar
|
||||
GZIP_ENV = --best
|
||||
all: all-redirect
|
||||
.SUFFIXES:
|
||||
|
|
@ -148,7 +148,7 @@ maintainer-clean-recursive:
|
|||
dot_seen=no; \
|
||||
rev=''; list='$(SUBDIRS)'; for subdir in $$list; do \
|
||||
rev="$$subdir $$rev"; \
|
||||
test "$$subdir" = "." && dot_seen=yes; \
|
||||
test "$$subdir" != "." || dot_seen=yes; \
|
||||
done; \
|
||||
test "$$dot_seen" = "no" && rev=". $$rev"; \
|
||||
target=`echo $@ | sed s/-recursive//`; \
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
# Makefile.in generated automatically by automake 1.4 from Makefile.am
|
||||
# Makefile.in generated automatically by automake 1.4-p5 from Makefile.am
|
||||
|
||||
# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
|
||||
# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
|
||||
# This Makefile.in is free software; the Free Software Foundation
|
||||
# gives unlimited permission to copy and/or distribute it,
|
||||
# with or without modifications, as long as this notice is preserved.
|
||||
|
|
@ -123,7 +123,7 @@ DIST_COMMON = Makefile.am Makefile.in
|
|||
|
||||
DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
|
||||
|
||||
TAR = gtar
|
||||
TAR = tar
|
||||
GZIP_ENV = --best
|
||||
DEP_FILES = .deps/3dsmodel.P .deps/3dsread.P
|
||||
SOURCES = $(libcel3ds_a_SOURCES)
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
# Makefile.in generated automatically by automake 1.4 from Makefile.am
|
||||
# Makefile.in generated automatically by automake 1.4-p5 from Makefile.am
|
||||
|
||||
# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
|
||||
# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
|
||||
# This Makefile.in is free software; the Free Software Foundation
|
||||
# gives unlimited permission to copy and/or distribute it,
|
||||
# with or without modifications, as long as this notice is preserved.
|
||||
|
|
@ -129,7 +129,7 @@ DIST_COMMON = Makefile.am Makefile.in
|
|||
|
||||
DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
|
||||
|
||||
TAR = gtar
|
||||
TAR = tar
|
||||
GZIP_ENV = --best
|
||||
DEP_FILES = .deps/3dsmesh.P .deps/asterism.P .deps/astro.P .deps/body.P \
|
||||
.deps/catalogxref.P .deps/cmdparser.P .deps/command.P \
|
||||
|
|
|
|||
|
|
@ -249,7 +249,7 @@ bool Renderer::init(int winWidth, int winHeight)
|
|||
InitExtMultiTexture();
|
||||
if (ExtensionSupported("GL_NV_register_combiners"))
|
||||
InitExtRegisterCombiners();
|
||||
if (ExtensionSupported("GL_NV_vertex_program"))
|
||||
if (ExtensionSupported("GL_NV_vertex_program") && glGenProgramsNV)
|
||||
InitExtVertexProgram();
|
||||
if (ExtensionSupported("GL_EXT_texture_cube_map"))
|
||||
{
|
||||
|
|
@ -318,7 +318,7 @@ bool Renderer::init(int winWidth, int winHeight)
|
|||
DPRINTF("Renderer: nVidia register combiners supported.\n");
|
||||
useRegisterCombiners = true;
|
||||
}
|
||||
if (ExtensionSupported("GL_NV_vertex_program"))
|
||||
if (ExtensionSupported("GL_NV_vertex_program") && glGenProgramsNV)
|
||||
{
|
||||
DPRINTF("Renderer: nVidia vertex programs supported.\n");
|
||||
useVertexPrograms = vp::init();
|
||||
|
|
|
|||
|
|
@ -20,9 +20,9 @@
|
|||
#ifdef __GNUC__
|
||||
|
||||
#ifndef DEBUG
|
||||
#define DPRINTF(fmt, args...)
|
||||
#define DPRINTF(args...)
|
||||
#else
|
||||
#define DPRINTF(fmt, args...) DebugPrint(fmt, args)
|
||||
#define DPRINTF(args...) DebugPrint(args)
|
||||
#endif
|
||||
|
||||
#else
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
# Makefile.in generated automatically by automake 1.4 from Makefile.am
|
||||
# Makefile.in generated automatically by automake 1.4-p5 from Makefile.am
|
||||
|
||||
# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
|
||||
# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
|
||||
# This Makefile.in is free software; the Free Software Foundation
|
||||
# gives unlimited permission to copy and/or distribute it,
|
||||
# with or without modifications, as long as this notice is preserved.
|
||||
|
|
@ -141,7 +141,7 @@ DIST_COMMON = Makefile.am Makefile.in
|
|||
|
||||
DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
|
||||
|
||||
TAR = gtar
|
||||
TAR = tar
|
||||
GZIP_ENV = --best
|
||||
DEP_FILES = .deps/celestiacore.P .deps/configfile.P .deps/destination.P \
|
||||
.deps/favorites.P .deps/glutmain.P .deps/gtkmain.P .deps/imagecapture.P
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
# Makefile.in generated automatically by automake 1.4 from Makefile.am
|
||||
# Makefile.in generated automatically by automake 1.4-p5 from Makefile.am
|
||||
|
||||
# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
|
||||
# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
|
||||
# This Makefile.in is free software; the Free Software Foundation
|
||||
# gives unlimited permission to copy and/or distribute it,
|
||||
# with or without modifications, as long as this notice is preserved.
|
||||
|
|
@ -123,7 +123,7 @@ DIST_COMMON = Makefile.am Makefile.in
|
|||
|
||||
DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
|
||||
|
||||
TAR = gtar
|
||||
TAR = tar
|
||||
GZIP_ENV = --best
|
||||
DEP_FILES = .deps/frustum.P .deps/perlin.P
|
||||
SOURCES = $(libcelmath_a_SOURCES)
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
# Makefile.in generated automatically by automake 1.4 from Makefile.am
|
||||
# Makefile.in generated automatically by automake 1.4-p5 from Makefile.am
|
||||
|
||||
# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
|
||||
# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
|
||||
# This Makefile.in is free software; the Free Software Foundation
|
||||
# gives unlimited permission to copy and/or distribute it,
|
||||
# with or without modifications, as long as this notice is preserved.
|
||||
|
|
@ -123,7 +123,7 @@ DIST_COMMON = Makefile.am Makefile.in
|
|||
|
||||
DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
|
||||
|
||||
TAR = gtar
|
||||
TAR = tar
|
||||
GZIP_ENV = --best
|
||||
DEP_FILES = .deps/texturefont.P
|
||||
SOURCES = $(libceltxf_a_SOURCES)
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
# Makefile.in generated automatically by automake 1.4 from Makefile.am
|
||||
# Makefile.in generated automatically by automake 1.4-p5 from Makefile.am
|
||||
|
||||
# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
|
||||
# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
|
||||
# This Makefile.in is free software; the Free Software Foundation
|
||||
# gives unlimited permission to copy and/or distribute it,
|
||||
# with or without modifications, as long as this notice is preserved.
|
||||
|
|
@ -122,7 +122,7 @@ DIST_COMMON = Makefile.am Makefile.in
|
|||
|
||||
DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
|
||||
|
||||
TAR = gtar
|
||||
TAR = tar
|
||||
GZIP_ENV = --best
|
||||
DEP_FILES = .deps/bigfix.P .deps/color.P .deps/debug.P .deps/filetype.P \
|
||||
.deps/unixtimer.P .deps/util.P
|
||||
|
|
|
|||
|
|
@ -13,7 +13,7 @@
|
|||
#include <stdio.h>
|
||||
#include <cstdarg>
|
||||
|
||||
|
||||
#ifdef DEBUG
|
||||
void DebugPrint(char *format, ...)
|
||||
{
|
||||
va_list args;
|
||||
|
|
@ -30,7 +30,7 @@ void DebugPrint(char *format, ...)
|
|||
|
||||
va_end(args);
|
||||
}
|
||||
|
||||
#endif /* DEBUG */
|
||||
|
||||
void Log(char *format, ...)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -15,9 +15,10 @@
|
|||
#ifdef __GNUC__
|
||||
|
||||
#ifndef DEBUG
|
||||
#define DPRINTF(fmt, args...)
|
||||
#define DPRINTF(args...)
|
||||
#else
|
||||
#define DPRINTF(fmt, args...) DebugPrint(fmt, args)
|
||||
#define DPRINTF(args...) DebugPrint(args)
|
||||
extern void DebugPrint(char *format, ...);
|
||||
#endif
|
||||
|
||||
#else
|
||||
|
|
|
|||
|
|
@ -13,7 +13,7 @@
|
|||
#include <stdio.h>
|
||||
#include <cstdarg>
|
||||
|
||||
|
||||
#ifdef DEBUG
|
||||
void DebugPrint(char *format, ...)
|
||||
{
|
||||
va_list args;
|
||||
|
|
@ -29,7 +29,7 @@ void DebugPrint(char *format, ...)
|
|||
|
||||
va_end(args);
|
||||
}
|
||||
|
||||
#endif
|
||||
|
||||
void Log(char *format, ...)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -247,7 +247,7 @@ bool Renderer::init(int winWidth, int winHeight)
|
|||
InitExtMultiTexture();
|
||||
if (ExtensionSupported("GL_NV_register_combiners"))
|
||||
InitExtRegisterCombiners();
|
||||
if (ExtensionSupported("GL_NV_vertex_program"))
|
||||
if (ExtensionSupported("GL_NV_vertex_program") && glGenProgramsNV)
|
||||
InitExtVertexProgram();
|
||||
if (ExtensionSupported("GL_EXT_texture_cube_map"))
|
||||
{
|
||||
|
|
@ -316,7 +316,7 @@ bool Renderer::init(int winWidth, int winHeight)
|
|||
DPRINTF("Renderer: nVidia register combiners supported.\n");
|
||||
useRegisterCombiners = true;
|
||||
}
|
||||
if (ExtensionSupported("GL_NV_vertex_program"))
|
||||
if (ExtensionSupported("GL_NV_vertex_program") && glGenProgramsNV)
|
||||
{
|
||||
DPRINTF("Renderer: nVidia vertex programs supported.\n");
|
||||
useVertexPrograms = vp::init();
|
||||
|
|
|
|||
Loading…
Reference in New Issue