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

sc2/build.vars.in

@@ -22,6 +22,8 @@ MKDEPEND='@COMPILE@ -MM'
 MAKE='@MAKE@'
 ECHON='@ECHON@'
 SED='@SED@'
+REZ='@REZ@'
+WINDRES='@WINDRES@'
 uqm_CFLAGS='@CFLAGS@'
 uqm_LDFLAGS='@LDFLAGS@'
 uqm_INSTALL_BINDIR='@INSTALL_BINDIR@'
@@ -31,13 +33,12 @@ uqm_INSTALL_SHAREDIR='@INSTALL_SHAREDIR@'
 # Exported variables are available from all the Makeinfo files
 # Non-exported files only where build.vars is explicitely included.
 uqm_SOUNDMODULE='@SOUNDMODULE@'
-uqm_MIKMOD_INTERNAL='@USE_MIKMOD_INTERNAL@'
+uqm_USE_INTERNAL_MIKMOD='@USE_INTERNAL_MIKMOD@'
 uqm_HAVE_REGEX='@HAVE_REGEX_H_FLAG@'
 uqm_HAVE_OPENGL='@HAVE_OPENGL@'
 uqm_USE_ZIP_IO='@USE_ZIP_IO@'
 uqm_USE_PLATFORM_ACCEL='@USE_PLATFORM_ACCEL@'
-WINDRES='@WINDRES@'
-REZ='@REZ@'
 DEBUG='@DEBUG@'
-export BUILD_SYSTEM HOST_SYSTEM uqm_SOUNDMODULE uqm_HAVE_REGEX uqm_HAVE_OPENGL
-export uqm_USE_ZIP_IO uqm_USE_PLATFORM_ACCEL WINDRES DEBUG
+export BUILD_SYSTEM HOST_SYSTEM DEBUG
+export uqm_SOUNDMODULE uqm_USE_INTERNAL_MIKMOD uqm_HAVE_REGEX
+export uqm_HAVE_OPENGL uqm_USE_ZIP_IO uqm_USE_PLATFORM_ACCEL

sc2/build/unix/build.config

@@ -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 \

sc2/src/sc2code/libs/Makeinfo

@@ -1,6 +1,6 @@
 uqm_SUBDIRS="callback decomp file graphics heap input list math memory
 		resource sound strings task threads time uio video log"
-if [ -n "$uqm_USE_MIKMOD_INTERAL" ]; then
+if [ -n "$uqm_USE_INTERNAL_MIKMOD" ]; then
 	uqm_SUBDIRS="$uqm_SUBDIRS mikmod"
 fi