From d03e28a034c509947c6c7a050ea4955bdb572b16 Mon Sep 17 00:00:00 2001 From: Bill Currie Date: Thu, 10 May 2001 16:29:11 +0000 Subject: [PATCH] correct the link order of the libs --- nq/source/Makefile.am | 16 ++++++++-------- qw/source/Makefile.am | 22 +++++++++++----------- 2 files changed, 19 insertions(+), 19 deletions(-) diff --git a/nq/source/Makefile.am b/nq/source/Makefile.am index 1f3f336d3..842f6cbe9 100644 --- a/nq/source/Makefile.am +++ b/nq/source/Makefile.am @@ -93,22 +93,22 @@ 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/models/libQFmodels_sw.la ../../libs/video/targets/libQFfbdev.la $(client_POST_LIBS) +nq_fbdev_LDADD= ../../libs/models/libQFmodels_sw.la $(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/models/libQFmodels_sw.la ../../libs/video/targets/libQFmgl.la $(client_POST_LIBS) +nq_mgl_LDADD= ../../libs/models/libQFmodels_sw.la $(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/models/libQFmodels_sw.la ../../libs/video/targets/libQFsdl.la $(client_POST_LIBS) +nq_sdl_LDADD= ../../libs/models/libQFmodels_sw.la $(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/models/libQFmodels_sw.la ../../libs/video/targets/libQFsvga.la $(client_POST_LIBS) +nq_svga_LDADD= ../../libs/models/libQFmodels_sw.la $(client_LIBS) $(SVGA_LIBS) ../../libs/video/targets/libQFsvga.la $(client_POST_LIBS) nq_svga_DEPENDENCIES=$(client_LIB_DEPS) # ... X11 @@ -126,23 +126,23 @@ ogl_SOURCES= noisetextures.c gl_textures.c gl_draw.c gl_dyn_fires.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/models/libQFmodels_gl.la ../../libs/video/targets/libQFtdfx.la $(client_POST_LIBS) +nq_3dfx_LDADD= ../../libs/models/libQFmodels_gl.la $(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/models/libQFmodels_gl.la ../../libs/video/targets/libQFglx.la $(client_POST_LIBS) +nq_glx_LDADD= ../../libs/models/libQFmodels_gl.la $(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/models/libQFmodels_gl.la ../../libs/video/targets/libQFsgl.la $(client_POST_LIBS) +nq_sgl_LDADD= ../../libs/models/libQFmodels_gl.la $(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) ../../libs/models/libQFmodels_gl.la ../../libs/video/targets/libQFwgl.la $(client_POST_LIBS) $(GLX_LIBS) -lgdi32 -lcomctl32 -lwinmm +nq_wgl_LDADD= ../../libs/models/libQFmodels_gl.la $(client_LIBS) ../../libs/video/targets/libQFwgl.la $(client_POST_LIBS) $(GLX_LIBS) -lgdi32 -lcomctl32 -lwinmm nq_wgl_DEPENDENCIES= $(client_LIB_DEPS) # Dedicated Server diff --git a/qw/source/Makefile.am b/qw/source/Makefile.am index 42949791b..13b0e1a3d 100644 --- a/qw/source/Makefile.am +++ b/qw/source/Makefile.am @@ -69,9 +69,9 @@ server_SOURCES= sv_ccmds.c sv_cvar.c \ sv_user.c world.c worlda.S $(syssv_SRC) qw_server_SOURCES= $(common_SOURCES) $(server_SOURCES) -qw_server_LDADD= $(top_builddir)/libs/util/libQFutil.la \ +qw_server_LDADD= $(top_builddir)/libs/models/libQFmodels.la \ $(top_builddir)/libs/gamecode/libQFgamecode.la \ - $(top_builddir)/libs/models/libQFmodels.la \ + $(top_builddir)/libs/util/libQFutil.la \ -L. -lqfnet $(NET_LIBS) $(DL_LIBS) qw_server_DEPENDENCIES= libqfnet.a @@ -115,27 +115,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/models/libQFmodels_sw.la ../../libs/video/targets/libQFfbdev.la $(client_POST_LIBS) +qw_client_fbdev_LDADD= ../../libs/models/libQFmodels_sw.la $(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/models/libQFmodels_sw.la ../../libs/video/targets/libQFmgl.la $(client_POST_LIBS) +qw_client_mgl_LDADD= $(MGL_LIBS) ../../libs/models/libQFmodels_sw.la $(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/models/libQFmodels_sw.la ../../libs/video/targets/libQFsdl.la $(client_POST_LIBS) +qw_client_sdl_LDADD= $(SDL_LIBS) ../../libs/models/libQFmodels_sw.la $(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/models/libQFmodels_sw.la ../../libs/video/targets/libQFsvga.la $(client_POST_LIBS) +qw_client_svga_LDADD= $(SVGA_LIBS) ../../libs/models/libQFmodels_sw.la $(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/models/libQFmodels_sw.la ../../libs/video/targets/libQFx11.la $(client_POST_LIBS) +qw_client_x11_LDADD= $(X_PRE_LIBS) $(VIDMODE_LIBS) $(DGA_LIBS) $(X_LIBS) -lX11 $(X_EXTRA_LIBS) $(X_SHM_LIB) ../../libs/models/libQFmodels_sw.la $(client_LIBS) ../../libs/video/targets/libQFx11.la $(client_POST_LIBS) qw_client_x11_DEPENDENCIES= $(client_LIB_DEPS) @@ -150,22 +150,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/models/libQFmodels_gl.la ../../libs/video/targets/libQFtdfx.la $(client_POST_LIBS) +qw_client_3dfx_LDADD= $(TDFXGL_LIBS) $(SVGA_LIBS) ../../libs/models/libQFmodels_gl.la $(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/models/libQFmodels_gl.la ../../libs/video/targets/libQFglx.la $(client_POST_LIBS) +qw_client_glx_LDADD= $(GLX_LIBS) $(X_PRE_LIBS) $(VIDMODE_LIBS) $(DGA_LIBS) $(X_LIBS) -lX11 $(X_EXTRA_LIBS) ../../libs/models/libQFmodels_gl.la $(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/models/libQFmodels_gl.la ../../libs/video/targets/libQFsgl.la $(client_POST_LIBS) +qw_client_sgl_LDADD= $(SDL_LIBS) $(X_LIBS) $(GLX_LIBS) ../../libs/models/libQFmodels_gl.la $(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) ../../libs/models/libQFmodels_gl.la ../../libs/video/targets/libQFwgl.la $(client_POST_LIBS) $(GLX_LIBS) -lgdi32 -lwinmm +qw_client_wgl_LDADD= ../../libs/models/libQFmodels_gl.la $(client_LIBS) ../../libs/video/targets/libQFwgl.la $(client_POST_LIBS) $(GLX_LIBS) -lgdi32 -lwinmm qw_client_wgl_DEPENDENCIES= $(client_LIB_DEPS) # Stuff that doesn't get linked into an executable NEEDS to be mentioned here,