mirror of
https://git.code.sf.net/p/quake/quakeforge
synced 2025-04-04 16:31:30 +00:00
make the sdl clients link reliably (some versions of binutils don't cope well
with no .o files)
This commit is contained in:
Bill Currie
parent
2abaf27cdc
commit
ff02dfbbbc
4 changed files with 76 additions and 9 deletions
|
|
@ -143,10 +143,9 @@ nq_sdl_libs= \
|
|||
$(soft_QFLIBS) \
|
||||
$(top_builddir)/libs/video/targets/libQFsdl.la \
|
||||
$(client_LIBS)
|
||||
nq_sdl_SOURCES=
|
||||
nq_sdl_SOURCES=sdl_link.c
|
||||
nq_sdl_LDADD= $(nq_sdl_libs) $(SDL_LIBS) $(NET_LIBS)
|
||||
nq_sdl_LDFLAGS= $(common_ldflags)
|
||||
nq_sdl_CFLAGS= $(SDL_CFLAGS)
|
||||
nq_sdl_DEPENDENCIES= $(nq_sdl_libs)
|
||||
|
||||
# ... 32-bit software, SDL
|
||||
|
|
@ -158,10 +157,9 @@ nq_sdl32_libs= \
|
|||
$(top_builddir)/libs/models/libQFmodels_sw.la \
|
||||
$(top_builddir)/libs/video/targets/libQFsdl32.la \
|
||||
$(client_LIBS)
|
||||
nq_sdl32_SOURCES=
|
||||
nq_sdl32_SOURCES=sdl_link.c
|
||||
nq_sdl32_LDADD= $(nq_sdl32_libs) $(SDL_LIBS) $(NET_LIBS)
|
||||
nq_sdl32_LDFLAGS= $(common_ldflags)
|
||||
nq_sdl32_CFLAGS= $(SDL_CFLAGS)
|
||||
nq_sdl32_DEPENDENCIES= $(nq_sdl32_libs)
|
||||
|
||||
# ... Linux SVGAlib
|
||||
|
|
@ -230,10 +228,9 @@ nq_sgl_libs= \
|
|||
$(opengl_QFLIBS) \
|
||||
$(top_builddir)/libs/video/targets/libQFsgl.la \
|
||||
$(client_LIBS)
|
||||
nq_sgl_SOURCES=
|
||||
nq_sgl_SOURCES=sdl_link.c
|
||||
nq_sgl_LDADD= $(nq_sgl_libs) $(SDL_LIBS) $(DL_LIBS) $(NET_LIBS)
|
||||
nq_sgl_LDFLAGS= $(common_ldflags)
|
||||
nq_sgl_CFLAGS= $(SDL_CFLAGS)
|
||||
nq_sgl_DEPENDENCIES= $(nq_sgl_libs)
|
||||
|
||||
# ... SGI/Microsoft WGL (Windows OpenGL)
|
||||
|
|
|
|||
35
nq/source/sdl_link.c
Normal file
35
nq/source/sdl_link.c
Normal file
|
|
@ -0,0 +1,35 @@
|
|||
/*
|
||||
sdl_main.c
|
||||
|
||||
hack to force linking of sdl clients
|
||||
|
||||
Copyright (C) 2002 Bill Currie <bill@taniwha.org>
|
||||
|
||||
Author: Bill Currie <bill@taniwha.org>
|
||||
Date: 2002/8/12
|
||||
|
||||
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
|
||||
|
||||
*/
|
||||
static const char rcsid[] =
|
||||
"$Id$";
|
||||
|
||||
extern int noconinput;
|
||||
|
||||
static int *const _noconinput = &noconinput;
|
||||
|
|
@ -159,7 +159,7 @@ qw_client_sdl_libs= \
|
|||
$(soft_LIBS) \
|
||||
$(top_builddir)/libs/video/targets/libQFsdl.la \
|
||||
$(client_LIBS)
|
||||
qw_client_sdl_SOURCES=
|
||||
qw_client_sdl_SOURCES=sdl_link.c
|
||||
qw_client_sdl_LDADD= libsdl.a $(qw_client_sdl_libs) $(SDL_LIBS) $(NET_LIBS)
|
||||
qw_client_sdl_LDFLAGS= $(common_ldflags)
|
||||
qw_client_sdl_DEPENDENCIES= libsdl.a $(qw_client_sdl_libs)
|
||||
|
|
@ -173,7 +173,7 @@ qw_client_sdl32_libs= \
|
|||
$(top_builddir)/libs/models/libQFmodels_sw.la \
|
||||
$(top_builddir)/libs/video/targets/libQFsdl32.la \
|
||||
$(client_LIBS)
|
||||
qw_client_sdl32_SOURCES=
|
||||
qw_client_sdl32_SOURCES=sdl_link.c
|
||||
qw_client_sdl32_LDADD= libsdl.a $(qw_client_sdl32_libs) $(SDL_LIBS) $(NET_LIBS)
|
||||
qw_client_sdl32_LDFLAGS=$(common_ldflags)
|
||||
qw_client_sdl32_DEPENDENCIES= libsdl.a $(qw_client_sdl32_libs)
|
||||
|
|
@ -244,7 +244,7 @@ qw_client_sgl_libs= \
|
|||
$(opengl_LIBS) \
|
||||
$(top_builddir)/libs/video/targets/libQFsgl.la \
|
||||
$(client_LIBS)
|
||||
qw_client_sgl_SOURCES=
|
||||
qw_client_sgl_SOURCES=sdl_link.c
|
||||
qw_client_sgl_LDADD= $(qw_client_sgl_libs) $(SDL_LIBS) $(DL_LIBS) $(NET_LIBS)
|
||||
qw_client_sgl_LDFLAGS= $(common_ldflags)
|
||||
qw_client_sgl_DEPENDENCIES= $(qw_client_sgl_libs)
|
||||
|
|
|
|||
35
qw/source/sdl_link.c
Normal file
35
qw/source/sdl_link.c
Normal file
|
|
@ -0,0 +1,35 @@
|
|||
/*
|
||||
sdl_main.c
|
||||
|
||||
hack to force linking of sdl clients
|
||||
|
||||
Copyright (C) 2002 Bill Currie <bill@taniwha.org>
|
||||
|
||||
Author: Bill Currie <bill@taniwha.org>
|
||||
Date: 2002/8/12
|
||||
|
||||
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
|
||||
|
||||
*/
|
||||
static const char rcsid[] =
|
||||
"$Id$";
|
||||
|
||||
extern int noconinput;
|
||||
|
||||
static int *const _noconinput = &noconinput;
|
||||
Loading…
Reference in a new issue