USE_INTERNAL_MIKMOD instead of USE_MIKMOD_INTERNAL. Some cleanups.
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@2418 8092fc87-c524-0410-9efc-e669fe64eaf9
This commit is contained in:
@@ -188,8 +188,8 @@ uqm_prepare_config()
|
||||
CHOICE_mikmod_OPTION_external_PRECOND="have_library libmikmod"
|
||||
CHOICE_mikmod_OPTION_external_ACTION=mikmod_external_action
|
||||
mikmod_external_action() {
|
||||
CFLAGS="$CFLAGS -DUSE_MIKMOD_INTERANL"
|
||||
USE_MIKMOD_INTERNAL=1
|
||||
CFLAGS="$CFLAGS -DUSE_INTERNAL_MIKMOD"
|
||||
USE_INTERNAL_MIKMOD=1
|
||||
use_library libmikmod
|
||||
}
|
||||
CHOICE_mikmod_DEFAULT=external
|
||||
@@ -308,7 +308,7 @@ uqm_process_config() {
|
||||
# Make build.vars from build.vars.in, substituting variables.
|
||||
SUBSTITUTE_VARS="BUILD_SYSTEM HOST_SYSTEM COMPILE CFLAGS LDFLAGS \
|
||||
MAKE ECHON SED DEBUG JOYSTICK \
|
||||
SOUNDMODULE USE_MIKMOD_INTERNAL \
|
||||
SOUNDMODULE USE_INTERNAL_MIKMOD \
|
||||
HAVE_OPENGL HAVE_REGEX_H_FLAG USE_ZIP_IO \
|
||||
USE_PLATFORM_ACCEL \
|
||||
INSTALL_LIBDIR INSTALL_BINDIR INSTALL_SHAREDIR \
|
||||
|
||||
Reference in New Issue
Block a user