Netplay

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

sc2/build/unix/build.config

@@ -53,7 +53,7 @@ uqm_requirements()
 uqm_prepare_config()
 {
 	# Describe the menu:
-	MENU_main_ITEMS="debug graphics sound mikmod ovcodec joystick \
+	MENU_main_ITEMS="debug graphics sound mikmod ovcodec netplay joystick \
 			ioformat accel"
 	case "$HOST_SYSTEM" in
 		Darwin)
@@ -72,6 +72,7 @@ uqm_prepare_config()
 	MENU_main_ITEM_sound_TYPE=CHOICE
 	MENU_main_ITEM_mikmod_TYPE=CHOICE
 	MENU_main_ITEM_ovcodec_TYPE=CHOICE
+	MENU_main_ITEM_netplay_TYPE=CHOICE
 	MENU_main_ITEM_joystick_TYPE=CHOICE
 	MENU_main_ITEM_ioformat_TYPE=CHOICE
 	MENU_main_ITEM_accel_TYPE=CHOICE
@@ -210,6 +211,27 @@ uqm_prepare_config()
 	CHOICE_joystick_OPTION_disabled_TITLE="disabled"
 	CHOICE_joystick_DEFAULT=enabled
 
+	CHOICE_netplay_OPTIONS="none full ipv4"
+	CHOICE_netplay_TITLE="Network Supermelee support"
+	CHOICE_netplay_OPTION_none_TITLE="disabled"
+	CHOICE_netplay_OPTION_none_ACTIOn=netplay_none_action
+	netplay_none_action() {
+		NETPLAY=""
+	}
+	CHOICE_netplay_OPTION_full_TITLE="IPv4 and IPv6 (experimental)"
+	CHOICE_netplay_OPTION_full_ACTION=netplay_full_action
+	netplay_full_action() {
+		CFLAGS="$CFLAGS -DNETPLAY=NETPLAY_FULL"
+		NETPLAY="FULL"
+	}
+	CHOICE_netplay_OPTION_ipv4_TITLE="IPv4; no IPv6 (experimental)"
+	CHOICE_netplay_OPTION_ipv4_ACTION=netplay_ipv4_action
+	netplay_ipv4_action() {
+		CFLAGS="$CFLAGS -DNETPLAY=NETPLAY_IPV4"
+		NETPLAY="IPV4"
+	}
+	CHOICE_netplay_DEFAULT=full
+
 	CHOICE_ioformat_OPTIONS="stdio stdio_zip"
 	CHOICE_ioformat_TITLE="Supported file i/o methods"
 	CHOICE_ioformat_OPTION_stdio_TITLE="Only direct file i/o"
@@ -311,7 +333,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 \
+			MAKE ECHON SED DEBUG JOYSTICK NETPLAY \
 			SOUNDMODULE USE_INTERNAL_MIKMOD \
 			HAVE_OPENGL HAVE_REGEX_H_FLAG USE_ZIP_IO \
 			USE_PLATFORM_ACCEL \

sc2/build/unix/config_functions

@@ -15,7 +15,7 @@
 # along with this program; if not, write to the Free Software
 #  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
-BUILDLOG=/dev/null
+BUILDLOG=/tmp/build.log
 TEMPFILE="/tmp/build.$$.tmp"
 
 

sc2/build/unix/config_proginfo_host

@@ -90,8 +90,8 @@ case "$HOST_SYSTEM" in
 		LIB_SDL_image_LDFLAGS="-framework SDL_image"
 	;;
 	*)
-		LIB_SDL_image_CFLAGS="$LIB_SDL_CFLAGS"
-		LIB_SDL_image_LDFLAGS="$LIB_SDL_LDFLAGS -lSDL_image"
+		LIB_SDL_image_CFLAGS="$LIB_SDL_CFLAGS -I/opt/SDL_image/include/SDL"
+		LIB_SDL_image_LDFLAGS="$LIB_SDL_LDFLAGS -L/opt/SDL_image/lib -lSDL_image"
 		;;
 esac
 LIB_SDL_image_VERSION=""