qf/quake2forge
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/quake2forge synced 2024-12-12 13:42:21 +00:00
Code Issues Projects Releases Packages Wiki Activity

when linking, libs should go in *_LDADD rather than *_LDFLAGS as LDADD gets

Browse source 
added /after/ the object files, but LDFLAGS /before/ the object files
This commit is contained in:
Bill Currie 2002-04-08 05:42:08 +00:00
parent c17021f01b
commit 4ef52da08a
2 changed files with 18 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
configure.in
View file

@ -75,6 +75,9 @@ ASFLAGS="\$(DEFS) \$(CFLAGS) \$(CPPFLAGS) \$(DEFAULT_INCLUDES) \$(INCLUDES)"
AC_SUBST(AS) AC_SUBST(AS)
AC_SUBST(ASFLAGS) AC_SUBST(ASFLAGS)
SDL_FLAGS=`sdl-config --libs`
AC_SUBST(SDL_FLAGS)
AC_CONFIG_FILES([Makefile AC_CONFIG_FILES([Makefile
src/Makefile src/Makefile
src/baseq2/Makefile src/baseq2/Makefile

22
src/Makefile.am
View file

@ -1,8 +1,8 @@
# $Id$ # $Id$
# swap comments to build the modpacks # swap comments to build the modpacks
#SUBDIRS = . baseq2 ctf SUBDIRS = . baseq2 ctf
SUBDIRS = . baseq2 ctf xatrix rogue #SUBDIRS = . baseq2 ctf xatrix rogue
bin_PROGRAMS = quake2 \ bin_PROGRAMS = quake2 \
ref_soft.so ref_softx.so ref_softsdl.so \ ref_soft.so ref_softx.so ref_softsdl.so \
@ -101,14 +101,22 @@ AM_CFLAGS = -Wall -Werror -pipe -I/usr/X11R6/include $(shell sdl-config --cflags
quake2_LDFLAGS = -lm -ldl -lpthread quake2_LDFLAGS = -lm -ldl -lpthread
ref_glx_so_LDFLAGS = -shared -L/usr/X11R6/lib -lX11 -lXext -lXxf86dga -lXxf86vm ref_glx_so_LDFLAGS = -shared
ref_glx_so_LDADD = -L/usr/X11R6/lib -lX11 -lXext -lXxf86dga -lXxf86vm -lGL
#ref_gl_so_LDFLAGS = -shared -L/usr/local/glide/lib -L/usr/X11R6/lib -L/usr/local/lib -lX11 -lXext -lGL -lvga #ref_gl_so_LDFLAGS = -shared -L/usr/local/glide/lib -L/usr/X11R6/lib -L/usr/local/lib -lX11 -lXext -lGL -lvga
#ref_gl_so_LDFADD = -L/usr/local/glide/lib -L/usr/X11R6/lib -L/usr/local/lib -lX11 -lXext -lGL -lvga
ref_sdlgl_so_LDFLAGS = -shared $(shell sdl-config --libs) sdl_flags = @SDL_FLAGS@
ref_soft_so_LDFLAGS = -shared -lvga ref_sdlgl_so_LDFLAGS = -shared
ref_sdlgl_so_LDADD = $(sdl_flags)
ref_softx_so_LDFLAGS = -shared -L/usr/X11R6/lib -lX11 -lXext -lXxf86dga -lXxf86vm ref_soft_so_LDFLAGS = -shared
ref_soft_so_LDADD = -lvga
ref_softsdl_so_LDFLAGS = -shared $(shell sdl-config --libs) ref_softx_so_LDFLAGS = -shared
ref_softx_so_LDADD = -L/usr/X11R6/lib -lX11 -lXext -lXxf86dga -lXxf86vm
ref_softsdl_so_LDFLAGS = -shared
ref_softsdl_so_LDADD = $(sdl_flags)