Choice of internal/external libmikmod.

git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@2415 8092fc87-c524-0410-9efc-e669fe64eaf9

sc2/build.vars.in

@@ -31,6 +31,7 @@ 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='@MIKMOD_INTERNAL@'
 uqm_HAVE_REGEX='@HAVE_REGEX_H_FLAG@'
 uqm_HAVE_OPENGL='@HAVE_OPENGL@'
 uqm_USE_ZIP_IO='@USE_ZIP_IO@'

sc2/build/unix/build.config

@@ -54,7 +54,8 @@ uqm_requirements()
 uqm_prepare_config()
 {
 	# Describe the menu:
-	MENU_main_ITEMS="debug graphics sound ovcodec joystick ioformat accel"
+	MENU_main_ITEMS="debug graphics sound mikmod ovcodec joystick \
+			ioformat accel"
 	case "$HOST_SYSTEM" in
 		Darwin)
 			# Installation directory not modifiable
@@ -70,6 +71,7 @@ uqm_prepare_config()
 	MENU_main_ITEM_debug_TYPE=CHOICE
 	MENU_main_ITEM_graphics_TYPE=CHOICE
 	MENU_main_ITEM_sound_TYPE=CHOICE
+	MENU_main_ITEM_mikmod_TYPE=CHOICE
 	MENU_main_ITEM_ovcodec_TYPE=CHOICE
 	MENU_main_ITEM_joystick_TYPE=CHOICE
 	MENU_main_ITEM_ioformat_TYPE=CHOICE
@@ -180,6 +182,19 @@ uqm_prepare_config()
 	}
 	CHOICE_ovcodec_DEFAULT=standard
 
+	CHOICE_mikmod_OPTIONS="internal external"
+	CHOICE_mikmod_TITLE="Tracker music support"
+	CHOICE_mikmod_OPTION_internal_TITLE="Included libmikmod"
+	CHOICE_mikmod_OPTION_external_TITLE="System libmikmod"
+	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
+		use_library libmikmod
+	}
+	CHOICE_mikmod_DEFAULT=external
+
 	CHOICE_joystick_OPTIONS="enabled disabled"
 	CHOICE_joystick_TITLE="Joystick support"
 	CHOICE_joystick_OPTION_enabled_TITLE="enabled"
@@ -292,9 +307,9 @@ uqm_process_config() {
 	substitute_vars SUBSTITUTE_VARS SUBSTITUTE_FILES src "$BUILD_WORK"
 
 	# Make build.vars from build.vars.in, substituting variables.
-	SUBSTITUTE_VARS="BUILD_SYSTEM HOST_SYSTEM COMPILE \
+	SUBSTITUTE_VARS="BUILD_SYSTEM HOST_SYSTEM COMPILE CFLAGS LDFLAGS \
-			CFLAGS LDFLAGS MAKE \
+			MAKE ECHON SED DEBUG JOYSTICK \
-			ECHON DEBUG JOYSTICK SED SOUNDMODULE \
+			SOUNDMODULE USE_MIKMOD_INTERNAL \
 			HAVE_OPENGL HAVE_REGEX_H_FLAG USE_ZIP_IO \
 			USE_PLATFORM_ACCEL \
 			INSTALL_LIBDIR INSTALL_BINDIR INSTALL_SHAREDIR \

sc2/src/sc2code/libs/Makeinfo

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