From: <Mee...@us...> - 2008-10-18 18:57:28
|
Revision: 3097 http://sc2.svn.sourceforge.net/sc2/?rev=3097&view=rev Author: Meep-Eep Date: 2008-10-18 18:57:19 +0000 (Sat, 18 Oct 2008) Log Message: ----------- Use system getopt_long() when available. Modified Paths: -------------- trunk/sc2/ChangeLog trunk/sc2/build/unix/build.config trunk/sc2/build.vars.in trunk/sc2/src/Makeinfo Modified: trunk/sc2/ChangeLog =================================================================== --- trunk/sc2/ChangeLog 2008-10-18 17:35:09 UTC (rev 3096) +++ trunk/sc2/ChangeLog 2008-10-18 18:57:19 UTC (rev 3097) @@ -1,4 +1,5 @@ Changes towards version 0.7: +- Use system getopt_long() when available - SvdB - Added --addondir commandline option - Mika - Case insensitive matching when looking for .zip/.uqm/.rmp files - SvdB - Added read-ahead buffering when reading zip index files. - SvdB Modified: trunk/sc2/build/unix/build.config =================================================================== --- trunk/sc2/build/unix/build.config 2008-10-18 17:35:09 UTC (rev 3096) +++ trunk/sc2/build/unix/build.config 2008-10-18 18:57:19 UTC (rev 3097) @@ -432,8 +432,8 @@ PREPROC_OBJC MKDEP_OBJC COMPILE_OBJC \ MAKE ECHON SED DEBUG JOYSTICK NETPLAY \ OGGVORBIS SOUNDMODULE USE_INTERNAL_MIKMOD \ - HAVE_OPENGL HAVE_REGEX_H_FLAG USE_ZIP_IO \ - USE_PLATFORM_ACCEL THREADLIB USE_WINSOCK \ + HAVE_OPENGL HAVE_GETOPT_LONG HAVE_REGEX_H_FLAG \ + USE_ZIP_IO USE_PLATFORM_ACCEL THREADLIB USE_WINSOCK \ INSTALL_LIBDIR INSTALL_BINDIR INSTALL_SHAREDIR \ REZ WINDRES $HAVE_SYMBOLS" SUBSTITUTE_FILES="build.vars" Modified: trunk/sc2/build.vars.in =================================================================== --- trunk/sc2/build.vars.in 2008-10-18 17:35:09 UTC (rev 3096) +++ trunk/sc2/build.vars.in 2008-10-18 18:57:19 UTC (rev 3097) @@ -40,6 +40,7 @@ uqm_SOUNDMODULE='@SOUNDMODULE@' uqm_OGGVORBIS='@OGGVORBIS@' uqm_USE_INTERNAL_MIKMOD='@USE_INTERNAL_MIKMOD@' +uqm_HAVE_GETOPT_LONG='@HAVE_GETOPT_LONG@' uqm_HAVE_REGEX='@HAVE_REGEX_H_FLAG@' uqm_HAVE_OPENGL='@HAVE_OPENGL@' uqm_USE_ZIP_IO='@USE_ZIP_IO@' @@ -52,7 +53,7 @@ MACRO___MINGW32__='@MACRO___MINGW32__@' export BUILD_SYSTEM HOST_SYSTEM DEBUG export MACRO_WIN32 MACRO___MINGW32__ -export uqm_SOUNDMODULE uqm_USE_INTERNAL_MIKMOD uqm_HAVE_REGEX uqm_USE_WINSOCK -export uqm_HAVE_OPENGL uqm_USE_ZIP_IO uqm_USE_PLATFORM_ACCEL uqm_THREADLIB -export uqm_NETPLAY +export uqm_SOUNDMODULE uqm_USE_INTERNAL_MIKMOD uqm_HAVE_GETOPT_LONG +export uqm_HAVE_REGEX uqm_USE_WINSOCK uqm_HAVE_OPENGL uqm_USE_ZIP_IO +export uqm_USE_PLATFORM_ACCEL uqm_THREADLIB uqm_NETPLAY Modified: trunk/sc2/src/Makeinfo =================================================================== --- trunk/sc2/src/Makeinfo 2008-10-18 17:35:09 UTC (rev 3096) +++ trunk/sc2/src/Makeinfo 2008-10-18 18:57:19 UTC (rev 3097) @@ -1,12 +1,8 @@ uqm_SUBDIRS="sc2code res" -case "$HOST_SYSTEM" in - ARMV5|GCCE|WINSCW) - ;; - *) - uqm_SUBDIRS="$uqm_SUBDIRS getopt" - ;; -esac +if [ "$uqm_HAVE_GETOPT_LONG" = 0 ]; then + uqm_SUBDIRS="$uqm_SUBDIRS getopt" +fi case "$HOST_SYSTEM" in Darwin) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |