diff options
| -rwxr-xr-x | configure | 20 | ||||
| -rwxr-xr-x | core/src/demo/xmake.sh | 6 |
2 files changed, 14 insertions, 12 deletions
@@ -686,15 +686,15 @@ _target_kind_default="static" # set the default project generator and build program if is_host "freebsd" "bsd"; then - _project_generator="gmake" + project_generator="gmake" _make_program_default="gmake" _ninja_program_default="ninja" elif is_host "msys" "cygwin"; then - _project_generator="gmake" + project_generator="gmake" _make_program_default="make.exe" _ninja_program_default="ninja.exe" else - _project_generator="gmake" + project_generator="gmake" _make_program_default="make" _ninja_program_default="ninja" fi @@ -2704,7 +2704,7 @@ Common options: --verbose Display more information. --diagnosis Display lots of diagnosis information. - --generator=GENERATOR Set the project generator. (default: '"${_project_generator}"') + --generator=GENERATOR Set the project generator. (default: '"${project_generator}"') - gmake - ninja --make=MAKE Set the make program. (default: '"${_make_program_default}"') @@ -2809,7 +2809,7 @@ _handle_option() { _target_toolchain=${value} return 0 elif test_eq "${name}" "generator"; then - _project_generator=${value} + project_generator=${value} return 0 elif test_eq "${name}" "make"; then _make_program=${value} @@ -3328,9 +3328,9 @@ _toolchain_detect_ninja() { # detect build backend _toolchain_detect_backend() { - if test "x${_project_generator}" = "xgmake"; then + if test "x${project_generator}" = "xgmake"; then _toolchain_detect_make - elif test "x${_project_generator}" = "xninja"; then + elif test "x${project_generator}" = "xninja"; then _toolchain_detect_ninja fi } @@ -4373,12 +4373,12 @@ _generate_for_ninja() { # _generate_build_file() { - if test_eq "${_project_generator}" "gmake"; then + if test_eq "${project_generator}" "gmake"; then _generate_for_gmake - elif test_eq "${_project_generator}" "ninja"; then + elif test_eq "${project_generator}" "ninja"; then _generate_for_ninja else - raise "unknown generator: ${_project_generator}" + raise "unknown generator: ${project_generator}" fi } _generate_build_file diff --git a/core/src/demo/xmake.sh b/core/src/demo/xmake.sh index d50c6cbf3..47e86b227 100755 --- a/core/src/demo/xmake.sh +++ b/core/src/demo/xmake.sh @@ -60,6 +60,8 @@ target "demo" xmake_after_install() { local target=${1} local installdir=${2} - print "\t@if test -f ${installdir}/bin/xmake.exe; then rm ${installdir}/bin/xmake.exe; fi" >> "${xmake_sh_makefile}" - print "\t@cp ${buildir}/xmake.exe ${installdir}/share/xmake" >> "${xmake_sh_makefile}" + if test_eq "${project_generator}" "gmake"; then + print "\t@if test -f ${installdir}/bin/xmake.exe; then rm ${installdir}/bin/xmake.exe; fi" >> "${xmake_sh_makefile}" + print "\t@cp ${buildir}/xmake.exe ${installdir}/share/xmake" >> "${xmake_sh_makefile}" + fi } |