mirror of
https://git.code.sf.net/p/quake/quakeforge
synced 2024-11-22 04:21:51 +00:00
Working on one common configure which lets nq and qw compile.
There, needs a little clean up though.
This commit is contained in:
Zephaniah E. Hull
parent
c2cf8ff5e7
commit
75618f96c9
12 changed files with 1962 additions and 46 deletions
9
.gitignore
vendored
9
.gitignore
vendored
|
|
@ -1 +1,10 @@
|
|||
ChangeLog
|
||||
Makefile
|
||||
Makefile.in
|
||||
aclocal.m4
|
||||
build-stamp
|
||||
config.cache
|
||||
config.log
|
||||
config.status
|
||||
configure
|
||||
configure-stamp
|
||||
|
|
|
|||
15
Makefile.am
Normal file
15
Makefile.am
Normal file
|
|
@ -0,0 +1,15 @@
|
|||
## Process this file with automake to produce Makefile.in
|
||||
AUTOMAKE_OPTIONS= foreign
|
||||
|
||||
SUBDIRS= qw nq
|
||||
|
||||
EXTRA_DIST= ChangeLog RPM/build_rpm.in \
|
||||
tools/gas2masm/Makefile tools/gas2masm/gas2masm.c \
|
||||
tools/gas2masm/gas2masm.dsp tools/gas2masm/gas2masm.dsw \
|
||||
tools/gas2masm/gas2masm.mak tools/gas2masm/gas2masm.mdp \
|
||||
tools/zpak
|
||||
|
||||
changelog::
|
||||
-touch ChangeLog
|
||||
-tools/cvs2cl/cvs2cl.pl -b --utc
|
||||
-rm -f ChangeLog.bak
|
||||
131
acconfig.h
Normal file
131
acconfig.h
Normal file
|
|
@ -0,0 +1,131 @@
|
|||
/*
|
||||
Compiler/Machine-Specific Configuration
|
||||
*/
|
||||
#ifndef __config_h_
|
||||
#define __config_h_
|
||||
@TOP@
|
||||
/* "Proper" package name */
|
||||
#undef PROGRAM
|
||||
|
||||
/* Define this to the QuakeWorld standard version you support */
|
||||
#undef QW_VERSION
|
||||
|
||||
/* Define this to the NetQuake standard version you support */
|
||||
#undef NQ_VERSION
|
||||
|
||||
/* Define this to the QSG standard version you support */
|
||||
#undef QSG_VERSION
|
||||
|
||||
/* Define if you want to use QF-style defaults instead of Id-style */
|
||||
#undef NEWSTYLE
|
||||
|
||||
/* Define this to the location of the global config file */
|
||||
#undef FS_GLOBALCFG
|
||||
|
||||
/* Define this to the location of the user config file */
|
||||
#undef FS_USERCFG
|
||||
|
||||
/* Define this to the shared game directory root */
|
||||
#undef FS_SHAREPATH
|
||||
|
||||
/* Define this to the unshared game directory root */
|
||||
#undef FS_USERPATH
|
||||
|
||||
/* Define this to the base game for the engine to load */
|
||||
#undef BASEGAME
|
||||
|
||||
/* Define this to the base directory for the client to download skins to */
|
||||
#undef SKINBASE
|
||||
|
||||
/* Define this to use experimental code */
|
||||
#undef _EXPERIMENTAL_
|
||||
|
||||
/* Define this if you want to use Intel assembly optimizations */
|
||||
#undef USE_INTEL_ASM
|
||||
|
||||
/* Define this if you have a Linux-style CD-ROM API */
|
||||
#undef USE_LINUX_CD
|
||||
|
||||
/* Define this if you have a BSD-style CD-ROM API */
|
||||
#undef USE_BSD_CD
|
||||
|
||||
/* Define if you have the XFree86 DGA extension */
|
||||
#undef HAVE_DGA
|
||||
|
||||
/* Define if you have the XFree86 VIDMODE extension */
|
||||
#undef HAVE_VIDMODE
|
||||
|
||||
/* Define this if you have GLX */
|
||||
#undef HAVE_GLX
|
||||
|
||||
/* Define this if you have Glide */
|
||||
#undef HAVE_GLIDE
|
||||
|
||||
/* Define this if you have GL_COLOR_INDEX8_EXT in GL/gl.h */
|
||||
#undef HAVE_GL_COLOR_INDEX8_EXT
|
||||
|
||||
/* Define this if you want IPv6 support */
|
||||
#undef HAVE_IPV6
|
||||
|
||||
/* Define this if C symbols are prefixed with an underscore */
|
||||
#undef HAVE_SYM_PREFIX_UNDERSCORE
|
||||
|
||||
/* Define this if your system has socklen_t */
|
||||
#undef HAVE_SOCKLEN_T
|
||||
|
||||
/* Define this if your system has size_t */
|
||||
#undef HAVE_SIZE_T
|
||||
|
||||
/* Define this if you have ss_len member in struct sockaddr_storage (BSD) */
|
||||
#undef HAVE_SS_LEN
|
||||
|
||||
/* Define this if you have sin6_len member in struct sockaddr_in6 (BSD) */
|
||||
#undef HAVE_SIN6_LEN
|
||||
|
||||
/* Define this if you have sa_len member in struct sockaddr (BSD) */
|
||||
#undef HAVE_SA_LEN
|
||||
|
||||
/* Define if you have the dlopen function. */
|
||||
#undef HAVE_DLOPEN
|
||||
|
||||
/* Define if you have zlib */
|
||||
#undef HAVE_ZLIB
|
||||
|
||||
/* Define if you have pthread support. */
|
||||
#undef HAVE_LIBPTHREAD
|
||||
|
||||
/* Define this to something sane if you don't have stricmp */
|
||||
#undef stricmp
|
||||
|
||||
/* If your version of OpenGL uses APIENTRY, define GLAPIENTRY to be APIENTRY */
|
||||
#undef GLAPIENTRY
|
||||
|
||||
/* Define this to something sane if you don't have stricmp */
|
||||
#undef stricmp
|
||||
|
||||
/* Define this if fnmatch is prototyped in fnmatch.h */
|
||||
#undef HAVE_FNMATCH_PROTO
|
||||
|
||||
/* Define this to something appropriate for declaring 0 length arrays */
|
||||
#undef ZERO_LENGTH_ARRAY
|
||||
|
||||
/* Define this if you want to have packet logging */
|
||||
#undef PACKET_LOGGING
|
||||
|
||||
/* Define this if you have fnmatch.h */
|
||||
#undef HAVE_FNMATCH_H
|
||||
|
||||
/* Define this if you have FB_AUX_VGA_PLANES_VGA4 */
|
||||
#undef HAVE_FB_AUX_VGA_PLANES_VGA4
|
||||
|
||||
/* Define this if you have FB_AUX_VGA_PLANES_VGA4 */
|
||||
#undef HAVE_FB_AUX_VGA_PLANES_CFB4
|
||||
|
||||
/* Define this if you have FB_AUX_VGA_PLANES_VGA4 */
|
||||
#undef HAVE_FB_AUX_VGA_PLANES_CFB8
|
||||
|
||||
/* Define this if FPOS_T is a struct */
|
||||
#undef HAVE_FPOS_T_STRUCT
|
||||
|
||||
@BOTTOM@
|
||||
#endif // __config_h_
|
||||
290
acinclude.m4
Normal file
290
acinclude.m4
Normal file
|
|
@ -0,0 +1,290 @@
|
|||
dnl check for fields in a structure
|
||||
dnl
|
||||
dnl AC_HAVE_STRUCT_FIELD(struct, field, headers)
|
||||
|
||||
AC_DEFUN(AC_HAVE_STRUCT_FIELD, [
|
||||
define(cache_val, translit(ac_cv_type_$1_$2, [A-Z ], [a-z_]))
|
||||
AC_CACHE_CHECK([for $2 in $1], cache_val,[
|
||||
AC_TRY_COMPILE([$3],[$1 x; x.$2;],
|
||||
cache_val=yes,
|
||||
cache_val=no)])
|
||||
if test "$cache_val" = yes; then
|
||||
define(foo, translit(HAVE_$1_$2, [a-z ], [A-Z_]))
|
||||
AC_DEFINE(foo, 1, [Define if $1 has field $2.])
|
||||
undefine(foo)
|
||||
fi
|
||||
undefine(cache_val)
|
||||
])
|
||||
# Configure paths for SDL
|
||||
# Sam Lantinga 9/21/99
|
||||
# stolen from Manish Singh
|
||||
# stolen back from Frank Belew
|
||||
# stolen from Manish Singh
|
||||
# Shamelessly stolen from Owen Taylor
|
||||
|
||||
dnl AM_PATH_SDL([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]])
|
||||
dnl Test for SDL, and define SDL_CFLAGS and SDL_LIBS
|
||||
dnl
|
||||
AC_DEFUN(AM_PATH_SDL,
|
||||
[dnl
|
||||
dnl Get the cflags and libraries from the sdl-config script
|
||||
dnl
|
||||
AC_ARG_WITH(sdl-prefix,[ --with-sdl-prefix=PFX Prefix where SDL is installed (optional)],
|
||||
sdl_prefix="$withval", sdl_prefix="")
|
||||
AC_ARG_WITH(sdl-exec-prefix,[ --with-sdl-exec-prefix=PFX Exec prefix where SDL is installed (optional)],
|
||||
sdl_exec_prefix="$withval", sdl_exec_prefix="")
|
||||
AC_ARG_ENABLE(sdltest, [ --disable-sdltest Do not try to compile and run a test SDL program],
|
||||
, enable_sdltest=yes)
|
||||
|
||||
if test x$sdl_exec_prefix != x ; then
|
||||
sdl_args="$sdl_args --exec-prefix=$sdl_exec_prefix"
|
||||
if test x${SDL_CONFIG+set} != xset ; then
|
||||
SDL_CONFIG=$sdl_exec_prefix/bin/sdl-config
|
||||
fi
|
||||
fi
|
||||
if test x$sdl_prefix != x ; then
|
||||
sdl_args="$sdl_args --prefix=$sdl_prefix"
|
||||
if test x${SDL_CONFIG+set} != xset ; then
|
||||
SDL_CONFIG=$sdl_prefix/bin/sdl-config
|
||||
fi
|
||||
fi
|
||||
|
||||
AC_PATH_PROG(SDL_CONFIG, sdl-config, no)
|
||||
min_sdl_version=ifelse([$1], ,0.11.0,$1)
|
||||
AC_MSG_CHECKING(for SDL - version >= $min_sdl_version)
|
||||
no_sdl=""
|
||||
if test "$SDL_CONFIG" = "no" ; then
|
||||
no_sdl=yes
|
||||
else
|
||||
SDL_CFLAGS=`$SDL_CONFIG $sdlconf_args --cflags`
|
||||
SDL_LIBS=`$SDL_CONFIG $sdlconf_args --libs`
|
||||
|
||||
sdl_major_version=`$SDL_CONFIG $sdl_args --version | \
|
||||
sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
|
||||
sdl_minor_version=`$SDL_CONFIG $sdl_args --version | \
|
||||
sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
|
||||
sdl_micro_version=`$SDL_CONFIG $sdl_config_args --version | \
|
||||
sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
|
||||
if test "x$enable_sdltest" = "xyes" ; then
|
||||
ac_save_CFLAGS="$CFLAGS"
|
||||
ac_save_LIBS="$LIBS"
|
||||
CFLAGS="$CFLAGS $SDL_CFLAGS"
|
||||
LIBS="$LIBS $SDL_LIBS"
|
||||
dnl
|
||||
dnl Now check if the installed SDL is sufficiently new. (Also sanity
|
||||
dnl checks the results of sdl-config to some extent
|
||||
dnl
|
||||
rm -f conf.sdltest
|
||||
AC_TRY_RUN([
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
#include <SDL.h>
|
||||
|
||||
char*
|
||||
my_strdup (char *str)
|
||||
{
|
||||
char *new_str;
|
||||
|
||||
if (str)
|
||||
{
|
||||
new_str = malloc ((strlen (str) + 1) * sizeof(char));
|
||||
strcpy (new_str, str);
|
||||
}
|
||||
else
|
||||
new_str = NULL;
|
||||
|
||||
return new_str;
|
||||
}
|
||||
|
||||
int main (int argc, char *argv[])
|
||||
{
|
||||
int major, minor, micro;
|
||||
char *tmp_version;
|
||||
|
||||
/* This hangs on some systems (?)
|
||||
system ("touch conf.sdltest");
|
||||
*/
|
||||
{ FILE *fp = fopen("conf.sdltest", "a"); if ( fp ) fclose(fp); }
|
||||
|
||||
/* HP/UX 9 (%@#!) writes to sscanf strings */
|
||||
tmp_version = my_strdup("$min_sdl_version");
|
||||
if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, µ) != 3) {
|
||||
printf("%s, bad version string\n", "$min_sdl_version");
|
||||
exit(1);
|
||||
}
|
||||
|
||||
if (($sdl_major_version > major) ||
|
||||
(($sdl_major_version == major) && ($sdl_minor_version > minor)) ||
|
||||
(($sdl_major_version == major) && ($sdl_minor_version == minor) && ($sdl_micro_version >= micro)))
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
else
|
||||
{
|
||||
printf("\n*** 'sdl-config --version' returned %d.%d.%d, but the minimum version\n", $sdl_major_version, $sdl_minor_version, $sdl_micro_version);
|
||||
printf("*** of SDL required is %d.%d.%d. If sdl-config is correct, then it is\n", major, minor, micro);
|
||||
printf("*** best to upgrade to the required version.\n");
|
||||
printf("*** If sdl-config was wrong, set the environment variable SDL_CONFIG\n");
|
||||
printf("*** to point to the correct copy of sdl-config, and remove the file\n");
|
||||
printf("*** config.cache before re-running configure\n");
|
||||
return 1;
|
||||
}
|
||||
}
|
||||
|
||||
],, no_sdl=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"])
|
||||
CFLAGS="$ac_save_CFLAGS"
|
||||
LIBS="$ac_save_LIBS"
|
||||
fi
|
||||
fi
|
||||
if test "x$no_sdl" = x ; then
|
||||
AC_MSG_RESULT(yes)
|
||||
ifelse([$2], , :, [$2])
|
||||
else
|
||||
AC_MSG_RESULT(no)
|
||||
if test "$SDL_CONFIG" = "no" ; then
|
||||
echo "*** The sdl-config script installed by SDL could not be found"
|
||||
echo "*** If SDL was installed in PREFIX, make sure PREFIX/bin is in"
|
||||
echo "*** your path, or set the SDL_CONFIG environment variable to the"
|
||||
echo "*** full path to sdl-config."
|
||||
else
|
||||
if test -f conf.sdltest ; then
|
||||
:
|
||||
else
|
||||
echo "*** Could not run SDL test program, checking why..."
|
||||
CFLAGS="$CFLAGS $SDL_CFLAGS"
|
||||
LIBS="$LIBS $SDL_LIBS"
|
||||
AC_TRY_LINK([
|
||||
#include <stdio.h>
|
||||
#include <SDL.h>
|
||||
], [ return 0; ],
|
||||
[ echo "*** The test program compiled, but did not run. This usually means"
|
||||
echo "*** that the run-time linker is not finding SDL or finding the wrong"
|
||||
echo "*** version of SDL. If it is not finding SDL, you'll need to set your"
|
||||
echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point"
|
||||
echo "*** to the installed location Also, make sure you have run ldconfig if that"
|
||||
echo "*** is required on your system"
|
||||
echo "***"
|
||||
echo "*** If you have an old version installed, it is best to remove it, although"
|
||||
echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH"],
|
||||
[ echo "*** The test program failed to compile or link. See the file config.log for the"
|
||||
echo "*** exact error that occured. This usually means SDL was incorrectly installed"
|
||||
echo "*** or that you have moved SDL since it was installed. In the latter case, you"
|
||||
echo "*** may want to edit the sdl-config script: $SDL_CONFIG" ])
|
||||
CFLAGS="$ac_save_CFLAGS"
|
||||
LIBS="$ac_save_LIBS"
|
||||
fi
|
||||
fi
|
||||
SDL_CFLAGS=""
|
||||
SDL_LIBS=""
|
||||
ifelse([$3], , :, [$3])
|
||||
fi
|
||||
AC_SUBST(SDL_CFLAGS)
|
||||
AC_SUBST(SDL_LIBS)
|
||||
rm -f conf.sdltest
|
||||
])
|
||||
|
||||
# Configure paths for SDL-GL
|
||||
# Jeff Teunissen 11 Aug 2000
|
||||
# stolen from Sam Lantinga
|
||||
# stolen from Manish Singh
|
||||
# stolen back from Frank Belew
|
||||
# stolen from Manish Singh
|
||||
# Shamelessly stolen from Owen Taylor
|
||||
|
||||
dnl AM_CHECK_SGL([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]])
|
||||
dnl Test for SDL 1.1.x, do _not_ redefine any variables.
|
||||
dnl ***MUST*** be run _after_ checking for SDL 1.0x, if used.
|
||||
dnl
|
||||
AC_DEFUN(AM_CHECK_SGL,
|
||||
[dnl
|
||||
dnl Get the cflags and libraries from the sdl-config script
|
||||
dnl
|
||||
min_sdl_version=ifelse([$1], ,1.1.0,$1)
|
||||
AC_MSG_CHECKING(whether SDL is version >= $min_sdl_version)
|
||||
no_sgl=""
|
||||
if test "$SDL_CONFIG" = "no" ; then
|
||||
no_sgl=yes
|
||||
else
|
||||
SGL_CFLAGS=`$SDL_CONFIG $sdlconf_args --cflags`
|
||||
SGL_LIBS=`$SDL_CONFIG $sdlconf_args --libs`
|
||||
|
||||
sdl_major_version=`$SDL_CONFIG $sdl_args --version | \
|
||||
sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
|
||||
sdl_minor_version=`$SDL_CONFIG $sdl_args --version | \
|
||||
sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
|
||||
sdl_micro_version=`$SDL_CONFIG $sdl_config_args --version | \
|
||||
sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
|
||||
ac_save_CFLAGS="$CFLAGS"
|
||||
ac_save_LIBS="$LIBS"
|
||||
CFLAGS="$CFLAGS $SGL_CFLAGS"
|
||||
LIBS="$LIBS $SGL_LIBS"
|
||||
dnl
|
||||
dnl Do nothing more than check if the installed SDL is sufficiently new, since
|
||||
dnl we already did that in the SDL detection
|
||||
dnl
|
||||
AC_TRY_RUN([
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
#include <SDL.h>
|
||||
|
||||
char*
|
||||
my_strdup (char *str)
|
||||
{
|
||||
char *new_str;
|
||||
|
||||
if (str) {
|
||||
new_str = malloc ((strlen (str) + 1) * sizeof(char));
|
||||
strcpy (new_str, str);
|
||||
} else {
|
||||
new_str = NULL;
|
||||
}
|
||||
|
||||
return new_str;
|
||||
}
|
||||
|
||||
int
|
||||
main (int argc, char *argv[])
|
||||
{
|
||||
int major, minor, micro;
|
||||
char *tmp_version;
|
||||
|
||||
/* HP/UX 9 (%@#!) writes to sscanf strings */
|
||||
tmp_version = my_strdup("$min_sdl_version");
|
||||
if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, µ) != 3) {
|
||||
printf("%s, bad version string\n", "$min_sdl_version");
|
||||
exit(1);
|
||||
}
|
||||
|
||||
if (($sdl_major_version > major) ||
|
||||
(($sdl_major_version == major) && ($sdl_minor_version > minor)) ||
|
||||
(($sdl_major_version == major) && ($sdl_minor_version == minor) &&
|
||||
($sdl_micro_version >= micro))) {
|
||||
return 0;
|
||||
} else {
|
||||
return 1;
|
||||
}
|
||||
}
|
||||
|
||||
],, no_sgl=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"])
|
||||
CFLAGS="$ac_save_CFLAGS"
|
||||
LIBS="$ac_save_LIBS"
|
||||
fi
|
||||
if test "x$no_sgl" = x; then
|
||||
AC_MSG_RESULT(yes)
|
||||
ifelse([$2], , :, [$2])
|
||||
else
|
||||
AC_MSG_RESULT(no)
|
||||
ifelse([$3], , :, [$3])
|
||||
fi
|
||||
])
|
||||
|
||||
dnl AM_PROG_LEX
|
||||
dnl Look for flex, lex or missing, then run AC_PROG_LEX and AC_DECL_YYTEXT
|
||||
AC_DEFUN(AM_PROG_LEX,
|
||||
[missing_dir=ifelse([$1],,`cd $ac_aux_dir && pwd`,$1)
|
||||
AC_CHECK_PROGS(LEX, flex lex, $missing_dir/missing flex)
|
||||
AC_PROG_LEX
|
||||
AC_DECL_YYTEXT
|
||||
])
|
||||
2
bootstrap
Executable file
2
bootstrap
Executable file
|
|
@ -0,0 +1,2 @@
|
|||
#!/bin/sh
|
||||
aclocal && autoheader && automake --add-missing && autoconf
|
||||
1469
configure.in
Normal file
1469
configure.in
Normal file
File diff suppressed because it is too large
Load diff
|
|
@ -1,7 +1,7 @@
|
|||
## Process this file with automake to produce Makefile.in
|
||||
AUTOMAKE_OPTIONS = foreign
|
||||
|
||||
SUBDIRS = include source doc RPM
|
||||
SUBDIRS = include source
|
||||
|
||||
EXTRA_DIST = tools/gas2masm/Makefile tools/gas2masm/gas2masm.c \
|
||||
tools/gas2masm/gas2masm.dsp tools/gas2masm/gas2masm.dsw \
|
||||
|
|
|
|||
|
|
@ -28,10 +28,10 @@
|
|||
#define _VERSION_H
|
||||
|
||||
/* Version strings */
|
||||
#define PACKAGE "nuq"
|
||||
#define PROGRAM "QuakeForge: nuq"
|
||||
#define VERSION "0.2.99alpha0"
|
||||
#define QSG_VERSION "1.0"
|
||||
#define QUAKE_VERSION "1.09"
|
||||
#define PACKAGE "quakeforge"
|
||||
#define PROGRAM "QuakeForge"
|
||||
#define VERSION "0.3.0"
|
||||
#define QSG_VERSION ""
|
||||
#define QUAKE_VERSION "@QUAKE_VERSION@"
|
||||
|
||||
#endif // _VERSION_H
|
||||
|
|
|
|||
|
|
@ -30,12 +30,12 @@
|
|||
#
|
||||
# Stuff that is common to both client and server
|
||||
#
|
||||
INCLUDES= -I$(top_srcdir)/include $(GGI_CFLAGS) $(MGL_CFLAGS) $(SDL_CFLAGS) $(SVGA_CFLAGS) $(X_CFLAGS) $(GLX_CFLAGS) $(TDFXGL_CFLAGS)
|
||||
INCLUDES= -I$(top_srcdir)/include -I$(top_srcdir)/nq/include $(GGI_CFLAGS) $(MGL_CFLAGS) $(SDL_CFLAGS) $(SVGA_CFLAGS) $(X_CFLAGS) $(GLX_CFLAGS) $(TDFXGL_CFLAGS)
|
||||
|
||||
bin_PROGRAMS = @TARGETS@
|
||||
bin_PROGRAMS = @NQ_TARGETS@
|
||||
|
||||
EXTRA_PROGRAMS= nuq-ggi nuq-mgl nuq-sdl nuq-svga nuq-x11 \
|
||||
nuq-3dfx nuq-glx nuq-sgl nuq-wgl nuq-ded
|
||||
EXTRA_PROGRAMS= nq-ggi nq-mgl nq-sdl nq-svga nq-x11 \
|
||||
nq-3dfx nq-glx nq-sgl nq-wgl nq-ded
|
||||
|
||||
noinst_LIBRARIES= libqfsys.a libqfsnd.a libqfcd.a libqfjs.a libqfnet.a
|
||||
|
||||
|
|
@ -127,7 +127,7 @@ libqfnet_a_SOURCES= mdfour.c net_bsd.c checksum.c net_dgrm.c net_loop.c \
|
|||
EXTRA_libqfcd_a_SOURCES=net_dos.c net_bw.c net_ipx.c net_mp.c net_ser.c \
|
||||
net_win.c net_wins.c net_wipx.c
|
||||
|
||||
client_LIBS= -L. -lqfsys -lqfsnd -lqfcd -lqfjs -lqfnet $(SOUND_LIBS) $(NET_LIBS)
|
||||
client_LIBS= -L. -lqfsys -lqfsnd -lqfcd -lqfjs -lqfnet $(SOUND_LIBS) $(NET_LIBS) $(Z_LIBS)
|
||||
|
||||
client_SOURCES= cl_cam.c cl_demo.c cl_input.c cl_main.c cl_parse.c \
|
||||
cl_tent.c console.c keys.c menu.c sbar.c r_part.c r_view.c \
|
||||
|
|
@ -158,45 +158,45 @@ soft_SOURCES= d_edge.c d_fill.c d_init.c d_modech.c d_part.c d_polyse.c \
|
|||
#
|
||||
ggi_SOURCES= vid_ggi.c
|
||||
|
||||
nuq_ggi_SOURCES= $(combined_SOURCES) $(soft_SOURCES) $(ggi_SOURCES)
|
||||
nuq_ggi_LDADD= $(client_LIBS) $(GGI_LIBS)
|
||||
nuq_ggi_DEPENDENCIES=libqfsys.a libqfsnd.a libqfcd.a libqfjs.a libqfnet.a
|
||||
nq_ggi_SOURCES= $(combined_SOURCES) $(soft_SOURCES) $(ggi_SOURCES)
|
||||
nq_ggi_LDADD= $(client_LIBS) $(GGI_LIBS)
|
||||
nq_ggi_DEPENDENCIES=libqfsys.a libqfsnd.a libqfcd.a libqfjs.a libqfnet.a
|
||||
|
||||
#
|
||||
# ... SciTech MGL
|
||||
#
|
||||
mgl_SOURCES= vid_mgl.c in_win.c
|
||||
|
||||
nuq_mgl_SOURCES= $(combined_SOURCES) $(soft_SOURCES) $(mgl_SOURCES)
|
||||
nuq_mgl_LDADD= $(client_LIBS) $(MGL_LIBS)
|
||||
nuq_mgl_DEPENDENCIES=libqfsys.a libqfsnd.a libqfcd.a libqfjs.a libqfnet.a
|
||||
nq_mgl_SOURCES= $(combined_SOURCES) $(soft_SOURCES) $(mgl_SOURCES)
|
||||
nq_mgl_LDADD= $(client_LIBS) $(MGL_LIBS)
|
||||
nq_mgl_DEPENDENCIES=libqfsys.a libqfsnd.a libqfcd.a libqfjs.a libqfnet.a
|
||||
|
||||
#
|
||||
# ... Sam Lantinga's Simple DirectMedia Layer, version 1.0 and higher
|
||||
#
|
||||
sdl_SOURCES= vid_sdl.c in_sdl.c
|
||||
|
||||
nuq_sdl_SOURCES= $(combined_SOURCES) $(soft_SOURCES) $(sdl_SOURCES)
|
||||
nuq_sdl_LDADD= $(client_LIBS) $(SDL_LIBS)
|
||||
nuq_sdl_DEPENDENCIES=libqfsys.a libqfsnd.a libqfcd.a libqfjs.a libqfnet.a
|
||||
nq_sdl_SOURCES= $(combined_SOURCES) $(soft_SOURCES) $(sdl_SOURCES)
|
||||
nq_sdl_LDADD= $(client_LIBS) $(SDL_LIBS)
|
||||
nq_sdl_DEPENDENCIES=libqfsys.a libqfsnd.a libqfcd.a libqfjs.a libqfnet.a
|
||||
|
||||
#
|
||||
# ... Linux SVGAlib
|
||||
#
|
||||
svga_SOURCES= d_copy.S vid_svgalib.c in_svgalib.c
|
||||
|
||||
nuq_svga_SOURCES= $(combined_SOURCES) $(soft_SOURCES) $(svga_SOURCES)
|
||||
nuq_svga_LDADD= $(client_LIBS) $(SVGA_LIBS)
|
||||
nuq_svga_DEPENDENCIES=libqfsys.a libqfsnd.a libqfcd.a libqfjs.a libqfnet.a
|
||||
nq_svga_SOURCES= $(combined_SOURCES) $(soft_SOURCES) $(svga_SOURCES)
|
||||
nq_svga_LDADD= $(client_LIBS) $(SVGA_LIBS)
|
||||
nq_svga_DEPENDENCIES=libqfsys.a libqfsnd.a libqfcd.a libqfjs.a libqfnet.a
|
||||
|
||||
#
|
||||
# ... X11
|
||||
#
|
||||
x11_SOURCES= in_x11.c context_x11.c dga_check.c
|
||||
|
||||
nuq_x11_SOURCES= $(combined_SOURCES) $(soft_SOURCES) $(x11_SOURCES) vid_x11.c
|
||||
nuq_x11_LDADD= $(client_LIBS) $(X_PRE_LIBS) $(VIDMODE_LIBS) $(DGA_LIBS) $(X_LIBS) -lX11 $(X_EXTRA_LIBS) $(X_SHM_LIB)
|
||||
nuq_x11_DEPENDENCIES=libqfsys.a libqfsnd.a libqfcd.a libqfjs.a libqfnet.a
|
||||
nq_x11_SOURCES= $(combined_SOURCES) $(soft_SOURCES) $(x11_SOURCES) vid_x11.c
|
||||
nq_x11_LDADD= $(client_LIBS) $(X_PRE_LIBS) $(VIDMODE_LIBS) $(DGA_LIBS) $(X_LIBS) -lX11 $(X_EXTRA_LIBS) $(X_SHM_LIB)
|
||||
nq_x11_DEPENDENCIES=libqfsys.a libqfsnd.a libqfcd.a libqfjs.a libqfnet.a
|
||||
|
||||
|
||||
#
|
||||
|
|
@ -214,48 +214,48 @@ ogl_SOURCES= gl_draw.c gl_mesh.c gl_part.c gl_refrag.c gl_rlight.c \
|
|||
#
|
||||
tdfx_SOURCES= vid_3dfxsvga.c vid_common_gl.c in_svgalib.c
|
||||
|
||||
nuq_3dfx_SOURCES= $(combined_SOURCES) $(ogl_SOURCES) $(tdfx_SOURCES)
|
||||
nuq_3dfx_LDADD= $(client_LIBS) $(TDFXGL_LIBS) $(SVGA_LIBS) $(DL_LIBS)
|
||||
nuq_3dfx_DEPENDENCIES=libqfsys.a libqfsnd.a libqfcd.a libqfjs.a libqfnet.a
|
||||
nq_3dfx_SOURCES= $(combined_SOURCES) $(ogl_SOURCES) $(tdfx_SOURCES)
|
||||
nq_3dfx_LDADD= $(client_LIBS) $(TDFXGL_LIBS) $(SVGA_LIBS) $(DL_LIBS)
|
||||
nq_3dfx_DEPENDENCIES=libqfsys.a libqfsnd.a libqfcd.a libqfjs.a libqfnet.a
|
||||
|
||||
#
|
||||
# ... OpenGL in X Window
|
||||
#
|
||||
glx_SOURCES= vid_glx.c vid_common_gl.c $(x11_SOURCES)
|
||||
|
||||
nuq_glx_SOURCES= $(combined_SOURCES) $(ogl_SOURCES) $(glx_SOURCES)
|
||||
nuq_glx_LDADD= $(client_LIBS) $(GLX_LIBS) $(X_PRE_LIBS) $(VIDMODE_LIBS) $(DGA_LIBS) $(X_LIBS) -lX11 $(X_EXTRA_LIBS) $(DL_LIBS)
|
||||
nuq_glx_DEPENDENCIES=libqfsys.a libqfsnd.a libqfcd.a libqfjs.a libqfnet.a
|
||||
nq_glx_SOURCES= $(combined_SOURCES) $(ogl_SOURCES) $(glx_SOURCES)
|
||||
nq_glx_LDADD= $(client_LIBS) $(GLX_LIBS) $(X_PRE_LIBS) $(VIDMODE_LIBS) $(DGA_LIBS) $(X_LIBS) -lX11 $(X_EXTRA_LIBS) $(DL_LIBS)
|
||||
nq_glx_DEPENDENCIES=libqfsys.a libqfsnd.a libqfcd.a libqfjs.a libqfnet.a
|
||||
|
||||
#
|
||||
# ... Sam Lantinga's Simple DirectMedia Layer, version 1.1 and higher, in GL mode
|
||||
#
|
||||
sgl_SOURCES= vid_sgl.c vid_common_gl.c in_sdl.c
|
||||
|
||||
nuq_sgl_SOURCES= $(combined_SOURCES) $(ogl_SOURCES) $(sgl_SOURCES)
|
||||
nuq_sgl_LDADD= $(client_LIBS) $(X_LIBS) $(SDL_LIBS) $(GLX_LIBS) $(DL_LIBS)
|
||||
nuq_sgl_DEPENDENCIES=libqfsys.a libqfsnd.a libqfcd.a libqfjs.a libqfnet.a
|
||||
nq_sgl_SOURCES= $(combined_SOURCES) $(ogl_SOURCES) $(sgl_SOURCES)
|
||||
nq_sgl_LDADD= $(client_LIBS) $(X_LIBS) $(SDL_LIBS) $(GLX_LIBS) $(DL_LIBS)
|
||||
nq_sgl_DEPENDENCIES=libqfsys.a libqfsnd.a libqfcd.a libqfjs.a libqfnet.a
|
||||
|
||||
#
|
||||
# SGI/Microsoft WGL (Windows OpenGL)
|
||||
#
|
||||
wgl_SOURCES= vid_wgl.c
|
||||
|
||||
nuq_wgl_SOURCES= $(combined_SOURCES) $(ogl_SOURCES) $(wgl_SOURCES)
|
||||
nuq_wgl_LDADD= $(client_LIBS)
|
||||
nuq_wgl_DEPENDENCIES=libqfsys.a libqfsnd.a libqfcd.a libqfjs.a libqfnet.a
|
||||
nq_wgl_SOURCES= $(combined_SOURCES) $(ogl_SOURCES) $(wgl_SOURCES)
|
||||
nq_wgl_LDADD= $(client_LIBS)
|
||||
nq_wgl_DEPENDENCIES=libqfsys.a libqfsnd.a libqfcd.a libqfjs.a libqfnet.a
|
||||
|
||||
#
|
||||
# dedicated server
|
||||
#
|
||||
ded_SOURCES=sys_unixd.c sv_ded.c
|
||||
|
||||
nuq_ded_SOURCES=$(common_SOURCES) $(server_SOURCES) $(ded_SOURCES)
|
||||
nuq_ded_LDADD= libqfnet.a
|
||||
nuq_ded_DEPENDENCIES=libqfnet.a
|
||||
nq_ded_SOURCES=$(common_SOURCES) $(server_SOURCES) $(ded_SOURCES)
|
||||
nq_ded_LDADD= libqfnet.a $(Z_LIBS)
|
||||
nq_ded_DEPENDENCIES=libqfnet.a
|
||||
|
||||
#
|
||||
# Stuff that doesn't get linked into an executable NEEDS to be mentioned here,
|
||||
# or it won't be distributed with 'make dist'
|
||||
#
|
||||
EXTRA_DIST= #nuq.dsp
|
||||
EXTRA_DIST= #nq.dsp
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
## Process this file with automake to produce Makefile.in
|
||||
AUTOMAKE_OPTIONS= foreign
|
||||
|
||||
SUBDIRS= include source debian doc
|
||||
SUBDIRS= include source
|
||||
|
||||
EXTRA_DIST= README.WIN newtree.dsw ChangeLog \
|
||||
RPM/build_rpm.in RPM/quakeforge.spec.in \
|
||||
|
|
|
|||
|
|
@ -32,6 +32,6 @@
|
|||
#define PROGRAM "QuakeForge"
|
||||
#define VERSION "0.3.0"
|
||||
#define QW_VERSION "2.40"
|
||||
#define QSG_VERSION "2.0"
|
||||
#define QSG_VERSION ""
|
||||
|
||||
#endif // _VERSION_H
|
||||
|
|
|
|||
|
|
@ -31,9 +31,9 @@ AUTOMAKE_OPTIONS= foreign
|
|||
#
|
||||
# Stuff that is common to both client and server
|
||||
#
|
||||
INCLUDES= -I$(top_srcdir)/include $(GGI_CFLAGS) $(MGL_CFLAGS) $(SDL_CFLAGS) $(SVGA_CFLAGS) $(X_CFLAGS) $(GLX_CFLAGS) $(TDFXGL_CFLAGS)
|
||||
INCLUDES= -I$(top_srcdir)/include -I$(top_srcdir)/qw/include $(GGI_CFLAGS) $(MGL_CFLAGS) $(SDL_CFLAGS) $(SVGA_CFLAGS) $(X_CFLAGS) $(GLX_CFLAGS) $(TDFXGL_CFLAGS)
|
||||
|
||||
bin_PROGRAMS = @TARGETS@
|
||||
bin_PROGRAMS = @QW_TARGETS@
|
||||
|
||||
EXTRA_PROGRAMS= qf-server \
|
||||
qf-client-3dfx qf-client-fbdev qf-client-ggi qf-client-glx \
|
||||
|
|
|
|||
Loading…
Reference in a new issue