equal
deleted
inserted
replaced
52 with_iconv="1" |
52 with_iconv="1" |
53 with_midi="" |
53 with_midi="" |
54 with_midi_arg="" |
54 with_midi_arg="" |
55 with_freetype="1" |
55 with_freetype="1" |
56 with_fontconfig="1" |
56 with_fontconfig="1" |
57 with_pspconfig="1" |
57 with_psp_config="1" |
58 |
58 |
59 save_params_array="build host cc_build cc_host cxx_build cxx_host windres strip lipo os revision endian config_log prefix_dir binary_dir data_dir icon_dir personal_dir install_dir custom_lang_dir second_data_dir enable_install enable_debug enable_profiling enable_dedicated enable_network enable_static enable_translator enable_assert enable_strip with_osx_sysroot enable_universal enable_osx_g5 with_application_bundle with_sdl with_cocoa with_zlib with_png with_makedepend with_direct_music with_sort with_iconv with_midi with_midi_arg with_freetype with_fontconfig with_pspconfig CC CXX CFLAGS LDFLAGS" |
59 save_params_array="build host cc_build cc_host cxx_build cxx_host windres strip lipo os revision endian config_log prefix_dir binary_dir data_dir icon_dir personal_dir install_dir custom_lang_dir second_data_dir enable_install enable_debug enable_profiling enable_dedicated enable_network enable_static enable_translator enable_assert enable_strip with_osx_sysroot enable_universal enable_osx_g5 with_application_bundle with_sdl with_cocoa with_zlib with_png with_makedepend with_direct_music with_sort with_iconv with_midi with_midi_arg with_freetype with_fontconfig with_psp_config CC CXX CFLAGS LDFLAGS" |
60 } |
60 } |
61 |
61 |
62 detect_params() { |
62 detect_params() { |
63 # Walk over all params from the user and override any default settings if |
63 # Walk over all params from the user and override any default settings if |
64 # needed. This also handles any invalid option. |
64 # needed. This also handles any invalid option. |
196 --with-fontconfig=*) with_fontconfig="$optarg";; |
196 --with-fontconfig=*) with_fontconfig="$optarg";; |
197 --with-libfontconfig) with_fontconfig="2";; |
197 --with-libfontconfig) with_fontconfig="2";; |
198 --without-libfontconfig) with_fontconfig="0";; |
198 --without-libfontconfig) with_fontconfig="0";; |
199 --with-libfontconfig=*) with_fontconfig="$optarg";; |
199 --with-libfontconfig=*) with_fontconfig="$optarg";; |
200 |
200 |
201 --with-psp-config) with_pspconfig="2";; |
201 --with-psp-config) with_psp_config="2";; |
202 --without-psp-config) with_pspconfig="0";; |
202 --without-psp-config) with_psp_config="0";; |
203 --with-psp-config=*) with_pspconfig="$optarg";; |
203 --with-psp-config=*) with_psp_config="$optarg";; |
204 |
204 |
205 --with-makedepend) with_makedepend="2";; |
205 --with-makedepend) with_makedepend="2";; |
206 --without-makedepend) with_makedepend="0";; |
206 --without-makedepend) with_makedepend="0";; |
207 --with-makedepend=*) with_makedepend="$optarg";; |
207 --with-makedepend=*) with_makedepend="$optarg";; |
208 |
208 |
1464 log 1 "checking libfontconfig... found" |
1464 log 1 "checking libfontconfig... found" |
1465 } |
1465 } |
1466 |
1466 |
1467 detect_pspconfig() { |
1467 detect_pspconfig() { |
1468 # 0 means no, 1 is auto-detect, 2 is force |
1468 # 0 means no, 1 is auto-detect, 2 is force |
1469 if [ "$with_pspconfig" = "0" ]; then |
1469 if [ "$with_psp_config" = "0" ]; then |
1470 log 1 "checking psp-config... disabled" |
1470 log 1 "checking psp-config... disabled" |
1471 |
1471 |
1472 psp_config="" |
1472 psp_config="" |
1473 return 0 |
1473 return 0 |
1474 fi |
1474 fi |
1475 |
1475 |
1476 if [ "$with_pspconfig" = "1" ] && [ "$os" != "PSP" ]; then |
1476 if [ "$with_psp_config" = "1" ] && [ "$os" != "PSP" ]; then |
1477 log 1 "checking psp-config... not PSP, skipping" |
1477 log 1 "checking psp-config... not PSP, skipping" |
1478 |
1478 |
1479 psp_config=""; |
1479 psp_config=""; |
1480 return 0 |
1480 return 0 |
1481 fi |
1481 fi |
1485 |
1485 |
1486 log 1 "configure: error: psp-config is only supported for PSP" |
1486 log 1 "configure: error: psp-config is only supported for PSP" |
1487 exit 1 |
1487 exit 1 |
1488 fi |
1488 fi |
1489 |
1489 |
1490 if [ "$with_pspconfig" = "1" ] || [ "$with_pspconfig" = "" ] || [ "$with_pspconfig" = "2" ]; then |
1490 if [ "$with_psp_config" = "1" ] || [ "$with_psp_config" = "" ] || [ "$with_psp_config" = "2" ]; then |
1491 psp_config="psp-config" |
1491 psp_config="psp-config" |
1492 else |
1492 else |
1493 psp_config="$with_pspconfig" |
1493 psp_config="$with_psp_config" |
1494 fi |
1494 fi |
1495 |
1495 |
1496 version=`$psp_config -p 2>/dev/null` |
1496 version=`$psp_config -p 2>/dev/null` |
1497 ret=$? |
1497 ret=$? |
1498 log 2 "executing $psp_config -p" |
1498 log 2 "executing $psp_config -p" |
1502 if [ -z "$version" ] || [ "$ret" != "0" ]; then |
1502 if [ -z "$version" ] || [ "$ret" != "0" ]; then |
1503 log 1 "checking psp-config... not found" |
1503 log 1 "checking psp-config... not found" |
1504 log 1 "configure: error: psp-config couldn't be found" |
1504 log 1 "configure: error: psp-config couldn't be found" |
1505 |
1505 |
1506 # It was forced, so it should be found. |
1506 # It was forced, so it should be found. |
1507 if [ "$with_pspconfig" != "1" ]; then |
1507 if [ "$with_psp_config" != "1" ]; then |
1508 log 1 "configure: error: you supplied '$with_pspconfig', but it seems invalid" |
1508 log 1 "configure: error: you supplied '$with_psp_config', but it seems invalid" |
1509 fi |
1509 fi |
1510 exit 1 |
1510 exit 1 |
1511 fi |
1511 fi |
1512 |
1512 |
1513 log 1 "checking psp-config... found" |
1513 log 1 "checking psp-config... found" |