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

Most of the current WIN32_LIBS and WIN32_PRE_LIBS are only required because we choose to compile statically. 

So they should be pulled in where static compilation is choosen: Via settings LIBS for configure in the __BUILD_SCRIPT, eg.


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3362 4a71c877-e1ca-e34f-864e-861f7616d084
master
Dennis Schridde 2008-01-05 20:41:39 +00:00
parent 8e115eca6e
commit e5babd8ba5
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
configure.ac
View File

@ -50,9 +50,7 @@ case ${host_os} in
*mingw32*) *mingw32*)
host_os_mingw32=yes host_os_mingw32=yes
AC_CHECK_TOOL([WINDRES], [windres], AC_MSG_ERROR([windres not found])) AC_CHECK_TOOL([WINDRES], [windres], AC_MSG_ERROR([windres not found]))
WIN32_PRE_LIBS='-lmingw32 -lSDLmain' WIN32_LIBS='-lintl -ldbghelp -lshfolder -lwinmm -lwsock32'
AC_SUBST([WIN32_PRE_LIBS], [${WIN32_PRE_LIBS}])
WIN32_LIBS='-lz -lintl -liconv -lfreetype -lfontconfig -lexpat -ldbghelp -lshfolder -lgdi32 -lwinmm -lwsock32'
AC_SUBST([WIN32_LIBS], [${WIN32_LIBS}]) AC_SUBST([WIN32_LIBS], [${WIN32_LIBS}])
;; ;;
*) *)
@ -186,11 +184,11 @@ PKG_CHECK_MODULES([OGGVORBIS], [ogg >= 1.1 vorbis >= 1.1 vorbisfile >= 1.1])
# Look for Popt # Look for Popt
AC_CHECK_HEADER(popt.h, , AC_MSG_ERROR([Popt header not found.])) AC_CHECK_HEADER(popt.h, , AC_MSG_ERROR([Popt header not found.]))
AC_CHECK_LIB(popt, poptGetContext, AC_SUBST([POPT_LIBS], [-lpopt]), AC_MSG_ERROR([Popt not found.]), [${WIN32_LIBS}]) AC_CHECK_LIB(popt, poptGetContext, AC_SUBST([POPT_LIBS], [-lpopt]), AC_MSG_ERROR([Popt not found.]))
# Look for PhysicsFS # Look for PhysicsFS
AC_CHECK_HEADER(physfs.h, , AC_MSG_ERROR([PhysicsFS header not found.])) AC_CHECK_HEADER(physfs.h, , AC_MSG_ERROR([PhysicsFS header not found.]))
AC_CHECK_LIB(physfs, PHYSFS_init, AC_SUBST([PHYSFS_LIBS], [-lphysfs]), AC_MSG_ERROR([PhysicsFS not found.]), [${WIN32_LIBS}]) AC_CHECK_LIB(physfs, PHYSFS_init, AC_SUBST([PHYSFS_LIBS], [-lphysfs]), AC_MSG_ERROR([PhysicsFS not found.]))
# Look for SDL_net # Look for SDL_net
AC_CHECK_HEADER(SDL/SDL_net.h, , AC_MSG_ERROR([SDL_net header not found.])) AC_CHECK_HEADER(SDL/SDL_net.h, , AC_MSG_ERROR([SDL_net header not found.]))