From 311cbdbe590b5c0bc2b632f809b3dfaf8e08f183 Mon Sep 17 00:00:00 2001 From: Adam Olsen Date: Mon, 16 Apr 2001 17:45:35 +0000 Subject: [PATCH] Fix so building statically (--disable-shared) works. --- nq/source/Makefile.am | 20 ++++++++++---------- qw/source/Makefile.am | 21 +++++++++++---------- 2 files changed, 21 insertions(+), 20 deletions(-) diff --git a/nq/source/Makefile.am b/nq/source/Makefile.am index 27b25a8fb..a28a27948 100644 --- a/nq/source/Makefile.am +++ b/nq/source/Makefile.am @@ -71,9 +71,9 @@ client_LIBS= $(top_builddir)/libs/gamecode/libQFgamecode.la \ $(top_builddir)/libs/util/libQFutil.la \ $(top_builddir)/libs/audio/cd/libQFcd.la \ $(top_builddir)/libs/audio/targets/libQFsound.la \ - $(top_builddir)/libs/video/targets/libQFjs.la \ -L. -lqfnet $(SOUND_LIBS) $(NET_LIBS) client_LIB_DEPS= libqfnet.a +client_POST_LIBS= $(top_builddir)/libs/video/targets/libQFjs.la client_SOURCES= cl_cam.c cl_cmd.c cl_demo.c cl_input.c cl_main.c cl_parse.c \ cl_tent.c console.c keys.c sbar.c r_part.c r_view.c \ @@ -98,27 +98,27 @@ soft_SOURCES= d_edge.c d_fill.c d_init.c d_modech.c d_part.c d_polyse.c \ # ... Linux FBDev nq_fbdev_SOURCES= $(combined_SOURCES) $(soft_SOURCES) -nq_fbdev_LDADD= $(client_LIBS) ../../libs/video/targets/libQFfbdev.la +nq_fbdev_LDADD= $(client_LIBS) ../../libs/video/targets/libQFfbdev.la $(client_POST_LIBS) nq_fbdev_DEPENDENCIES= $(client_LIB_DEPS) # ... SciTech MGL nq_mgl_SOURCES= $(combined_SOURCES) $(soft_SOURCES) -nq_mgl_LDADD= $(client_LIBS) $(MGL_LIBS) ../../libs/video/targets/libQFmgl.la +nq_mgl_LDADD= $(client_LIBS) $(MGL_LIBS) ../../libs/video/targets/libQFmgl.la $(client_POST_LIBS) nq_mgl_DEPENDENCIES=$(client_LIB_DEPS) # ... Sam Lantinga's Simple DirectMedia Layer, version 1.0 and higher nq_sdl_SOURCES= $(combined_SOURCES) $(soft_SOURCES) -nq_sdl_LDADD= $(client_LIBS) $(SDL_LIBS) ../../libs/video/targets/libQFsdl.la +nq_sdl_LDADD= $(client_LIBS) $(SDL_LIBS) ../../libs/video/targets/libQFsdl.la $(client_POST_LIBS) nq_sdl_DEPENDENCIES=$(client_LIB_DEPS) # ... Linux SVGAlib nq_svga_SOURCES= $(combined_SOURCES) $(soft_SOURCES) -nq_svga_LDADD= $(client_LIBS) $(SVGA_LIBS) ../../libs/video/targets/libQFsvga.la +nq_svga_LDADD= $(client_LIBS) $(SVGA_LIBS) ../../libs/video/targets/libQFsvga.la $(client_POST_LIBS) nq_svga_DEPENDENCIES=$(client_LIB_DEPS) # ... X11 nq_x11_SOURCES= $(combined_SOURCES) $(soft_SOURCES) -nq_x11_LDADD= $(client_LIBS) $(X_PRE_LIBS) $(VIDMODE_LIBS) $(DGA_LIBS) $(X_LIBS) -lX11 $(X_EXTRA_LIBS) $(X_SHM_LIB) ../../libs/video/targets/libQFx11.la +nq_x11_LDADD= $(client_LIBS) $(X_PRE_LIBS) $(VIDMODE_LIBS) $(DGA_LIBS) $(X_LIBS) -lX11 $(X_EXTRA_LIBS) $(X_SHM_LIB) ../../libs/video/targets/libQFx11.la $(client_POST_LIBS) nq_x11_DEPENDENCIES=$(client_LIB_DEPS) @@ -131,23 +131,23 @@ ogl_SOURCES= gl_draw.c gl_mesh.c gl_part.c gl_refrag.c gl_rlight.c \ # ... 3Dfx Voodoo 1 and 2 SVGAlib-based console GL nq_3dfx_SOURCES= $(combined_SOURCES) $(ogl_SOURCES) -nq_3dfx_LDADD= $(client_LIBS) $(TDFXGL_LIBS) $(SVGA_LIBS) $(DL_LIBS) ../../libs/video/targets/libQFtdfx.la +nq_3dfx_LDADD= $(client_LIBS) $(TDFXGL_LIBS) $(SVGA_LIBS) $(DL_LIBS) ../../libs/video/targets/libQFtdfx.la $(client_POST_LIBS) nq_3dfx_DEPENDENCIES=$(client_LIB_DEPS) # ... OpenGL in X Window nq_glx_SOURCES= $(combined_SOURCES) $(ogl_SOURCES) -nq_glx_LDADD= $(client_LIBS) $(GLX_LIBS) $(X_PRE_LIBS) $(VIDMODE_LIBS) $(DGA_LIBS) $(X_LIBS) -lX11 $(X_EXTRA_LIBS) $(DL_LIBS) ../../libs/video/targets/libQFglx.la +nq_glx_LDADD= $(client_LIBS) $(GLX_LIBS) $(X_PRE_LIBS) $(VIDMODE_LIBS) $(DGA_LIBS) $(X_LIBS) -lX11 $(X_EXTRA_LIBS) $(DL_LIBS) ../../libs/video/targets/libQFglx.la $(client_POST_LIBS) nq_glx_DEPENDENCIES= $(client_LIB_DEPS) # ... Simple Directmedia Layer, version 1.1 and higher, in GL mode nq_sgl_SOURCES= $(combined_SOURCES) $(ogl_SOURCES) -nq_sgl_LDADD= $(client_LIBS) $(X_LIBS) $(SDL_LIBS) $(GLX_LIBS) $(DL_LIBS) ../../libs/video/targets/libQFsgl.la +nq_sgl_LDADD= $(client_LIBS) $(X_LIBS) $(SDL_LIBS) $(GLX_LIBS) $(DL_LIBS) ../../libs/video/targets/libQFsgl.la $(client_POST_LIBS) nq_sgl_DEPENDENCIES= $(client_LIB_DEPS) # ... SGI/Microsoft WGL (Windows OpenGL) nq_wgl_SOURCES= $(combined_SOURCES) $(ogl_SOURCES) conproc.c -nq_wgl_LDADD= $(client_LIBS) $(GLX_LIBS) ../../libs/video/targets/libQFwgl.la -lgdi32 -lcomctl32 +nq_wgl_LDADD= $(client_LIBS) $(GLX_LIBS) ../../libs/video/targets/libQFwgl.la -lgdi32 -lcomctl32 $(client_POST_LIBS) nq_wgl_DEPENDENCIES= $(client_LIB_DEPS) # Dedicated Server diff --git a/qw/source/Makefile.am b/qw/source/Makefile.am index 574d8cc61..450eefe11 100644 --- a/qw/source/Makefile.am +++ b/qw/source/Makefile.am @@ -98,10 +98,11 @@ CLIENT_LIBS= $(top_builddir)/libs/util/libQFutil.la \ $(top_builddir)/libs/gamecode/libQFgamecode.la \ $(top_builddir)/libs/audio/cd/libQFcd.la \ $(top_builddir)/libs/audio/targets/libQFsound.la \ - $(top_builddir)/libs/video/targets/libQFjs.la \ -L. -lqfnet \ $(SOUND_LIBS) $(NET_LIBS) CLIENT_LIB_DEPS= libqfnet.a +CLIENT_POST_LIBS=$(top_builddir)/libs/video/targets/libQFjs.la +# libQFjs is seperate because it needs to be linked after when building statically if ASM_ARCH client_ASM= cl_math.S @@ -131,27 +132,27 @@ soft_SOURCES= d_edge.c d_fill.c d_init.c d_modech.c \ # ... Linux FBDev qw_client_fbdev_SOURCES= $(common_SOURCES) $(client_SOURCES) $(soft_SOURCES) -qw_client_fbdev_LDADD= $(CLIENT_LIBS) ../../libs/video/targets/libQFfbdev.la +qw_client_fbdev_LDADD= $(CLIENT_LIBS) ../../libs/video/targets/libQFfbdev.la $(CLIENT_POST_LIBS) qw_client_fbdev_DEPENDENCIES= $(CLIENT_LIB_DEPS) # ... SciTech MGL qw_client_mgl_SOURCES= $(common_SOURCES) $(client_SOURCES) $(soft_SOURCES) -qw_client_mgl_LDADD= $(MGL_LIBS) $(CLIENT_LIBS) ../../libs/video/targets/libQFmgl.la +qw_client_mgl_LDADD= $(MGL_LIBS) $(CLIENT_LIBS) ../../libs/video/targets/libQFmgl.la $(CLIENT_POST_LIBS) qw_client_mgl_DEPENDENCIES= $(CLIENT_LIB_DEPS) # ... Simple DirectMedia Layer, version 1.0 and higher qw_client_sdl_SOURCES= $(common_SOURCES) $(client_SOURCES) $(soft_SOURCES) -qw_client_sdl_LDADD= $(SDL_LIBS) $(CLIENT_LIBS) ../../libs/video/targets/libQFsdl.la +qw_client_sdl_LDADD= $(SDL_LIBS) $(CLIENT_LIBS) ../../libs/video/targets/libQFsdl.la $(CLIENT_POST_LIBS) qw_client_sdl_DEPENDENCIES= $(CLIENT_LIB_DEPS) # ... Linux SVGAlib qw_client_svga_SOURCES= $(common_SOURCES) $(client_SOURCES) $(soft_SOURCES) -qw_client_svga_LDADD= $(SVGA_LIBS) $(CLIENT_LIBS) ../../libs/video/targets/libQFsvga.la +qw_client_svga_LDADD= $(SVGA_LIBS) $(CLIENT_LIBS) ../../libs/video/targets/libQFsvga.la $(CLIENT_POST_LIBS) qw_client_svga_DEPENDENCIES= $(CLIENT_LIB_DEPS) # ... X11 qw_client_x11_SOURCES= $(common_SOURCES) $(client_SOURCES) $(soft_SOURCES) -qw_client_x11_LDADD= $(X_PRE_LIBS) $(VIDMODE_LIBS) $(DGA_LIBS) $(X_LIBS) -lX11 $(X_EXTRA_LIBS) $(X_SHM_LIB) $(CLIENT_LIBS) ../../libs/video/targets/libQFx11.la +qw_client_x11_LDADD= $(X_PRE_LIBS) $(VIDMODE_LIBS) $(DGA_LIBS) $(X_LIBS) -lX11 $(X_EXTRA_LIBS) $(X_SHM_LIB) $(CLIENT_LIBS) ../../libs/video/targets/libQFx11.la $(CLIENT_POST_LIBS) qw_client_x11_DEPENDENCIES= $(CLIENT_LIB_DEPS) @@ -167,22 +168,22 @@ ogl_SOURCES= noisetextures.c gl_textures.c gl_draw.c gl_dyn_fires.c \ # ... 3Dfx Voodoo 1 and 2 SVGAlib-based console GL qw_client_3dfx_SOURCES= $(common_SOURCES) $(client_SOURCES) $(ogl_SOURCES) -qw_client_3dfx_LDADD= $(TDFXGL_LIBS) $(SVGA_LIBS) $(CLIENT_LIBS) $(DL_LIBS) ../../libs/video/targets/libQFtdfx.la +qw_client_3dfx_LDADD= $(TDFXGL_LIBS) $(SVGA_LIBS) $(CLIENT_LIBS) $(DL_LIBS) ../../libs/video/targets/libQFtdfx.la $(CLIENT_POST_LIBS) qw_client_3dfx_DEPENDENCIES= $(CLIENT_LIB_DEPS) # ... OpenGL in X Window qw_client_glx_SOURCES= $(common_SOURCES) $(client_SOURCES) $(ogl_SOURCES) -qw_client_glx_LDADD= $(GLX_LIBS) $(X_PRE_LIBS) $(VIDMODE_LIBS) $(DGA_LIBS) $(X_LIBS) -lX11 $(X_EXTRA_LIBS) $(CLIENT_LIBS) $(DL_LIBS) ../../libs/video/targets/libQFglx.la +qw_client_glx_LDADD= $(GLX_LIBS) $(X_PRE_LIBS) $(VIDMODE_LIBS) $(DGA_LIBS) $(X_LIBS) -lX11 $(X_EXTRA_LIBS) $(CLIENT_LIBS) $(DL_LIBS) ../../libs/video/targets/libQFglx.la $(CLIENT_POST_LIBS) qw_client_glx_DEPENDENCIES= $(CLIENT_LIB_DEPS) # ... Simple DirectMedia Layer, version 1.1 and higher, in GL mode qw_client_sgl_SOURCES= $(common_SOURCES) $(client_SOURCES) $(ogl_SOURCES) -qw_client_sgl_LDADD= $(SDL_LIBS) $(X_LIBS) $(GLX_LIBS) $(CLIENT_LIBS) $(DL_LIBS) ../../libs/video/targets/libQFsgl.la +qw_client_sgl_LDADD= $(SDL_LIBS) $(X_LIBS) $(GLX_LIBS) $(CLIENT_LIBS) $(DL_LIBS) ../../libs/video/targets/libQFsgl.la $(CLIENT_POST_LIBS) qw_client_sgl_DEPENDENCIES= $(CLIENT_LIB_DEPS) # ... SGI/Microsoft WGL (Windows OpenGL) qw_client_wgl_SOURCES= $(common_SOURCES) $(client_SOURCES) $(ogl_SOURCES) -qw_client_wgl_LDADD= $(CLIENT_LIBS) $(GLX_LIBS) ../../libs/video/targets/libQFwgl.la -lgdi32 +qw_client_wgl_LDADD= $(CLIENT_LIBS) $(GLX_LIBS) ../../libs/video/targets/libQFwgl.la -lgdi32 $(CLIENT_POST_LIBS) qw_client_wgl_DEPENDENCIES= $(CLIENT_LIB_DEPS) # Stuff that doesn't get linked into an executable NEEDS to be mentioned here,