From d6c5443469835974a314ef4a0577c6711fe1f0b3 Mon Sep 17 00:00:00 2001 From: meep-eep Date: Tue, 8 Aug 2006 21:52:37 +0000 Subject: [PATCH] Ask for joystick support. git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@2400 8092fc87-c524-0410-9efc-e669fe64eaf9 --- sc2/build/unix/build.config | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/sc2/build/unix/build.config b/sc2/build/unix/build.config index 8cc58a193..17fc40b61 100644 --- a/sc2/build/unix/build.config +++ b/sc2/build/unix/build.config @@ -54,7 +54,7 @@ uqm_requirements() uqm_prepare_config() { # Describe the menu: - MENU_main_ITEMS="debug graphics sound ovcodec ioformat accel" + MENU_main_ITEMS="debug graphics sound ovcodec joystick ioformat accel" case "$HOST_SYSTEM" in Darwin) # Installation directory not modifiable @@ -71,6 +71,7 @@ uqm_prepare_config() MENU_main_ITEM_graphics_TYPE=CHOICE MENU_main_ITEM_sound_TYPE=CHOICE MENU_main_ITEM_ovcodec_TYPE=CHOICE + MENU_main_ITEM_joystick_TYPE=CHOICE MENU_main_ITEM_ioformat_TYPE=CHOICE MENU_main_ITEM_accel_TYPE=CHOICE MENU_main_ITEM_link_TYPE=CHOICE @@ -179,6 +180,18 @@ uqm_prepare_config() } CHOICE_ovcodec_DEFAULT=standard + CHOICE_joystick_OPTIONS="enabled disabled" + CHOICE_joystick_TITLE="Joystick support" + CHOICE_joystick_OPTION_enabled_TITLE="enabled" + #CHOICE_joystick_OPTION_enabled_PRECOND="have_symbol SDL_Joystick" + # TODO: Check whether SDL has joystick support. + CHOICE_joystick_OPTION_enabled_ACTION=joystick_enabled_action + joystick_enabled_action() { + CFLAGS="$CFLAGS -DHAVE_JOYSTICK" + } + CHOICE_joystick_OPTION_disabled_TITLE="disabled" + CHOICE_joystick_DEFAULT=enabled + CHOICE_ioformat_OPTIONS="stdio stdio_zip" CHOICE_ioformat_TITLE="Supported file i/o methods" CHOICE_ioformat_OPTION_stdio_TITLE="Only direct file i/o" @@ -281,7 +294,7 @@ uqm_process_config() { # Make build.vars from build.vars.in, substituting variables. SUBSTITUTE_VARS="BUILD_SYSTEM HOST_SYSTEM COMPILE \ CFLAGS LDFLAGS MAKE \ - ECHON DEBUG SED SOUNDMODULE \ + ECHON DEBUG JOYSTICK SED SOUNDMODULE \ HAVE_OPENGL HAVE_REGEX_H_FLAG USE_ZIP_IO \ USE_PLATFORM_ACCEL \ INSTALL_LIBDIR INSTALL_BINDIR INSTALL_SHAREDIR \