Use system getopt_long() when available.
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@3097 8092fc87-c524-0410-9efc-e669fe64eaf9
This commit is contained in:
@@ -1,4 +1,5 @@
|
|||||||
Changes towards version 0.7:
|
Changes towards version 0.7:
|
||||||
|
- Use system getopt_long() when available - SvdB
|
||||||
- Added --addondir commandline option - Mika
|
- Added --addondir commandline option - Mika
|
||||||
- Case insensitive matching when looking for .zip/.uqm/.rmp files - SvdB
|
- Case insensitive matching when looking for .zip/.uqm/.rmp files - SvdB
|
||||||
- Added read-ahead buffering when reading zip index files. - SvdB
|
- Added read-ahead buffering when reading zip index files. - SvdB
|
||||||
|
|||||||
+4
-3
@@ -40,6 +40,7 @@ uqm_INSTALL_SHAREDIR='@INSTALL_SHAREDIR@'
|
|||||||
uqm_SOUNDMODULE='@SOUNDMODULE@'
|
uqm_SOUNDMODULE='@SOUNDMODULE@'
|
||||||
uqm_OGGVORBIS='@OGGVORBIS@'
|
uqm_OGGVORBIS='@OGGVORBIS@'
|
||||||
uqm_USE_INTERNAL_MIKMOD='@USE_INTERNAL_MIKMOD@'
|
uqm_USE_INTERNAL_MIKMOD='@USE_INTERNAL_MIKMOD@'
|
||||||
|
uqm_HAVE_GETOPT_LONG='@HAVE_GETOPT_LONG@'
|
||||||
uqm_HAVE_REGEX='@HAVE_REGEX_H_FLAG@'
|
uqm_HAVE_REGEX='@HAVE_REGEX_H_FLAG@'
|
||||||
uqm_HAVE_OPENGL='@HAVE_OPENGL@'
|
uqm_HAVE_OPENGL='@HAVE_OPENGL@'
|
||||||
uqm_USE_ZIP_IO='@USE_ZIP_IO@'
|
uqm_USE_ZIP_IO='@USE_ZIP_IO@'
|
||||||
@@ -52,7 +53,7 @@ MACRO_WIN32='@MACRO_WIN32@'
|
|||||||
MACRO___MINGW32__='@MACRO___MINGW32__@'
|
MACRO___MINGW32__='@MACRO___MINGW32__@'
|
||||||
export BUILD_SYSTEM HOST_SYSTEM DEBUG
|
export BUILD_SYSTEM HOST_SYSTEM DEBUG
|
||||||
export MACRO_WIN32 MACRO___MINGW32__
|
export MACRO_WIN32 MACRO___MINGW32__
|
||||||
export uqm_SOUNDMODULE uqm_USE_INTERNAL_MIKMOD uqm_HAVE_REGEX uqm_USE_WINSOCK
|
export uqm_SOUNDMODULE uqm_USE_INTERNAL_MIKMOD uqm_HAVE_GETOPT_LONG
|
||||||
export uqm_HAVE_OPENGL uqm_USE_ZIP_IO uqm_USE_PLATFORM_ACCEL uqm_THREADLIB
|
export uqm_HAVE_REGEX uqm_USE_WINSOCK uqm_HAVE_OPENGL uqm_USE_ZIP_IO
|
||||||
export uqm_NETPLAY
|
export uqm_USE_PLATFORM_ACCEL uqm_THREADLIB uqm_NETPLAY
|
||||||
|
|
||||||
|
|||||||
@@ -432,8 +432,8 @@ uqm_process_config() {
|
|||||||
PREPROC_OBJC MKDEP_OBJC COMPILE_OBJC \
|
PREPROC_OBJC MKDEP_OBJC COMPILE_OBJC \
|
||||||
MAKE ECHON SED DEBUG JOYSTICK NETPLAY \
|
MAKE ECHON SED DEBUG JOYSTICK NETPLAY \
|
||||||
OGGVORBIS SOUNDMODULE USE_INTERNAL_MIKMOD \
|
OGGVORBIS SOUNDMODULE USE_INTERNAL_MIKMOD \
|
||||||
HAVE_OPENGL HAVE_REGEX_H_FLAG USE_ZIP_IO \
|
HAVE_OPENGL HAVE_GETOPT_LONG HAVE_REGEX_H_FLAG \
|
||||||
USE_PLATFORM_ACCEL THREADLIB USE_WINSOCK \
|
USE_ZIP_IO USE_PLATFORM_ACCEL THREADLIB USE_WINSOCK \
|
||||||
INSTALL_LIBDIR INSTALL_BINDIR INSTALL_SHAREDIR \
|
INSTALL_LIBDIR INSTALL_BINDIR INSTALL_SHAREDIR \
|
||||||
REZ WINDRES $HAVE_SYMBOLS"
|
REZ WINDRES $HAVE_SYMBOLS"
|
||||||
SUBSTITUTE_FILES="build.vars"
|
SUBSTITUTE_FILES="build.vars"
|
||||||
|
|||||||
+2
-6
@@ -1,12 +1,8 @@
|
|||||||
uqm_SUBDIRS="sc2code res"
|
uqm_SUBDIRS="sc2code res"
|
||||||
|
|
||||||
case "$HOST_SYSTEM" in
|
if [ "$uqm_HAVE_GETOPT_LONG" = 0 ]; then
|
||||||
ARMV5|GCCE|WINSCW)
|
|
||||||
;;
|
|
||||||
*)
|
|
||||||
uqm_SUBDIRS="$uqm_SUBDIRS getopt"
|
uqm_SUBDIRS="$uqm_SUBDIRS getopt"
|
||||||
;;
|
fi
|
||||||
esac
|
|
||||||
|
|
||||||
case "$HOST_SYSTEM" in
|
case "$HOST_SYSTEM" in
|
||||||
Darwin)
|
Darwin)
|
||||||
|
|||||||
Reference in New Issue
Block a user