summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorruki <[email protected]>2023-04-13 21:38:26 +0800
committerGitHub <[email protected]>2023-04-13 21:38:26 +0800
commit9b7b385d97e7e6a7750a6d3c1f54a434b635cc9e (patch)
treeeab20dccbb76ed9b83ad06d103f9a5e1c2a211c5
parentfce193249afa114c35b16ee8a150214a91935b3a (diff)
parent6d3e4f363d6381c4a750d9cb1799908fb05705d4 (diff)
Merge pull request #3627 from xmake-io/mingw
wrap xmake.sh for msys/mingw
-rwxr-xr-xcore/src/demo/xmake.sh5
-rwxr-xr-xscripts/msys/xmake.sh5
2 files changed, 10 insertions, 0 deletions
diff --git a/core/src/demo/xmake.sh b/core/src/demo/xmake.sh
index 0fa493b77..1c0bca6bf 100755
--- a/core/src/demo/xmake.sh
+++ b/core/src/demo/xmake.sh
@@ -28,6 +28,11 @@ target "demo"
add_installfiles "${projectdir}/(xmake/templates/**)" "share"
add_installfiles "${projectdir}/scripts/xrepo.sh" "bin" "xrepo"
+ if is_host "msys"; then
+ add_installfiles "${projectdir}/scripts/msys/xmake.sh" "bin" "xmake"
+ add_installfiles "${buildir}/xmake.exe" "share/xmake"
+ fi
+
# add syslinks
add_options "atomic"
if is_plat "mingw" "msys" "cygwin"; then
diff --git a/scripts/msys/xmake.sh b/scripts/msys/xmake.sh
new file mode 100755
index 000000000..167d87278
--- /dev/null
+++ b/scripts/msys/xmake.sh
@@ -0,0 +1,5 @@
+#!/usr/bin/env bash
+BASEDIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
+if [ -f "$BASEDIR/../share/xmake/xmake.exe" ]; then
+ $BASEDIR/../share/xmake/xmake.exe "$@"
+fi