qf/quakeforge
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/quakeforge synced 2025-01-29 12:10:48 +00:00
Code Issues Projects Releases Packages Wiki Activity

rename the convenience libs to avoid problems with libx11 vs libX11 on

Browse source 
darwin (damn case insensitive file systems :P)
This commit is contained in:
Bill Currie 2002-12-20 23:40:47 +00:00
parent abea6262c1
commit dbd5b16883
4 changed files with 77 additions and 77 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
acinclude.m4
View file

@ -1129,7 +1129,7 @@ else
fi
for qfn_lib in $2; do
if eval test x'"${$1_need_'$qfn_lib'}"' = xyes; then
qfn_tmp="${$1_libs} lib$qfn_lib.$qfn_ext"
qfn_tmp="${$1_libs} lib$1_$qfn_lib.$qfn_ext"
eval '$1_libs="$qfn_tmp"'
fi
done

86
libs/video/targets/Makefile.am
View file

@ -15,11 +15,11 @@ noinst_LTLIBRARIES= @VID_TARGETS@ @vid_libs@
EXTRA_LTLIBRARIES= \
libQFjs.la libQFfbdev.la libQFglx.la libQFsvga.la libQFtdfx.la \
libQFx11.la libQFsdl.la libQFsdl32.la libQFsgl.la libQFwgl.la \
libasm.la libcommon.la libgl.la libsdl.la libsw.la libsw32.la \
libsvga.la libx11.la
libvid_asm.la libvid_common.la libvid_gl.la libvid_sdl.la \
libvid_sw.la libvid_sw32.la libvid_svga.la libvid_x11.la
libasm_la_SOURCES= d_copy.S
libasmn_la_CFLAGS= @PREFER_NON_PIC@
libvid_asm_la_SOURCES= d_copy.S
libvid_asmn_la_CFLAGS= @PREFER_NON_PIC@
joy_linux_src= joy_linux.c
joy_win_src= joy_win.c
@ -39,34 +39,34 @@ libQFjs_la_CFLAGS= @PREFER_PIC@ $(JOY_CFLAGS)
libQFjs_la_SOURCES= joy.c $(joy_src)
EXTRA_libQFjs_la_SOURCES= $(joy_linux_src) $(joy_win_src) $(joy_null_src)
libcommon_la_SOURCES= \
libvid_common_la_SOURCES= \
in_common.c in_event.c keys.c old_keys.c pr_keys.c vid.c
libcommon_la_CFLAGS= @PREFER_NON_PIC@
libcommon_la_LDFLAGS= -static
libvid_common_la_CFLAGS= @PREFER_NON_PIC@
libvid_common_la_LDFLAGS= -static
libsw_la_SOURCES= vid_common_sw.c
libsw_la_CFLAGS= @PREFER_NON_PIC@
libsw_la_LDFLAGS= -static
libvid_sw_la_SOURCES= vid_common_sw.c
libvid_sw_la_CFLAGS= @PREFER_NON_PIC@
libvid_sw_la_LDFLAGS= -static
libsw32_la_SOURCES= vid_common_sw32.c
libsw32_la_CFLAGS= @PREFER_NON_PIC@
libsw32_la_LDFLAGS= -static
libvid_sw32_la_SOURCES= vid_common_sw32.c
libvid_sw32_la_CFLAGS= @PREFER_NON_PIC@
libvid_sw32_la_LDFLAGS= -static
libgl_la_SOURCES= vid_common_gl.c qfgl_ext.c
libgl_la_CFLAGS= @PREFER_NON_PIC@
libgl_la_LDFLAGS= -static
libvid_gl_la_SOURCES= vid_common_gl.c qfgl_ext.c
libvid_gl_la_CFLAGS= @PREFER_NON_PIC@
libvid_gl_la_LDFLAGS= -static
libx11_la_SOURCES= in_x11.c context_x11.c dga_check.c
libx11_la_CFLAGS= @PREFER_NON_PIC@ $(X_CFLAGS)
libx11_la_LDFLAGS= -static
libvid_x11_la_SOURCES= in_x11.c context_x11.c dga_check.c
libvid_x11_la_CFLAGS= @PREFER_NON_PIC@ $(X_CFLAGS)
libvid_x11_la_LDFLAGS= -static
libsvga_la_SOURCES= in_svgalib.c
libsvga_la_CFLAGS= @PREFER_NON_PIC@ $(SVGA_CFLAGS)
libsvga_la_LDFLAGS= -static
libvid_svga_la_SOURCES= in_svgalib.c
libvid_svga_la_CFLAGS= @PREFER_NON_PIC@ $(SVGA_CFLAGS)
libvid_svga_la_LDFLAGS= -static
libsdl_la_SOURCES= in_sdl.c context_sdl.c
libsdl_la_CFLAGS= @PREFER_NON_PIC@ $(SDL_CFLAGS)
libsdl_la_LDFLAGS= -static
libvid_sdl_la_SOURCES= in_sdl.c context_sdl.c
libvid_sdl_la_CFLAGS= @PREFER_NON_PIC@ $(SDL_CFLAGS)
libvid_sdl_la_LDFLAGS= -static
#
# Linux FBdev
@ -80,8 +80,8 @@ libQFfbdev_la_CFLAGS= @PREFER_NON_PIC@
libQFfbdev_la_SOURCES= fbset.c fbset_modes_y.y fbset_modes_l.l \
in_fbdev.c vid_fbdev.c
libQFfbdev_la_LDFLAGS= -static
libQFfbdev_la_LIBADD= libcommon.la libsw.la
libQFfbdev_la_DEPENDENCIES= libcommon.la libsw.la
libQFfbdev_la_LIBADD= libvid_common.la libvid_sw.la
libQFfbdev_la_DEPENDENCIES= libvid_common.la libvid_sw.la
#
# OpenGL in X Window
@ -89,8 +89,8 @@ libQFfbdev_la_DEPENDENCIES= libcommon.la libsw.la
libQFglx_la_CFLAGS= @PREFER_NON_PIC@ $(X_CFLAGS)
libQFglx_la_SOURCES= vid_glx.c
libQFglx_la_LDFLAGS= -static
libQFglx_la_LIBADD= libcommon.la libgl.la libx11.la
libQFglx_la_DEPENDENCIES= libcommon.la libgl.la libx11.la
libQFglx_la_LIBADD= libvid_common.la libvid_gl.la libvid_x11.la
libQFglx_la_DEPENDENCIES= libvid_common.la libvid_gl.la libvid_x11.la
#
# Simple DirectMedia Library
@ -98,20 +98,20 @@ libQFglx_la_DEPENDENCIES= libcommon.la libgl.la libx11.la
libQFsdl_la_CFLAGS= @PREFER_NON_PIC@ $(SDL_CFLAGS)
libQFsdl_la_SOURCES= vid_sdl.c
libQFsdl_la_LDFLAGS= -static
libQFsdl_la_LIBADD= libcommon.la libsw.la libsdl.la
libQFsdl_la_DEPENDENCIES= libcommon.la libsw.la libsdl.la
libQFsdl_la_LIBADD= libvid_common.la libvid_sw.la libvid_sdl.la
libQFsdl_la_DEPENDENCIES= libvid_common.la libvid_sw.la libvid_sdl.la
libQFsdl32_la_CFLAGS= @PREFER_NON_PIC@ $(SDL_CFLAGS)
libQFsdl32_la_SOURCES= vid_sdl32.c
libQFsdl32_la_LDFLAGS= -static
libQFsdl32_la_LIBADD= libcommon.la libsw32.la libsdl.la
libQFsdl32_la_DEPENDENCIES= libcommon.la libsw32.la libsdl.la
libQFsdl32_la_LIBADD= libvid_common.la libvid_sw32.la libvid_sdl.la
libQFsdl32_la_DEPENDENCIES= libvid_common.la libvid_sw32.la libvid_sdl.la
libQFsgl_la_CFLAGS= @PREFER_NON_PIC@ $(SDL_CFLAGS)
libQFsgl_la_SOURCES= vid_sgl.c
libQFsgl_la_LDFLAGS= -static
libQFsgl_la_LIBADD= libcommon.la libgl.la libsdl.la
libQFsgl_la_DEPENDENCIES= libcommon.la libgl.la libsdl.la
libQFsgl_la_LIBADD= libvid_common.la libvid_gl.la libvid_sdl.la
libQFsgl_la_DEPENDENCIES= libvid_common.la libvid_gl.la libvid_sdl.la
#
# SVGAlib
@ -119,8 +119,8 @@ libQFsgl_la_DEPENDENCIES= libcommon.la libgl.la libsdl.la
libQFsvga_la_CFLAGS= @PREFER_NON_PIC@ $(SVGA_CFLAGS)
libQFsvga_la_SOURCES= vid_svgalib.c
libQFsvga_la_LDFLAGS= -static
libQFsvga_la_LIBADD= $(asm) libcommon.la libsw.la libsvga.la
libQFsvga_la_DEPENDENCIES= $(asm) libcommon.la libsw.la libsvga.la
libQFsvga_la_LIBADD= $(asm) libvid_common.la libvid_sw.la libvid_svga.la
libQFsvga_la_DEPENDENCIES= $(asm) libvid_common.la libvid_sw.la libvid_svga.la
#
# 3dfx
@ -128,8 +128,8 @@ libQFsvga_la_DEPENDENCIES= $(asm) libcommon.la libsw.la libsvga.la
libQFtdfx_la_CFLAGS= @PREFER_NON_PIC@ $(SVGA_CFLAGS)
libQFtdfx_la_SOURCES= vid_3dfxsvga.c
libQFtdfx_la_LDFLAGS= -static
libQFtdfx_la_LIBADD= $(asm) libcommon.la libgl.la libsvga.la
libQFtdfx_la_DEPENDENCIES= $(asm) libcommon.la libgl.la libsvga.la
libQFtdfx_la_LIBADD= $(asm) libvid_common.la libvid_gl.la libvid_svga.la
libQFtdfx_la_DEPENDENCIES= $(asm) libvid_common.la libvid_gl.la libvid_svga.la
#
# OpenGL in Win32
@ -137,8 +137,8 @@ libQFtdfx_la_DEPENDENCIES= $(asm) libcommon.la libgl.la libsvga.la
libQFwgl_la_CFLAGS= @PREFER_NON_PIC@ $(WGL_CFLAGS)
libQFwgl_la_SOURCES= in_win.c vid_wgl.c
libQFwgl_la_LDFLAGS= -static
libQFwgl_la_LIBADD= libcommon.la libgl.la
libQFwgl_la_DEPENDENCIES= libcommon.la libgl.la
libQFwgl_la_LIBADD= libvid_common.la libvid_gl.la
libQFwgl_la_DEPENDENCIES= libvid_common.la libvid_gl.la
#
# X11 software rendering
@ -146,8 +146,8 @@ libQFwgl_la_DEPENDENCIES= libcommon.la libgl.la
libQFx11_la_CFLAGS= @PREFER_NON_PIC@ $(X_CFLAGS)
libQFx11_la_SOURCES= vid_x11.c
libQFx11_la_LDFLAGS= -static
libQFx11_la_LIBADD= libcommon.la libsw.la libx11.la
libQFx11_la_DEPENDENCIES= libcommon.la libsw.la libx11.la
libQFx11_la_LIBADD= libvid_common.la libvid_sw.la libvid_x11.la
libQFx11_la_DEPENDENCIES= libvid_common.la libvid_sw.la libvid_x11.la
# Kill the temp files, hopefully.
CLEANFILES = *.i *.s $(YACCLEX_CLEANFILES)

28
nq/source/Makefile.am
View file

@ -45,12 +45,12 @@ asm=
endif
noinst_LIBRARIES= @nq_libs@ $(asm)
EXTRA_LIBRARIES=libasm.a libclient.a libcommon.a libnet.a libsdl.a libserver.a
EXTRA_LIBRARIES=libasm.a libnq_client.a libnq_common.a libnq_net.a libnq_sdl.a libnq_server.a
libasm_a_SOURCES= worlda.S
libcommon_a_SOURCES=game.c locs.c world.c com.c
libsdl_a_SOURCES= sys_sdl.c
libsdl_a_CFLAGS= $(SDL_CFLAGS)
libnq_common_a_SOURCES=game.c locs.c world.c com.c
libnq_sdl_a_SOURCES= sys_sdl.c
libnq_sdl_a_CFLAGS= $(SDL_CFLAGS)
common_ldflags= -export-dynamic
@ -60,9 +60,9 @@ net_sources= net_win.c net_wins.c
else
net_sources= net_bsd.c net_udp.c
endif
libnet_a_SOURCES= net_dgrm.c net_loop.c net_main.c net_vcr.c $(net_sources)
libnq_net_a_SOURCES= net_dgrm.c net_loop.c net_main.c net_vcr.c $(net_sources)
EXTRA_libnet_a_SOURCES= \
EXTRA_libnq_net_a_SOURCES= \
net_dos.c net_bw.c net_bsd.c net_ipx.c net_mp.c net_win.c net_wins.c \
net_wipx.c net_udp.c
@ -82,7 +82,7 @@ server_LIBFILES= \
common_LIBFILES= \
libasm.a \
libnet.a \
libnq_net.a \
$(top_builddir)/libs/console/libQFconsole.la \
$(top_builddir)/libs/gamecode/builtins/libQFgamecode_builtins.la \
$(top_builddir)/libs/gamecode/engine/libQFgamecode.la \
@ -94,17 +94,17 @@ client_LIBS= $(client_LIBFILES) $(common_LIBFILES)
server_LIBS= $(server_LIBFILES) $(common_LIBFILES) $(NET_LIBS)
server_LIB_DEPS=$(server_LIBFILES) $(common_LIBFILES)
libclient_a_SOURCES= \
libnq_client_a_SOURCES= \
cl_cam.c cl_cmd.c cl_demo.c cl_input.c cl_main.c cl_screen.c \
cl_parse.c cl_tent.c cl_view.c host_skin.c skin.c \
sbar.c
libserver_a_SOURCES= \
libnq_server_a_SOURCES= \
host.c host_cmd.c pr_cmds.c sv_cvar.c sv_main.c \
sv_move.c sv_cl_phys.c sv_phys.c sv_progs.c sv_user.c
client_libs= libserver.a libclient.a libcommon.a
server_libs = libserver.a libcommon.a
client_libs= libnq_server.a libnq_client.a libnq_common.a
server_libs = libnq_server.a libnq_common.a
# Software-rendering targets
@ -138,7 +138,7 @@ nq_mgl_DEPENDENCIES= $(nq_mgl_libs)
# ... SDL, version 1.2 and higher
nq_sdl_libs= \
libsdl.a \
libnq_sdl.a \
$(client_libs) \
$(cl_plugin_LIBS) \
$(soft_QFLIBS) \
@ -151,7 +151,7 @@ nq_sdl_DEPENDENCIES= $(nq_sdl_libs)
# ... 32-bit software, SDL
nq_sdl32_libs= \
libsdl.a \
libnq_sdl.a \
$(client_libs) \
$(cl_plugin_LIBS) \
$(top_builddir)/libs/video/renderer/libQFrenderer_sw32.la \
@ -223,7 +223,7 @@ nq_glx_DEPENDENCIES= $(nq_glx_libs)
# ... Simple Directmedia Layer, version 1.2 and higher, in GL mode
nq_sgl_libs= \
libsdl.a \
libnq_sdl.a \
$(client_libs) \
$(cl_plugin_LIBS) \
$(opengl_QFLIBS) \

38
qw/source/Makefile.am
View file

@ -46,13 +46,13 @@ asm=
endif
noinst_LIBRARIES= @qw_libs@ $(asm)
EXTRA_LIBRARIES=libasm.a libclient.a libcommon.a libnet.a libsdl.a libserver.a
EXTRA_LIBRARIES=libasm.a libqw_client.a libqw_common.a libqw_net.a libqw_sdl.a libqw_server.a
libasm_a_SOURCES= worlda.S
libcommon_a_SOURCES= com.c game.c msg_ucmd.c pmove.c pmovetst.c net_packetlog.c
libsdl_a_SOURCES=cl_sys_sdl.c
libsdl_a_CFLAGS=$(SDL_CFLAGS)
libqw_common_a_SOURCES= com.c game.c msg_ucmd.c pmove.c pmovetst.c net_packetlog.c
libqw_sdl_a_SOURCES=cl_sys_sdl.c
libqw_sdl_a_CFLAGS=$(SDL_CFLAGS)
common_ldflags= -export-dynamic
@ -64,8 +64,8 @@ ipvX_src= $(ipv6_src)
else
ipvX_src= $(ipv4_src)
endif
libnet_a_SOURCES= net_chan.c $(ipvX_src)
EXTRA_libnet_a_SOURCES= $(ipv4_src) $(ipv6_src)
libqw_net_a_SOURCES= net_chan.c $(ipvX_src)
EXTRA_libqw_net_a_SOURCES= $(ipv4_src) $(ipv6_src)
# Server builds
#
@ -78,7 +78,7 @@ endif
EXTRA_DIST=sv_sys_win.c sv_sys_unix.c
libserver_a_SOURCES= \
libqw_server_a_SOURCES= \
crudefile.c sv_ccmds.c sv_demo.c sv_ents.c sv_init.c sv_main.c \
sv_move.c sv_nchan.c sv_phys.c sv_pr_cmds.c sv_progs.c sv_send.c \
sv_user.c world.c $(syssv_SRC)
@ -94,9 +94,9 @@ qf_server_LIBS= \
$(top_builddir)/libs/gib/libQFgib.la
qw_server_SOURCES= sv_model.c
qw_server_LDADD= libserver.a libcommon.a libnet.a libasm.a $(qf_server_LIBS) $(NET_LIBS) $(DL_LIBS) $(CURSES_LIBS)
qw_server_LDADD= libqw_server.a libqw_common.a libqw_net.a libasm.a $(qf_server_LIBS) $(NET_LIBS) $(DL_LIBS) $(CURSES_LIBS)
qw_server_LDFLAGS= $(common_ldflags)
qw_server_DEPENDENCIES= libcommon.a libserver.a libnet.a libasm.a $(qf_server_LIBS)
qw_server_DEPENDENCIES= libqw_common.a libqw_server.a libqw_net.a libasm.a $(qf_server_LIBS)
qw_master_SOURCES= master.c
qw_master_LDADD= $(top_builddir)/libs/util/libQFutil.la $(NET_LIBS)
@ -116,10 +116,10 @@ qf_client_LIBS= \
$(top_builddir)/libs/util/libQFutil.la \
$(top_builddir)/libs/gib/libQFgib.la
client_LIBS= libnet.a libasm.a $(qf_client_LIBS)
client_libs= libclient.a libcommon.a
client_LIBS= libqw_net.a libasm.a $(qf_client_LIBS)
client_libs= libqw_client.a libqw_common.a
libclient_a_SOURCES= \
libqw_client_a_SOURCES= \
cl_cam.c cl_cmd.c cl_cvar.c cl_demo.c cl_ents.c cl_input.c \
cl_main.c cl_ngraph.c cl_parse.c cl_pred.c \
cl_screen.c cl_skin.c cl_slist.c cl_tent.c cl_view.c \
@ -157,20 +157,20 @@ qw_client_mgl_DEPENDENCIES= $(qw_client_mgl_libs)
# ... Simple DirectMedia Layer, version 1.2 and higher
qw_client_sdl_libs= \
libsdl.a \
libqw_sdl.a \
$(client_libs) \
$(cl_plugin_LIBS) \
$(soft_LIBS) \
$(top_builddir)/libs/video/targets/libQFsdl.la \
$(client_LIBS)
qw_client_sdl_SOURCES=sdl_link.c
qw_client_sdl_LDADD= libsdl.a $(qw_client_sdl_libs) $(SDL_LIBS) $(NET_LIBS)
qw_client_sdl_LDADD= libqw_sdl.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)
qw_client_sdl_DEPENDENCIES= libqw_sdl.a $(qw_client_sdl_libs)
# ... 32-bit software, SDL
qw_client_sdl32_libs= \
libsdl.a \
libqw_sdl.a \
$(client_libs) \
$(cl_plugin_LIBS) \
$(top_builddir)/libs/video/renderer/libQFrenderer_sw32.la \
@ -178,9 +178,9 @@ qw_client_sdl32_libs= \
$(top_builddir)/libs/video/targets/libQFsdl32.la \
$(client_LIBS)
qw_client_sdl32_SOURCES=sdl_link.c
qw_client_sdl32_LDADD= libsdl.a $(qw_client_sdl32_libs) $(SDL_LIBS) $(NET_LIBS)
qw_client_sdl32_LDADD= libqw_sdl.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)
qw_client_sdl32_DEPENDENCIES= libqw_sdl.a $(qw_client_sdl32_libs)
# ... Linux SVGAlib
qw_client_svga_libs= \
@ -242,7 +242,7 @@ qw_client_3dfx_DEPENDENCIES= $(qw_client_3dfx_libs)
# ... Simple DirectMedia Layer, version 1.2 and higher, in GL mode
qw_client_sgl_libs= \
libsdl.a \
libqw_sdl.a \
$(client_libs) \
$(cl_plugin_LIBS) \
$(opengl_LIBS) \