qf/quakeforge
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/quakeforge synced 2024-11-29 23:52:22 +00:00
Code Issues Projects Releases Packages Wiki Activity

several libs can now get built as dlls in windows: console, gamecode,

Browse source 
gamecode_builtins, gib, image, modules, object, ruamoko and util.
This commit is contained in:
Bill Currie 2004-01-19 07:47:41 +00:00
parent fa6916cedd
commit 77b2942982
32 changed files with 130 additions and 180 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
configure.ac
View file

@ -279,6 +279,17 @@ AC_TRY_LINK(
) )
AM_CONDITIONAL(BUILD_FNMATCH, test "x$BUILD_FNMATCH" = "xyes") AM_CONDITIONAL(BUILD_FNMATCH, test "x$BUILD_FNMATCH" = "xyes")
AC_MSG_CHECKING(for getopt_long)
AC_TRY_LINK(
[],
[getopt_long();],
BUILD_GETOPT=no
AC_MSG_RESULT(yes),
BUILD_GETOPT=yes
AC_MSG_RESULT(no)
)
AM_CONDITIONAL(BUILD_GETOPT, test "x$BUILD_GETOPT" = "xyes")
AC_MSG_CHECKING(for alloca in stdlib.h) AC_MSG_CHECKING(for alloca in stdlib.h)
AC_TRY_COMPILE( AC_TRY_COMPILE(
[#include <stdlib.h>], [#include <stdlib.h>],
@ -1931,31 +1942,31 @@ for l in $SERVER_PLUGIN_STATIC; do
SERVER_PLUGIN_STATIC_LIBS="$SERVER_PLUGIN_STATIC_LIBS "'$(top_builddir)'"/libs/console/$l" SERVER_PLUGIN_STATIC_LIBS="$SERVER_PLUGIN_STATIC_LIBS "'$(top_builddir)'"/libs/console/$l"
n="`echo $l | sed -e 's/\(.*\)\.la/\1/'`" n="`echo $l | sed -e 's/\(.*\)\.la/\1/'`"
SERVER_PLUGIN_LIST='{"'"$n"'"'", ${n}_PluginInfo},$SERVER_PLUGIN_LIST" SERVER_PLUGIN_LIST='{"'"$n"'"'", ${n}_PluginInfo},$SERVER_PLUGIN_LIST"
SERVER_PLUGIN_PROTOS="$SERVER_PLUGIN_PROTOS extern QFPLUGIN plugin_t *${n}_PluginInfo (void);" SERVER_PLUGIN_PROTOS="$SERVER_PLUGIN_PROTOS extern plugin_t *${n}_PluginInfo (void);"
done done
for l in $CLIENT_PLUGIN_STATIC; do for l in $CLIENT_PLUGIN_STATIC; do
CLIENT_PLUGIN_STATIC_LIBS="$CLIENT_PLUGIN_STATIC_LIBS "'$(top_builddir)'"/libs/console/$l" CLIENT_PLUGIN_STATIC_LIBS="$CLIENT_PLUGIN_STATIC_LIBS "'$(top_builddir)'"/libs/console/$l"
n="`echo $l | sed -e 's/\(.*\)\.la/\1/'`" n="`echo $l | sed -e 's/\(.*\)\.la/\1/'`"
CLIENT_PLUGIN_LIST='{"'"$n"'"'", ${n}_PluginInfo},$CLIENT_PLUGIN_LIST" CLIENT_PLUGIN_LIST='{"'"$n"'"'", ${n}_PluginInfo},$CLIENT_PLUGIN_LIST"
CLIENT_PLUGIN_PROTOS="$CLIENT_PLUGIN_PROTOS extern QFPLUGIN plugin_t *${n}_PluginInfo (void);" CLIENT_PLUGIN_PROTOS="$CLIENT_PLUGIN_PROTOS extern plugin_t *${n}_PluginInfo (void);"
done done
for l in $CD_PLUGIN_STATIC; do for l in $CD_PLUGIN_STATIC; do
CD_PLUGIN_STATIC_LIBS="$CD_PLUGIN_STATIC_LIBS cd/$l" CD_PLUGIN_STATIC_LIBS="$CD_PLUGIN_STATIC_LIBS cd/$l"
n="`echo $l | sed -e 's/\(.*\)\.la/\1/'`" n="`echo $l | sed -e 's/\(.*\)\.la/\1/'`"
CD_PLUGIN_LIST='{"'"$n"'"'", ${n}_PluginInfo},$CD_PLUGIN_LIST" CD_PLUGIN_LIST='{"'"$n"'"'", ${n}_PluginInfo},$CD_PLUGIN_LIST"
CD_PLUGIN_PROTOS="$CD_PLUGIN_PROTOS extern QFPLUGIN plugin_t *${n}_PluginInfo (void);" CD_PLUGIN_PROTOS="$CD_PLUGIN_PROTOS extern plugin_t *${n}_PluginInfo (void);"
done done
for l in $SND_PLUGIN_STATIC; do for l in $SND_PLUGIN_STATIC; do
SND_PLUGIN_STATIC_LIBS="$SND_PLUGIN_STATIC_LIBS targets/$l" SND_PLUGIN_STATIC_LIBS="$SND_PLUGIN_STATIC_LIBS targets/$l"
n="`echo $l | sed -e 's/\(.*\)\.la/\1/'`" n="`echo $l | sed -e 's/\(.*\)\.la/\1/'`"
SND_OUTPUT_LIST='{"'"$n"'"'", ${n}_PluginInfo},$SND_OUTPUT_LIST" SND_OUTPUT_LIST='{"'"$n"'"'", ${n}_PluginInfo},$SND_OUTPUT_LIST"
SND_OUTPUT_PROTOS="$SND_OUTPUT_PROTOS extern QFPLUGIN plugin_t *${n}_PluginInfo (void);" SND_OUTPUT_PROTOS="$SND_OUTPUT_PROTOS extern plugin_t *${n}_PluginInfo (void);"
done done
for l in $SND_REND_STATIC; do for l in $SND_REND_STATIC; do
SND_REND_STATIC_LIBS="$SND_REND_STATIC_LIBS renderer/$l" SND_REND_STATIC_LIBS="$SND_REND_STATIC_LIBS renderer/$l"
n="`echo $l | sed -e 's/\(.*\)\.la/\1/'`" n="`echo $l | sed -e 's/\(.*\)\.la/\1/'`"
SND_RENDER_LIST='{"'"$n"'"'", ${n}_PluginInfo},$SND_RENDER_LIST" SND_RENDER_LIST='{"'"$n"'"'", ${n}_PluginInfo},$SND_RENDER_LIST"
SND_RENDER_PROTOS="$SND_RENDER_PROTOS extern QFPLUGIN plugin_t *${n}_PluginInfo (void);" SND_RENDER_PROTOS="$SND_RENDER_PROTOS extern plugin_t *${n}_PluginInfo (void);"
done done
AC_DEFINE_UNQUOTED(SERVER_PLUGIN_LIST, $SERVER_PLUGIN_LIST, [list of server plugins]) AC_DEFINE_UNQUOTED(SERVER_PLUGIN_LIST, $SERVER_PLUGIN_LIST, [list of server plugins])
AC_DEFINE_UNQUOTED(SERVER_PLUGIN_PROTOS, $SERVER_PLUGIN_PROTOS, [list of server prototypes]) AC_DEFINE_UNQUOTED(SERVER_PLUGIN_PROTOS, $SERVER_PLUGIN_PROTOS, [list of server prototypes])

2
include/QF/gib.h
View file

@ -170,7 +170,7 @@ typedef struct gib_buffer_data_s {
// Builtin function interface // Builtin function interface
extern char gib_null_string[]; extern char * const gib_null_string;
#define GIB_Argc() (cbuf_active->args->argc) #define GIB_Argc() (cbuf_active->args->argc)
#define GIB_Argv(x) ((x) < cbuf_active->args->argc ? cbuf_active->args->argv[(x)]->str : gib_null_string) #define GIB_Argv(x) ((x) < cbuf_active->args->argc ? cbuf_active->args->argv[(x)]->str : gib_null_string)

14
include/QF/mathlib.h
View file

@ -36,8 +36,18 @@
# define M_PI 3.14159265358979323846 // matches value in gcc v2 math.h # define M_PI 3.14159265358979323846 // matches value in gcc v2 math.h
#endif #endif
#ifdef WIN32
# if defined (DLL_EXPORT) && defined (BUILD_QFutil)
# define QFutil_IMPORT
# else
# define QFutil_IMPORT __declspec(dllimport)
# endif
#else
# define QFutil_IMPORT
#endif
extern int nanmask; extern int nanmask;
extern const vec3_t vec3_origin; extern QFutil_IMPORT const vec3_t vec3_origin;
#define EQUAL_EPSILON 0.001 #define EQUAL_EPSILON 0.001
#define RINT(x) (floor ((x) + 0.5)) #define RINT(x) (floor ((x) + 0.5))
@ -138,7 +148,7 @@ void RotatePointAroundVector (vec3_t dst, const vec3_t axis,
#define PlaneDiff(point,plane) (((plane)->type < 3 ? (point)[(plane)->type] : DotProduct((point), (plane)->normal)) - (plane)->dist) #define PlaneDiff(point,plane) (((plane)->type < 3 ? (point)[(plane)->type] : DotProduct((point), (plane)->normal)) - (plane)->dist)
extern mplane_t frustum[4]; extern QFutil_IMPORT mplane_t frustum[4];
extern inline qboolean R_CullBox (const vec3_t mins, const vec3_t maxs); extern inline qboolean R_CullBox (const vec3_t mins, const vec3_t maxs);
extern inline qboolean R_CullSphere (const vec3_t origin, const float radius); extern inline qboolean R_CullSphere (const vec3_t origin, const float radius);
extern inline float VectorNormalize (vec3_t v); // returns vector length extern inline float VectorNormalize (vec3_t v); // returns vector length

14
include/QF/plugin.h
View file

@ -31,16 +31,6 @@
#define QFPLUGIN_VERSION "1.0" #define QFPLUGIN_VERSION "1.0"
#ifdef WIN32
# ifdef DLL_EXPORT
# define QFPLUGIN __declspec(dllexport)
# else
# define QFPLUGIN
# endif
#else
# define QFPLUGIN
#endif
#include <QF/qtypes.h> #include <QF/qtypes.h>
#include <QF/plugin/cd.h> #include <QF/plugin/cd.h>
#include <QF/plugin/console.h> #include <QF/plugin/console.h>
@ -50,9 +40,9 @@
#include <QF/plugin/snd_render.h> #include <QF/plugin/snd_render.h>
#ifdef STATIC_PLUGINS #ifdef STATIC_PLUGINS
#define PLUGIN_INFO(type,name) QFPLUGIN plugin_t *type##_##name##_PluginInfo (void); QFPLUGIN plugin_t * type##_##name##_PluginInfo (void) #define PLUGIN_INFO(type,name) plugin_t *type##_##name##_PluginInfo (void); plugin_t * type##_##name##_PluginInfo (void)
#else #else
#define PLUGIN_INFO(type,name) QFPLUGIN plugin_t *PluginInfo (void);QFPLUGIN plugin_t *PluginInfo (void) #define PLUGIN_INFO(type,name) plugin_t *PluginInfo (void);plugin_t *PluginInfo (void)
#endif #endif
typedef enum { typedef enum {

14
include/QF/plugin/cd.h
View file

@ -34,13 +34,13 @@
/* /*
All CDAudio plugins must export these functions All CDAudio plugins must export these functions
*/ */
typedef void (QFPLUGIN *P_CDAudio_CD_f) (void); // typedef void (*P_CDAudio_CD_f) (void); //
typedef void (QFPLUGIN *P_CDAudio_Pause) (void); typedef void (*P_CDAudio_Pause) (void);
typedef void (QFPLUGIN *P_CDAudio_Play) (int, qboolean); typedef void (*P_CDAudio_Play) (int, qboolean);
typedef void (QFPLUGIN *P_CDAudio_Resume) (void); typedef void (*P_CDAudio_Resume) (void);
typedef void (QFPLUGIN *P_CDAudio_Shutdown) (void); typedef void (*P_CDAudio_Shutdown) (void);
typedef void (QFPLUGIN *P_CDAudio_Update) (void); typedef void (*P_CDAudio_Update) (void);
typedef void (QFPLUGIN *P_CDAudio_Init) (void); typedef void (*P_CDAudio_Init) (void);
typedef struct cd_funcs_s { typedef struct cd_funcs_s {
P_CDAudio_CD_f pCD_f; // P_CDAudio_CD_f pCD_f; //

12
include/QF/plugin/console.h
View file

@ -35,12 +35,12 @@
#include <QF/qtypes.h> #include <QF/qtypes.h>
#include <QF/plugin.h> #include <QF/plugin.h>
typedef void (QFPLUGIN *P_C_Print) (const char *fmt, va_list args); typedef void (*P_C_Print) (const char *fmt, va_list args);
typedef void (QFPLUGIN *P_C_ProcessInput) (void); typedef void (*P_C_ProcessInput) (void);
typedef void (QFPLUGIN *P_C_KeyEvent) (knum_t key, short unicode, qboolean down); typedef void (*P_C_KeyEvent) (knum_t key, short unicode, qboolean down);
typedef void (QFPLUGIN *P_C_DrawConsole) (void); typedef void (*P_C_DrawConsole) (void);
typedef void (QFPLUGIN *P_C_CheckResize) (void); typedef void (*P_C_CheckResize) (void);
typedef void (QFPLUGIN *P_C_NewMap) (void); typedef void (*P_C_NewMap) (void);
typedef struct console_func_s { typedef struct console_func_s {
P_C_Print pC_Print; P_C_Print pC_Print;

4
include/QF/plugin/general.h
View file

@ -36,8 +36,8 @@
All plugins, of all types, must export these functions All plugins, of all types, must export these functions
*/ */
typedef void (QFPLUGIN *P_Init) (void); typedef void (*P_Init) (void);
typedef void (QFPLUGIN *P_Shutdown) (void); typedef void (*P_Shutdown) (void);
typedef struct general_func_s { typedef struct general_func_s {
P_Init p_Init; P_Init p_Init;

8
include/QF/plugin/input.h
View file

@ -35,10 +35,10 @@
/* /*
All input plugins must export these functions All input plugins must export these functions
*/ */
typedef void (QFPLUGIN *P_IN_Commands) (void); typedef void (*P_IN_Commands) (void);
typedef void (QFPLUGIN *P_IN_SendKeyEvents) (void); typedef void (*P_IN_SendKeyEvents) (void);
typedef void (QFPLUGIN *P_IN_Move) (void); typedef void (*P_IN_Move) (void);
typedef void (QFPLUGIN *P_IN_ModeChanged) (void); typedef void (*P_IN_ModeChanged) (void);
typedef struct input_funcs_s { typedef struct input_funcs_s {
P_IN_Commands pIN_Commands; P_IN_Commands pIN_Commands;

12
include/QF/plugin/snd_output.h
View file

@ -34,12 +34,12 @@
/* /*
All sound plugins must export these functions All sound plugins must export these functions
*/ */
typedef volatile struct dma_s *(QFPLUGIN *P_S_O_Init) (void); typedef volatile struct dma_s *(*P_S_O_Init) (void);
typedef void (QFPLUGIN *P_S_O_Shutdown) (void); typedef void (*P_S_O_Shutdown) (void);
typedef int (QFPLUGIN *P_S_O_GetDMAPos) (void); typedef int (*P_S_O_GetDMAPos) (void);
typedef void (QFPLUGIN *P_S_O_Submit) (void); typedef void (*P_S_O_Submit) (void);
typedef void (QFPLUGIN *P_S_O_BlockSound) (void); typedef void (*P_S_O_BlockSound) (void);
typedef void (QFPLUGIN *P_S_O_UnblockSound) (void); typedef void (*P_S_O_UnblockSound) (void);
typedef struct snd_output_funcs_s { typedef struct snd_output_funcs_s {
P_S_O_Init pS_O_Init; P_S_O_Init pS_O_Init;

36
include/QF/plugin/snd_render.h
View file

@ -37,24 +37,24 @@
struct sfx_s; struct sfx_s;
typedef void (QFPLUGIN *P_S_Init) (void); typedef void (*P_S_Init) (void);
typedef void (QFPLUGIN *P_S_Shutdown) (void); typedef void (*P_S_Shutdown) (void);
typedef void (QFPLUGIN *P_S_AmbientOff) (void); typedef void (*P_S_AmbientOff) (void);
typedef void (QFPLUGIN *P_S_AmbientOn) (void); typedef void (*P_S_AmbientOn) (void);
typedef void (QFPLUGIN *P_S_TouchSound) (const char *sample); typedef void (*P_S_TouchSound) (const char *sample);
typedef void (QFPLUGIN *P_S_StartSound) (int entnum, int entchannel, struct sfx_s *sfx, const vec3_t origin, float fvol, float attenuation); typedef void (*P_S_StartSound) (int entnum, int entchannel, struct sfx_s *sfx, const vec3_t origin, float fvol, float attenuation);
typedef void (QFPLUGIN *P_S_StaticSound) (struct sfx_s *sfx, const vec3_t origin, float vol, float attenuation); typedef void (*P_S_StaticSound) (struct sfx_s *sfx, const vec3_t origin, float vol, float attenuation);
typedef void (QFPLUGIN *P_S_StopSound) (int entnum, int entchannel); typedef void (*P_S_StopSound) (int entnum, int entchannel);
typedef struct sfx_s * (QFPLUGIN *P_S_PrecacheSound) (const char *sample); typedef struct sfx_s * (*P_S_PrecacheSound) (const char *sample);
typedef void (QFPLUGIN *P_S_ClearPrecache) (void); typedef void (*P_S_ClearPrecache) (void);
typedef void (QFPLUGIN *P_S_Update) (const vec3_t origin, const vec3_t v_forward, const vec3_t v_right, const vec3_t v_up); typedef void (*P_S_Update) (const vec3_t origin, const vec3_t v_forward, const vec3_t v_right, const vec3_t v_up);
typedef void (QFPLUGIN *P_S_StopAllSounds) (qboolean clear); typedef void (*P_S_StopAllSounds) (qboolean clear);
typedef void (QFPLUGIN *P_S_BeginPrecaching) (void); typedef void (*P_S_BeginPrecaching) (void);
typedef void (QFPLUGIN *P_S_EndPrecaching) (void); typedef void (*P_S_EndPrecaching) (void);
typedef void (QFPLUGIN *P_S_ExtraUpdate) (void); typedef void (*P_S_ExtraUpdate) (void);
typedef void (QFPLUGIN *P_S_LocalSound) (const char *s); typedef void (*P_S_LocalSound) (const char *s);
typedef void (QFPLUGIN *P_S_BlockSound) (void); typedef void (*P_S_BlockSound) (void);
typedef void (QFPLUGIN *P_S_UnblockSound) (void); typedef void (*P_S_UnblockSound) (void);
typedef struct snd_render_funcs_s { typedef struct snd_render_funcs_s {
P_S_AmbientOff pS_AmbientOff; P_S_AmbientOff pS_AmbientOff;

2
include/QF/quakefs.h
View file

@ -78,7 +78,7 @@ void QFS_Gamedir (const char *dir);
QFile *QFS_Open (const char *path, const char *mode); QFile *QFS_Open (const char *path, const char *mode);
QFile *QFS_WOpen (const char *path, int zip); QFile *QFS_WOpen (const char *path, int zip);
void QFS_WriteFile (const char *filename, void *data, int len); void QFS_WriteFile (const char *filename, const void *data, int len);
void QFS_WriteBuffers (const char *filename, int count, ...); void QFS_WriteBuffers (const char *filename, int count, ...);
int _QFS_FOpenFile (const char *filename, QFile **gzfile, int _QFS_FOpenFile (const char *filename, QFile **gzfile,

6
libs/Makefile.am
View file

@ -1,3 +1,7 @@
AUTOMAKE_OPTIONS= foreign AUTOMAKE_OPTIONS= foreign
SUBDIRS=audio console gamecode gib image models net object video ruamoko util # everything depends on util
# gib depends on console
# gamecode depends on gib (only for builtins, not the engine)
# ruamoko depends on gamecode (engine only, not builtins)
SUBDIRS=util audio console gib gamecode image models net object ruamoko video

4
libs/audio/Makefile.am
View file

@ -8,11 +8,11 @@ lib_LTLIBRARIES= @CD_TARGETS@ @SND_TARGETS@
EXTRA_LTLIBRARIES= libQFsound.la libQFcd.la EXTRA_LTLIBRARIES= libQFsound.la libQFcd.la
libQFsound_la_LDFLAGS= -version-info 1:0:0 -rpath $(libdir) libQFsound_la_LDFLAGS= -version-info 1:0:0 -rpath $(libdir)
libQFsound_la_LIBADD= @SND_PLUGIN_STATIC_LIBS@ @SND_REND_STATIC_LIBS@ libQFsound_la_LIBADD= @SND_PLUGIN_STATIC_LIBS@ @SND_REND_STATIC_LIBS@ $(top_builddir)/libs/util/libQFutil.la
libQFsound_la_SOURCES= snd.c libQFsound_la_SOURCES= snd.c
libQFsound_la_DEPENDENCIES= @SND_PLUGIN_STATIC_LIBS@ @SND_REND_STATIC_LIBS@ libQFsound_la_DEPENDENCIES= @SND_PLUGIN_STATIC_LIBS@ @SND_REND_STATIC_LIBS@
libQFcd_la_LDFLAGS= -version-info 1:0:0 -rpath $(libdir) libQFcd_la_LDFLAGS= -version-info 1:0:0 -rpath $(libdir)
libQFcd_la_LIBADD= @CD_PLUGIN_STATIC_LIBS@ libQFcd_la_LIBADD= @CD_PLUGIN_STATIC_LIBS@ $(top_builddir)/libs/util/libQFutil.la
libQFcd_la_SOURCES= cd.c libQFcd_la_SOURCES= cd.c
libQFcd_la_DEPENDENCIES= @CD_PLUGIN_STATIC_LIBS@ libQFcd_la_DEPENDENCIES= @CD_PLUGIN_STATIC_LIBS@

2
libs/audio/cd/cd_xmms.c
View file

@ -111,7 +111,7 @@ static void I_XMMS_Repeat(void);
static void I_XMMS_Pos(int); static void I_XMMS_Pos(int);
static void I_XMMS_Info(void); static void I_XMMS_Info(void);
static void I_XMMS_f(void); static void I_XMMS_f(void);
QFPLUGIN plugin_t *cd_xmms_PluginInfo (void); plugin_t *cd_xmms_PluginInfo (void);
/* static float cdvolume; */ /* static float cdvolume; */
/* static byte remap[100]; */ /* static byte remap[100]; */

4
libs/console/Makefile.am
View file

@ -17,8 +17,8 @@ common_sources= \
client_sources= client.c menu.c client_sources= client.c menu.c
server_sources= server.c server_sources= server.c
libQFconsole_la_LDFLAGS= -version-info 1:0:0 -rpath $(libdir) libQFconsole_la_LDFLAGS= -version-info 1:0:0 -rpath $(libdir) -no-undefined
libQFconsole_la_LIBADD= $(plugin_libadd) libQFconsole_la_LIBADD= $(plugin_libadd) $(top_builddir)/libs/util/libQFutil.la
libQFconsole_la_SOURCES= $(common_sources) libQFconsole_la_SOURCES= $(common_sources)
console_client_la_LDFLAGS= $(plugin_ldflags) console_client_la_LDFLAGS= $(plugin_ldflags)

3
libs/gamecode/builtins/Makefile.am
View file

@ -5,5 +5,6 @@ INCLUDES= -I$(top_srcdir)/include
lib_LTLIBRARIES= libQFgamecode_builtins.la lib_LTLIBRARIES= libQFgamecode_builtins.la
libQFgamecode_builtins_la_LDFLAGS= -version-info 1:0:0 libQFgamecode_builtins_la_LDFLAGS= -version-info 1:0:0 -no-undefined
libQFgamecode_builtins_la_LIBADD= $(top_builddir)/libs/gamecode/engine/libQFgamecode.la $(top_builddir)/libs/gib/libQFgib.la $(top_builddir)/libs/console/libQFconsole.la $(top_builddir)/libs/util/libQFutil.la
libQFgamecode_builtins_la_SOURCES= pr_cmds.c bi_gib.c bi_inputline.c libQFgamecode_builtins_la_SOURCES= pr_cmds.c bi_gib.c bi_inputline.c

3
libs/gamecode/engine/Makefile.am
View file

@ -5,7 +5,8 @@ INCLUDES= -I$(top_srcdir)/include
lib_LTLIBRARIES= libQFgamecode.la lib_LTLIBRARIES= libQFgamecode.la
libQFgamecode_la_LDFLAGS= -version-info 1:0:0 libQFgamecode_la_LDFLAGS= -version-info 1:0:0 -no-undefined
libQFgamecode_la_LIBADD= $(top_builddir)/libs/util/libQFutil.la
libQFgamecode_la_SOURCES= \ libQFgamecode_la_SOURCES= \
pr_builtins.c pr_edict.c pr_debug.c pr_exec.c pr_load.c pr_parse.c \ pr_builtins.c pr_edict.c pr_debug.c pr_exec.c pr_load.c pr_parse.c \
pr_opcode.c pr_resolve.c pr_resource.c pr_strings.c pr_zone.c pr_opcode.c pr_resolve.c pr_resource.c pr_strings.c pr_zone.c

3
libs/gib/Makefile.am
View file

@ -4,7 +4,8 @@ INCLUDES= -I$(top_srcdir)/include
lib_LTLIBRARIES= libQFgib.la lib_LTLIBRARIES= libQFgib.la
libQFgib_la_LDFLAGS= -version-info 1:0:0 libQFgib_la_LDFLAGS= -version-info 1:0:0 -no-undefined
libQFgib_la_LIBADD= $(top_builddir)/libs/util/libQFutil.la $(top_builddir)/libs/console/libQFconsole.la
libQFgib_la_SOURCES= \ libQFgib_la_SOURCES= \
gib_buffer.c gib_builtin.c gib_classes.c gib_execute.c gib_function.c gib_parse.c gib_handle.c \ gib_buffer.c gib_builtin.c gib_classes.c gib_execute.c gib_function.c gib_parse.c gib_handle.c \
gib_object.c gib_process.c gib_regex.c gib_thread.c gib_vars.c gib_init.c gib_tree.c \ gib_object.c gib_process.c gib_regex.c gib_thread.c gib_vars.c gib_init.c gib_tree.c \

3
libs/gib/gib_builtin.c
View file

@ -67,7 +67,8 @@ const char rcsid[] =
#include "gib_builtin.h" #include "gib_builtin.h"
#include "gib_classes.h" #include "gib_classes.h"
char gib_null_string[] = ""; static char _gib_null_string[] = "";
char * const gib_null_string = _gib_null_string;
hashtab_t *gib_builtins; hashtab_t *gib_builtins;

4
libs/image/Makefile.am
View file

@ -4,8 +4,8 @@ INCLUDES= -I$(top_srcdir)/include
lib_LTLIBRARIES= libQFimage.la lib_LTLIBRARIES= libQFimage.la
libQFimage_la_LDFLAGS= -version-info 1:0:0 libQFimage_la_LDFLAGS= -version-info 1:0:0 -no-undefined
libQFimage_la_LIBADD= $(PNG_LIBS) libQFimage_la_LIBADD= $(PNG_LIBS) $(top_builddir)/libs/util/libQFutil.la
libQFimage_la_DEPENDENCIES= libQFimage_la_DEPENDENCIES=
libQFimage_la_SOURCES= \ libQFimage_la_SOURCES= \
image.c pcx.c png.c tga.c image.c pcx.c png.c tga.c

12
libs/models/Makefile.am
View file

@ -10,21 +10,21 @@ EXTRA_LTLIBRARIES= \
models_sources = clip_hull.c model.c models_sources = clip_hull.c model.c
libQFmodels_la_LDFLAGS= -version-info 1:0:0 libQFmodels_la_LDFLAGS= -version-info 1:0:0 -no-undefined
libQFmodels_la_LIBADD= brush/libbrush.la libQFmodels_la_LIBADD= brush/libbrush.la $(top_builddir)/libs/util/libQFutil.la
libQFmodels_la_SOURCES= $(models_sources) libQFmodels_la_SOURCES= $(models_sources) null_model.c
libQFmodels_la_DEPENDENCIES= brush/libbrush.la libQFmodels_la_DEPENDENCIES= brush/libbrush.la
gl_LIBS= \ gl_LIBS= \
alias/libalias_gl.la brush/libbrush_gl.la sprite/libsprite_gl.la alias/libalias_gl.la brush/libbrush_gl.la sprite/libsprite_gl.la
libQFmodels_gl_la_LDFLAGS= -version-info 1:0:0 -rpath $(libdir) libQFmodels_gl_la_LDFLAGS= -version-info 1:0:0 -rpath $(libdir)
libQFmodels_gl_la_LIBADD= $(gl_LIBS) libQFmodels_gl_la_LIBADD= $(gl_LIBS) $(top_builddir)/libs/util/libQFutil.la
libQFmodels_gl_la_SOURCES= $(models_sources) gl_model_fullbright.c libQFmodels_gl_la_SOURCES= $(models_sources) gl_model_fullbright.c
libQFmodels_gl_la_DEPENDENCIES= $(gl_LIBS) libQFmodels_gl_la_DEPENDENCIES= $(gl_LIBS)
sw_LIBS= \ sw_LIBS= \
alias/libalias_sw.la brush/libbrush_sw.la sprite/libsprite_sw.la alias/libalias_sw.la brush/libbrush_sw.la sprite/libsprite_sw.la
libQFmodels_sw_la_LDFLAGS= -version-info 1:0:0 -rpath $(libdir) libQFmodels_sw_la_LDFLAGS= -version-info 1:0:0 -rpath $(libdir) -no-undefined
libQFmodels_sw_la_LIBADD= $(sw_LIBS) libQFmodels_sw_la_LIBADD= $(sw_LIBS) $(top_builddir)/libs/util/libQFutil.la
libQFmodels_sw_la_SOURCES= $(models_sources) libQFmodels_sw_la_SOURCES= $(models_sources)
libQFmodels_sw_la_DEPENDENCIES= $(sw_LIBS) libQFmodels_sw_la_DEPENDENCIES= $(sw_LIBS)

2
nq/source/sv_model.c → libs/models/null_model.c
View file

@ -1,5 +1,5 @@
/* /*
sv_model.c null_model.c
(description) (description)

3
libs/object/Makefile.am
View file

@ -4,7 +4,8 @@ INCLUDES= -I$(top_srcdir)/include
lib_LTLIBRARIES= libQFobject.la lib_LTLIBRARIES= libQFobject.la
libQFobject_la_LDFLAGS= -version-info 1:0:0 libQFobject_la_LDFLAGS= -version-info 1:0:0 -no-undefined
libQFobject_la_LIBADD= $(top_builddir)/libs/util/libQFutil.la
libQFobject_la_SOURCES= \ libQFobject_la_SOURCES= \
ArrayList.c Collection.c Double.c Integer.c Iterator.c \ ArrayList.c Collection.c Double.c Integer.c Iterator.c \
List.c Number.c String.c garbage.c object.c List.c Number.c String.c garbage.c object.c

3
libs/ruamoko/Makefile.am
View file

@ -5,7 +5,8 @@ INCLUDES= -I$(top_srcdir)/include
lib_LTLIBRARIES= libQFruamoko.la lib_LTLIBRARIES= libQFruamoko.la
libQFruamoko_la_LDFLAGS= -version-info 1:0:0 libQFruamoko_la_LDFLAGS= -version-info 1:0:0 -no-undefined
libQFruamoko_la_LIBADD= $(top_builddir)/libs/gamecode/engine/libQFgamecode.la $(top_builddir)/libs/util/libQFutil.la
libQFruamoko_la_SOURCES= \ libQFruamoko_la_SOURCES= \
rua_cbuf.c rua_cmd.c rua_cvar.c rua_file.c rua_hash.c rua_init.c \ rua_cbuf.c rua_cmd.c rua_cvar.c rua_file.c rua_hash.c rua_init.c \
rua_obj.c rua_plist.c rua_qfile.c rua_qfs.c rua_string.c rua_obj.c rua_plist.c rua_qfile.c rua_qfs.c rua_string.c

21
libs/util/Makefile.am
View file

@ -1,6 +1,6 @@
AUTOMAKE_OPTIONS= foreign AUTOMAKE_OPTIONS= foreign
AM_CFLAGS= @PREFER_PIC@ AM_CFLAGS= @PREFER_PIC@ -DBUILD_QFutil
AM_CCASFLAGS= @PREFER_PIC@ AM_CCASFLAGS= @PREFER_PIC@ -DBUILD_QFutil
INCLUDES= -I$(top_srcdir)/include INCLUDES= -I$(top_srcdir)/include
lib_LTLIBRARIES= libQFutil.la lib_LTLIBRARIES= libQFutil.la
@ -17,20 +17,27 @@ libasm_la_SOURCES= $(asm_src)
fnmatch_src= fnmatch.c dirent.c fnmatch_src= fnmatch.c dirent.c
getopt_src= getopt.c getopt1.c
if BUILD_FNMATCH if BUILD_FNMATCH
fnmatch= $(fnmatch_src) fnmatch= $(fnmatch_src)
else else
fnmatch= fnmatch=
endif endif
libQFutil_la_LDFLAGS= -version-info 1:0:0 if BUILD_GETOPT
libQFutil_la_LIBADD= libasm.la $(Z_LIBS) $(DL_LIBS) getopt= $(getopt_src)
else
getopt=
endif
libQFutil_la_LDFLAGS= -version-info 1:0:0 -no-undefined
libQFutil_la_LIBADD= libasm.la $(Z_LIBS) $(DL_LIBS) $(WIN32_LIBS)
libQFutil_la_DEPENDENCIES= libasm.la libQFutil_la_DEPENDENCIES= libasm.la
libQFutil_la_SOURCES= \ libQFutil_la_SOURCES= \
bspfile.c buildnum.c cbuf.c checksum.c cmd.c crc.c cvar.c dstring.c \ bspfile.c buildnum.c cbuf.c checksum.c cmd.c crc.c cvar.c dstring.c \
fendian.c getopt.c getopt1.c hash.c idparse.c info.c link.c llist.c \ fendian.c hash.c idparse.c info.c link.c llist.c \
mathlib.c mdfour.c msg.c pakfile.c plugin.c qargs.c qendian.c \ mathlib.c mdfour.c msg.c pakfile.c plugin.c qargs.c qendian.c \
qfplist.c quakefs.c quakeio.c riff.c sizebuf.c string.c sys.c \ qfplist.c quakefs.c quakeio.c riff.c sizebuf.c string.c sys.c \
va.c ver_check.c wad.c wadfile.c zone.c $(fnmatch) va.c ver_check.c wad.c wadfile.c zone.c $(fnmatch) $(getopt)
EXTRA_DIST= $(asm_src) $(fnmatch_src) EXTRA_DIST= $(asm_src) $(fnmatch_src) $(getopt_src)

2
libs/util/quakefs.c
View file

@ -583,7 +583,7 @@ QFS_Path_f (void)
The filename will be prefixed by the current game directory The filename will be prefixed by the current game directory
*/ */
void void
QFS_WriteFile (const char *filename, void *data, int len) QFS_WriteFile (const char *filename, const void *data, int len)
{ {
QFile *f; QFile *f;

2
libs/video/Makefile.am
View file

@ -1,6 +1,6 @@
AUTOMAKE_OPTIONS= foreign AUTOMAKE_OPTIONS= foreign
SUBDIRS= renderer targets SUBDIRS= targets renderer
clean-local: clean-local:
rm -f *.a rm -f *.a

6
nq/source/Makefile.am
View file

@ -238,11 +238,11 @@ nq_wgl_DEPENDENCIES= $(nq_wgl_libs)
# Dedicated Server # Dedicated Server
if SYSTYPE_WIN32 if SYSTYPE_WIN32
ded_sources= sys_wind.c sv_ded.c sv_model.c ded_sources= sys_wind.c sv_ded.c
else else
ded_sources= sys_unixd.c sv_ded.c sv_model.c ded_sources= sys_unixd.c sv_ded.c
endif endif
EXTRA_DIST=sys_wind.c sys_unixd.c sv_ded.c sv_model.c EXTRA_DIST=sys_wind.c sys_unixd.c sv_ded.c
nq_server_LDFLAGS= $(common_ldflags) nq_server_LDFLAGS= $(common_ldflags)
nq_server_SOURCES= $(ded_sources) nq_server_SOURCES= $(ded_sources)

4
nq/source/sv_ded.c
View file

@ -311,8 +311,8 @@ V_Init_Cvars (void)
{ {
} }
QFPLUGIN plugin_t *console_client_PluginInfo (void); plugin_t *console_client_PluginInfo (void);
QFPLUGIN plugin_t * plugin_t *
console_client_PluginInfo (void) console_client_PluginInfo (void)
{ {
return 0; return 0;

2
qw/source/Makefile.am
View file

@ -85,7 +85,7 @@ qf_server_LIBS= \
$(top_builddir)/libs/gib/libQFgib.la \ $(top_builddir)/libs/gib/libQFgib.la \
$(top_builddir)/libs/util/libQFutil.la $(top_builddir)/libs/util/libQFutil.la
qw_server_SOURCES= sv_model.c qw_server_SOURCES=
qw_server_LDADD= libqw_server.a libqw_common.a libasm.a $(qf_server_LIBS) $(NET_LIBS) $(DL_LIBS) $(CURSES_LIBS) qw_server_LDADD= libqw_server.a libqw_common.a libasm.a $(qf_server_LIBS) $(NET_LIBS) $(DL_LIBS) $(CURSES_LIBS)
qw_server_LDFLAGS= $(common_ldflags) qw_server_LDFLAGS= $(common_ldflags)
qw_server_DEPENDENCIES= libqw_common.a libqw_server.a libasm.a $(qf_server_LIBS) qw_server_DEPENDENCIES= libqw_common.a libqw_server.a libasm.a $(qf_server_LIBS)

78
qw/source/sv_model.c
View file

@ -1,78 +0,0 @@
/*
sv_model.c
(description)
Copyright (C) 1996-1997 Id Software, 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 the Free Software Foundation; either version 2
of the License, or (at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
See the GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program; if not, write to:
Free Software Foundation, Inc.
59 Temple Place - Suite 330
Boston, MA 02111-1307, USA
*/
#ifdef HAVE_CONFIG_H
# include "config.h"
#endif
static __attribute__ ((unused)) const char rcsid[] =
"$Id$";
#include "QF/cvar.h"
#include "QF/model.h"
#include "QF/render.h"
int mod_lightmap_bytes = 1;
void
Mod_LoadLighting (lump_t *l)
{
}
void
Mod_LoadAliasModel (model_t *mod, void *buf, cache_allocator_t allocator)
{
}
void
Mod_LoadSpriteModel (model_t *mod, void *buf)
{
}
void
R_InitSky (struct texture_s *mt)
{
}
void
Mod_ProcessTexture (miptex_t *mx, texture_t *tx)
{
}
void
Mod_LoadExternalSkins (model_t *mod)
{
}
void
Mod_LoadExternalTextures (model_t *mod)
{
}
void
Mod_SubdivideSurface (msurface_t *fa)
{
}