adam/cobm
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Build fixes for SunOS with netplay.

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@2792 8092fc87-c524-0410-9efc-e669fe64eaf9
This commit is contained in:
Meep-Eep
2007-06-27 22:49:05 +00:00
parent c33e78ed08
commit 165f30c9a5
2 changed files with 16 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sc2/build/unix/build.config
+5 -1
View File
@@ -220,11 +220,12 @@ uqm_prepare_config()
CHOICE_netplay_OPTIONS="none full ipv4" CHOICE_netplay_OPTIONS="none full ipv4"
CHOICE_netplay_TITLE="Network Supermelee support" CHOICE_netplay_TITLE="Network Supermelee support"
CHOICE_netplay_OPTION_none_TITLE="disabled" 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_none_action() {
NETPLAY="" NETPLAY=""
} }
CHOICE_netplay_OPTION_full_TITLE="IPv4 and IPv6" CHOICE_netplay_OPTION_full_TITLE="IPv4 and IPv6"
CHOICE_netplay_OPTION_full_PRECOND="have_library netlibs"
CHOICE_netplay_OPTION_full_ACTION=netplay_full_action CHOICE_netplay_OPTION_full_ACTION=netplay_full_action
netplay_full_action() { netplay_full_action() {
CFLAGS="$CFLAGS -DNETPLAY=NETPLAY_FULL" CFLAGS="$CFLAGS -DNETPLAY=NETPLAY_FULL"
@@ -232,12 +233,15 @@ uqm_prepare_config()
LDFLAGS="$LDFLAGS -lws2_32" LDFLAGS="$LDFLAGS -lws2_32"
fi fi
NETPLAY="FULL" NETPLAY="FULL"
use_library netlibs
} }
CHOICE_netplay_OPTION_ipv4_TITLE="IPv4; no IPv6" CHOICE_netplay_OPTION_ipv4_TITLE="IPv4; no IPv6"
CHOICE_netplay_OPTION_ipv4_PRECOND="have_library netlibs"
CHOICE_netplay_OPTION_ipv4_ACTION=netplay_ipv4_action CHOICE_netplay_OPTION_ipv4_ACTION=netplay_ipv4_action
netplay_ipv4_action() { netplay_ipv4_action() {
CFLAGS="$CFLAGS -DNETPLAY=NETPLAY_IPV4" CFLAGS="$CFLAGS -DNETPLAY=NETPLAY_IPV4"
NETPLAY="IPV4" NETPLAY="IPV4"
use_library netlibs
} }
CHOICE_netplay_DEFAULT=full CHOICE_netplay_DEFAULT=full
sc2/build/unix/config_proginfo_host
+11
View File
@@ -222,6 +222,17 @@ LIB_zlib_DETECT="try_pkgconfig_lib zlib zlib"
LIB_zlib_DEPEND_DETECT_BIN="pkgconfig" 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: # # Describe the symbols (possibly) used: #
############################################################################## ##############################################################################