qf
/
quakeforge-old
mirror of https://git.code.sf.net/p/quake/quakeforge-old
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Moved config.h.in to common/, updated Makefile.in's so configure works 

from any dir, and removed a couple of autoconf errors when extensions that
aren't required happen to be unavailable.
This commit is contained in:
Joseph Carter 1999-12-31 06:54:05 +00:00
parent 8d017e3875
commit 94dae8608e
6 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
common/common_quakedef.h
View File

@ -21,7 +21,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#define QUAKE_GAME // as opposed to utilities
#include <config/config.h>
#include <config.h> // generated from config.h.in
#include <math.h>
#include <string.h>

0
common/config/config.h.in → common/config.h.in
View File

4
configure.in
View File

@ -1,5 +1,6 @@
dnl Process this file with autoconf to produce a configure script.
AC_INIT(common/crc.h)
AC_CONFIG_HEADER(common/config.h)
AC_CANONICAL_SYSTEM
AC_LANG_C
@ -132,7 +133,6 @@ if test "x$HAS_OGL_INC" != x; then
AC_DEFINE(HAVE_GL_COLOR_INDEX8_EXT, 1)
else
AC_MSG_RESULT(no)
AC_MSG_ERROR(Error, HAVE_GL_COLOR_INDEX8_EXT not found.)
fi
AC_MSG_CHECKING(for GLAPIENTRY)
@ -155,7 +155,6 @@ if test "x$HAS_OGL_INC" != x; then
AC_DEFINE(GLAPIENTRY_IS_APIENTRY, 1)
else
AC_MSG_RESULT(no)
AC_MSG_ERROR(Error, neither GLAPIENTRY nor APIENTRY are defined)
fi
fi
@ -392,6 +391,5 @@ AC_PATH_XTRA
#
# Output files
#
AC_CONFIG_HEADER(common/config/config.h)
AC_OUTPUT(qw_client/Makefile qw_server/Makefile uquake/Makefile Makefile)

5
qw_client/Makefile.in
View File

@ -9,7 +9,7 @@ QW_COMMON_DIR= $(PROJECT_DIR)/qw_common
COMMON_DIR=$(PROJECT_DIR)/common
BIN_PREFIX = qw-client
BUILD_DIR = $(PROJECT_DIR)/targets/qw_client
BUILD_DIR = ../targets/qw_client
LDFLAGS = @LDFLAGS@ @SND_LIBS@
LIBS = @LIBS@
@ -186,7 +186,8 @@ CL_COMMON_SRC = $(MISC_SRC) $(CL_GUI_SRC) $(CL_SRC) \
# Directory specific stuff
#
DEFS = @DEFS@ @STRICMP_DEF@
CFLAGS = -Wall -DQUAKEWORLD $(OPTFLAGS) $(DEFS) -I. $(SRC_DIR_INC) -I$(QW_COMMON_DIR) -I$(COMMON_DIR)
CFLAGS = -Wall -DQUAKEWORLD $(OPTFLAGS) $(DEFS) -I. $(SRC_DIR_INC) \
-I$(QW_COMMON_DIR) -I$(COMMON_DIR) -I../common
ALL_X11_SRC = $(GENERAL_SRC) $(SW_REND_SRC) $(QW_X11_VID_SRC) model.c
ALL_GL_SRC = $(GENERAL_SRC) $(GL_REND_SRC) $(GL_VID_SRC) $(QW_GL_REND_SRC)
ALL_TDFX_SRC = $(GENERAL_SRC) $(GL_REND_SRC) $(TDFX_VID_SRC) $(QW_GL_REND_SRC)

5
qw_server/Makefile.in
View File

@ -8,7 +8,7 @@ SRC_DIR = @srcdir@
COMMON_DIR=$(PROJECT_DIR)/common
QW_COMMON_DIR= $(PROJECT_DIR)/qw_common
BUILD_DIR = $(PROJECT_DIR)/targets/qw_server
BUILD_DIR = ../targets/qw_server
LDFLAGS = @LDFLAGS@
LIBS = @LIBS@
@ -64,7 +64,8 @@ QW_GENERAL_SRC = pmove.c pmovetst.c
#
# Directory specific stuff
#
CFLAGS = -DQUAKEWORLD -DSERVERONLY $(OPTFLAGS) $(DEFS) -I. $(SRC_DIR_INC) -I$(QW_COMMON_DIR) -I$(COMMON_DIR)
CFLAGS = -DQUAKEWORLD -DSERVERONLY $(OPTFLAGS) $(DEFS) -I. $(SRC_DIR_INC) \
-I$(QW_COMMON_DIR) -I$(COMMON_DIR) -I../common
DEFS = @DEFS@ @STRICMP_DEF@
SRVQUAKE = qw-server

5
uquake/Makefile.in
View File

@ -8,7 +8,7 @@ SRC_DIR = @srcdir@
BIN_PREFIX = quake
COMMON_DIR=$(PROJECT_DIR)/common
BUILD_DIR = $(PROJECT_DIR)/targets/uquake
BUILD_DIR =../targets/uquake
LDFLAGS = @LDFLAGS@ @SND_LIBS@
LIBS = @LIBS@
@ -174,7 +174,8 @@ CL_COMMON_SRC = $(MISC_SRC) $(CL_GUI_SRC) $(CL_SRC) \
# Directory specific stuff
#
DEFS = @DEFS@
CFLAGS = $(OPTFLAGS) $(DEFS) -I. $(SRC_DIR_INC) -I$(COMMON_DIR) -I$(SRC_DIR)/include
CFLAGS = $(OPTFLAGS) $(DEFS) -I. $(SRC_DIR_INC) -I$(COMMON_DIR) \
-I../common -I$(SRC_DIR)/include
ALL_X11_SRC = $(GENERAL_SRC) $(SW_REND_SRC) $(X11_VID_SRC) model.c
ALL_GL_SRC = $(GENERAL_SRC) $(GL_REND_SRC) $(GL_VID_SRC)
ALL_TDFX_SRC = $(GENERAL_SRC) $(GL_REND_SRC) $(TDFX_VID_SRC)