From 165f30c9a5a615cbad0b5d7105e4c23a641bc627 Mon Sep 17 00:00:00 2001 From: Meep-Eep Date: Wed, 27 Jun 2007 22:49:05 +0000 Subject: [PATCH] Build fixes for SunOS with netplay. git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@2792 8092fc87-c524-0410-9efc-e669fe64eaf9 --- sc2/build/unix/build.config | 6 +++++- sc2/build/unix/config_proginfo_host | 11 +++++++++++ 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/sc2/build/unix/build.config b/sc2/build/unix/build.config index 1c08f6e91..92e80720a 100644 --- a/sc2/build/unix/build.config +++ b/sc2/build/unix/build.config @@ -220,11 +220,12 @@ uqm_prepare_config() 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 + CHOICE_netplay_OPTION_none_ACTION=netplay_none_action netplay_none_action() { NETPLAY="" } CHOICE_netplay_OPTION_full_TITLE="IPv4 and IPv6" + CHOICE_netplay_OPTION_full_PRECOND="have_library netlibs" CHOICE_netplay_OPTION_full_ACTION=netplay_full_action netplay_full_action() { CFLAGS="$CFLAGS -DNETPLAY=NETPLAY_FULL" @@ -232,12 +233,15 @@ uqm_prepare_config() LDFLAGS="$LDFLAGS -lws2_32" fi NETPLAY="FULL" + use_library netlibs } CHOICE_netplay_OPTION_ipv4_TITLE="IPv4; no IPv6" + CHOICE_netplay_OPTION_ipv4_PRECOND="have_library netlibs" CHOICE_netplay_OPTION_ipv4_ACTION=netplay_ipv4_action netplay_ipv4_action() { CFLAGS="$CFLAGS -DNETPLAY=NETPLAY_IPV4" NETPLAY="IPV4" + use_library netlibs } CHOICE_netplay_DEFAULT=full diff --git a/sc2/build/unix/config_proginfo_host b/sc2/build/unix/config_proginfo_host index 34f43b727..2613c656a 100644 --- a/sc2/build/unix/config_proginfo_host +++ b/sc2/build/unix/config_proginfo_host @@ -222,6 +222,17 @@ LIB_zlib_DETECT="try_pkgconfig_lib zlib zlib" LIB_zlib_DEPEND_DETECT_BIN="pkgconfig" +# Additional platform-specific libraries for networking. +LIB_netlibs_NAME="Platform-specific network libraries" +case "$HOST_SYSTEM" in + SunOS) + LIB_netlibs_CFLAGS="" + LIB_netlibs_LDFLAGS="-lsocket" + LIB_netlibs_VERSION="" + ;; +esac + + ############################################################################## # Describe the symbols (possibly) used: # ##############################################################################