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

Enabling platform acceleration in builds

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@1963 8092fc87-c524-0410-9efc-e669fe64eaf9
This commit is contained in:
avolkov
2005-11-07 21:18:32 +00:00
parent 62b68de3fb
commit 39618a5ad9
2 changed files with 21 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sc2/build.vars.in
+3 -2
View File
@@ -34,8 +34,9 @@ uqm_SOUNDMODULE='@SOUNDMODULE@'
uqm_HAVE_REGEX='@HAVE_REGEX_H_FLAG@' uqm_HAVE_REGEX='@HAVE_REGEX_H_FLAG@'
uqm_HAVE_OPENGL='@HAVE_OPENGL@' uqm_HAVE_OPENGL='@HAVE_OPENGL@'
uqm_USE_ZIP_IO='@USE_ZIP_IO@' uqm_USE_ZIP_IO='@USE_ZIP_IO@'
uqm_USE_PLATFORM_ACCEL='@USE_PLATFORM_ACCEL@'
WINDRES='@WINDRES@' WINDRES='@WINDRES@'
REZ='@REZ@' REZ='@REZ@'
DEBUG='@DEBUG@' 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
sc2/build/unix/build.config
+18 -1
View File
@@ -54,7 +54,7 @@ uqm_requirements()
uqm_prepare_config() uqm_prepare_config()
{ {
# Describe the menu: # Describe the menu:
MENU_main_ITEMS="debug graphics sound ovcodec ioformat" MENU_main_ITEMS="debug graphics sound ovcodec ioformat accel"
case "$HOST_SYSTEM" in case "$HOST_SYSTEM" in
Darwin) Darwin)
# Installation directory not modifiable # Installation directory not modifiable
@@ -72,6 +72,7 @@ uqm_prepare_config()
MENU_main_ITEM_sound_TYPE=CHOICE MENU_main_ITEM_sound_TYPE=CHOICE
MENU_main_ITEM_ovcodec_TYPE=CHOICE MENU_main_ITEM_ovcodec_TYPE=CHOICE
MENU_main_ITEM_ioformat_TYPE=CHOICE MENU_main_ITEM_ioformat_TYPE=CHOICE
MENU_main_ITEM_accel_TYPE=CHOICE
MENU_main_ITEM_link_TYPE=CHOICE MENU_main_ITEM_link_TYPE=CHOICE
MENU_main_ITEM_install_path_TYPE=MENU MENU_main_ITEM_install_path_TYPE=MENU
@@ -191,6 +192,21 @@ uqm_prepare_config()
} }
CHOICE_ioformat_DEFAULT=stdio_zip 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. # Making static binaries is more complicated than this.
# For now, it will have to be done by hand. # For now, it will have to be done by hand.
#CHOICE_link_OPTIONS="static dynamic" #CHOICE_link_OPTIONS="static dynamic"
@@ -266,6 +282,7 @@ uqm_process_config() {
SUBSTITUTE_VARS="BUILD_SYSTEM HOST_SYSTEM CFLAGS LDFLAGS MAKE \ SUBSTITUTE_VARS="BUILD_SYSTEM HOST_SYSTEM CFLAGS LDFLAGS MAKE \
ECHON DEBUG SED SOUNDMODULE \ ECHON DEBUG SED SOUNDMODULE \
HAVE_OPENGL HAVE_REGEX_H_FLAG USE_ZIP_IO \ HAVE_OPENGL HAVE_REGEX_H_FLAG USE_ZIP_IO \
USE_PLATFORM_ACCEL \
INSTALL_LIBDIR INSTALL_BINDIR INSTALL_SHAREDIR \ INSTALL_LIBDIR INSTALL_BINDIR INSTALL_SHAREDIR \
REZ WINDRES" REZ WINDRES"
SUBSTITUTE_FILES="build.vars" SUBSTITUTE_FILES="build.vars"