diff options
| author | ruki <[email protected]> | 2020-02-16 13:33:50 +0800 |
|---|---|---|
| committer | ruki <[email protected]> | 2020-02-16 13:33:50 +0800 |
| commit | 748e6e9e98421556131d8ab8a0e7c0a95183b991 (patch) | |
| tree | 78212b84bdf58c74f883a2b5330062b4dcc9b917 | |
| parent | 0b07ecdf2dc3ccf2b2d73bc2017656b396f35571 (diff) | |
update makefile
| -rw-r--r-- | core/src/xmake/prefix/config.h | 10 | ||||
| -rw-r--r-- | makefile | 3 |
2 files changed, 12 insertions, 1 deletions
diff --git a/core/src/xmake/prefix/config.h b/core/src/xmake/prefix/config.h index b6bd108a8..549a2b265 100644 --- a/core/src/xmake/prefix/config.h +++ b/core/src/xmake/prefix/config.h @@ -49,9 +49,19 @@ /* unix/gcc on msys/cygwin? do not support it now! * + * @see https://github.com/xmake-io/xmake/issues/681 + * * on msys: * pacman -S mingw-w64-i686-gcc * pacman -S mingw-w64-x86_64-gcc + * + * e.g. + * $ pacman -S mingw-w64-x86_64-gcc + * $ which gcc + * /mingw64/bin/gcc + * $ cd xmake + * $ make build + * $ make install prefix=/mingw64 */ #if defined(TB_CONFIG_OS_WINDOWS) && defined(TB_COMPILER_LIKE_UNIX) # error "do not support gcc on msys/cygwin, please uses mingw-w64-[i686|x86_64]-gcc" @@ -78,7 +78,8 @@ endif xmake_dir_install :=$(prefix)/share/xmake xmake_core :=./core/src/demo/demo.b ifdef iswin -xmake_core_install :=$(xmake_dir_install)/xmake.exe +# we need load msys-2.0.dll or cygwin1.dll on bin directory +xmake_core_install :=$(prefix)/bin/xmake.exe else xmake_core_install :=$(xmake_dir_install)/xmake endif |