diff options
| author | truebrain <truebrain@openttd.org> | 2011-12-01 12:03:34 +0000 |
|---|---|---|
| committer | truebrain <truebrain@openttd.org> | 2011-12-01 12:03:34 +0000 |
| commit | cc12942d70fa2a672c59e848c196c6647f8f1129 (patch) | |
| tree | 3543911ce7080ad03897907e5e192d7697bc954e /config.lib | |
| parent | 0c2bbdde5c0f9577cff72af5b34c10777c6bebd0 (diff) | |
| download | openttd-cc12942d70fa2a672c59e848c196c6647f8f1129.tar.xz | |
(svn r23384) -Remove: no longer allow a binary to be without AI support; the parts some compilers failed at, are integrated in other parts of the code now too
Diffstat (limited to 'config.lib')
| -rw-r--r-- | config.lib | 18 |
1 files changed, 3 insertions, 15 deletions
diff --git a/config.lib b/config.lib index 2c7e0ff78..5507b9c73 100644 --- a/config.lib +++ b/config.lib @@ -54,7 +54,6 @@ set_default() { enable_lto="0" enable_dedicated="0" enable_network="1" - enable_ai="1" enable_static="1" enable_translator="0" enable_unicode="1" @@ -128,7 +127,6 @@ set_default() { enable_lto enable_dedicated enable_network - enable_ai enable_static enable_translator enable_unicode @@ -286,9 +284,6 @@ detect_params() { --enable-network) enable_network="2";; --enable-network=*) enable_network="$optarg";; --disable-network) enable_network="0";; - --enable-ai) enable_ai="2";; - --enable-ai=*) enable_ai="$optarg";; - --disable-ai) enable_ai="0";; --disable-static) enable_static="0";; --enable-static) enable_static="2";; --enable-static=*) enable_static="$optarg";; @@ -743,13 +738,8 @@ check_params() { log 1 "checking network... disabled" fi - if [ "$enable_ai" != "0" ]; then - log 1 "checking ai... found" - SCRIPT_SRC_DIR="$ROOT_DIR/src/3rdparty/squirrel/include" - else - log 1 "checking ai... disabled" - SCRIPT_SRC_DIR="" - fi + log 1 "checking squirrel... found" + SCRIPT_SRC_DIR="$ROOT_DIR/src/3rdparty/squirrel/include" if [ "$enable_translator" != "0" ]; then log 1 "checking translator... debug" @@ -1586,9 +1576,7 @@ make_cflags_and_ldflags() { if [ "$cpu_type" = "64" ] && [ "$enable_universal" = "0" ]; then CFLAGS="$CFLAGS -D_SQ64" fi - if [ "$enable_ai" != "0" ]; then - CFLAGS="$CFLAGS -I$SCRIPT_SRC_DIR -DENABLE_AI" - fi + CFLAGS="$CFLAGS -I$SCRIPT_SRC_DIR" if [ -n "$png_config" ]; then CFLAGS="$CFLAGS -DWITH_PNG" |