Ginger88895
/
warzone2100
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Proper linking order 

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2699 4a71c877-e1ca-e34f-864e-861f7616d084
master
Dennis Schridde 2007-11-03 22:13:35 +00:00
parent 2d94849fbc
commit f851174e8e
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
configure.ac
View File

@ -168,7 +168,7 @@ AC_CHECK_LIB(physfs, PHYSFS_init, AC_SUBST([PHYSFS_LIBS], [-lphysfs]), AC_MSG_ER
# Look for SDL_net
AC_CHECK_HEADER(SDL/SDL_net.h, , AC_MSG_ERROR([SDL_net header not found.]))
AC_CHECK_LIB(SDL_net, SDLNet_Init, AC_SUBST([SDL_NET_LIBS], [-lSDL_net]), AC_MSG_ERROR([SDL_net not found.]), [-lSDL ${WIN32_LIBS}])
AC_CHECK_LIB(SDL_net, SDLNet_Init, AC_SUBST([SDL_NET_LIBS], [-lSDL_net]), AC_MSG_ERROR([SDL_net not found.]), [${SDL_LIBS} ${WIN32_LIBS}])
# Look for OpenGL
AC_CHECK_HEADER(SDL/SDL_opengl.h, ,

4
src/Makefile.am
View File

@ -49,7 +49,6 @@ warzone2100_SOURCES = scriptvals_parser.tab.c scriptvals_lexer.lex.c \
target.c warzoneconfig.c
warzone2100_LDADD = \
$(SDL_LIBS) $(SDL_NET_LIBS) $(PHYSFS_LIBS) $(PNG_LIBS) $(OGGVORBIS_LIBS) $(OPENGL_LIBS) $(OPENGLC_LIBS) $(OPENAL_LIBS) \
$(top_builddir)/lib/widget/libwidget.a \
$(top_builddir)/lib/sequence/libsequence.a \
$(top_builddir)/lib/sound/libsound.a \
@ -58,7 +57,8 @@ warzone2100_LDADD = \
$(top_builddir)/lib/ivis_opengl/libivis_opengl.a \
$(top_builddir)/lib/ivis_common/libivis_common.a \
$(top_builddir)/lib/gamelib/libgamelib.a \
$(top_builddir)/lib/framework/libframework.a
$(top_builddir)/lib/framework/libframework.a \
$(SDL_LIBS) $(SDL_NET_LIBS) $(PHYSFS_LIBS) $(PNG_LIBS) $(OGGVORBIS_LIBS) $(OPENAL_LIBS) $(OPENGLC_LIBS) $(OPENGL_LIBS)
if MINGW32
warzone2100_LDADD += $(top_builddir)/win32/warzone2100.o