From 39618a5ad9fbe0b0b47bdca54fe45aa0799c7ed2 Mon Sep 17 00:00:00 2001
From: avolkov <avolkov@8092fc87-c524-0410-9efc-e669fe64eaf9>
Date: Mon, 7 Nov 2005 21:18:32 +0000
Subject: [PATCH] Enabling platform acceleration in builds

git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@1963 8092fc87-c524-0410-9efc-e669fe64eaf9
---
 sc2/build.vars.in           |  5 +++--
 sc2/build/unix/build.config | 19 ++++++++++++++++++-
 2 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/sc2/build.vars.in b/sc2/build.vars.in
index bd8d54eec..6db9e278c 100644
--- a/sc2/build.vars.in
+++ b/sc2/build.vars.in
@@ -34,8 +34,9 @@ uqm_SOUNDMODULE='@SOUNDMODULE@'
 uqm_HAVE_REGEX='@HAVE_REGEX_H_FLAG@'
 uqm_HAVE_OPENGL='@HAVE_OPENGL@'
 uqm_USE_ZIP_IO='@USE_ZIP_IO@'
+uqm_USE_PLATFORM_ACCEL='@USE_PLATFORM_ACCEL@'
 WINDRES='@WINDRES@'
 REZ='@REZ@'
 DEBUG='@DEBUG@'
-export BUILD_SYSTEM HOST_SYSTEM uqm_SOUNDMODULE uqm_HAVE_REGEX uqm_HAVE_OPENGL uqm_USE_ZIP_IO WINDRES DEBUG
-
+export BUILD_SYSTEM HOST_SYSTEM uqm_SOUNDMODULE uqm_HAVE_REGEX uqm_HAVE_OPENGL
+export uqm_USE_ZIP_IO uqm_USE_PLATFORM_ACCEL WINDRES DEBUG
diff --git a/sc2/build/unix/build.config b/sc2/build/unix/build.config
index a7136f020..89e081740 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"
+	MENU_main_ITEMS="debug graphics sound ovcodec ioformat accel"
 	case "$HOST_SYSTEM" in
 		Darwin)
 			# Installation directory not modifiable
@@ -72,6 +72,7 @@ uqm_prepare_config()
 	MENU_main_ITEM_sound_TYPE=CHOICE
 	MENU_main_ITEM_ovcodec_TYPE=CHOICE
 	MENU_main_ITEM_ioformat_TYPE=CHOICE
+	MENU_main_ITEM_accel_TYPE=CHOICE
 	MENU_main_ITEM_link_TYPE=CHOICE
 	MENU_main_ITEM_install_path_TYPE=MENU
 
@@ -191,6 +192,21 @@ uqm_prepare_config()
 	}
 	CHOICE_ioformat_DEFAULT=stdio_zip
 
+	CHOICE_accel_OPTIONS="asm plainc"
+	CHOICE_accel_TITLE="Graphics/Sound optimizations"
+	CHOICE_accel_OPTION_asm_TITLE="Platform acceleration (asm, etc.)"
+	CHOICE_accel_OPTION_asm_ACTION="accel_asm_action"
+	accel_asm_action() {
+		CFLAGS="$CFLAGS -DUSE_PLATFORM_ACCEL"
+		USE_PLATFORM_ACCEL=1
+	}
+	CHOICE_accel_OPTION_plainc_TITLE="Only plain C code"
+	CHOICE_accel_OPTION_plainc_ACTION="accel_plainc_action"
+	accel_plainc_action() {
+		USE_PLATFORM_ACCEL=0
+	}
+	CHOICE_accel_DEFAULT=asm
+
 	# Making static binaries is more complicated than this.
 	# For now, it will have to be done by hand.
 	#CHOICE_link_OPTIONS="static dynamic"
@@ -266,6 +282,7 @@ uqm_process_config() {
 	SUBSTITUTE_VARS="BUILD_SYSTEM HOST_SYSTEM CFLAGS LDFLAGS MAKE \
 			ECHON DEBUG SED SOUNDMODULE \
 			HAVE_OPENGL HAVE_REGEX_H_FLAG USE_ZIP_IO \
+			USE_PLATFORM_ACCEL \
 			INSTALL_LIBDIR INSTALL_BINDIR INSTALL_SHAREDIR \
 			REZ WINDRES"
 	SUBSTITUTE_FILES="build.vars"