diff options
| author | ruki <[email protected]> | 2020-02-12 00:35:35 +0800 |
|---|---|---|
| committer | ruki <[email protected]> | 2020-02-11 21:33:33 +0800 |
| commit | ed630a48d2359dded29af7815f03604534b78f67 (patch) | |
| tree | 7abf91db6576d4a3f0c6534b4b416c5a30107700 | |
| parent | 122e72b5483783e3d88e55da824d64d5c6b3700e (diff) | |
improve makefile and msys platform
| -rw-r--r-- | core/makefile | 2 | ||||
| -rw-r--r-- | makefile | 1 | ||||
| -rw-r--r-- | xmake/platforms/cygwin/xmake.lua | 2 | ||||
| -rw-r--r-- | xmake/platforms/msys/xmake.lua | 2 |
4 files changed, 5 insertions, 2 deletions
diff --git a/core/makefile b/core/makefile index 3ee722347..7278bf18e 100644 --- a/core/makefile +++ b/core/makefile @@ -142,6 +142,7 @@ endif HOST :=$(if $(HOST),$(HOST),$(if ${shell uname | egrep -i linux},linux,)) HOST :=$(if $(HOST),$(HOST),$(if ${shell uname | egrep -i darwin},macosx,)) HOST :=$(if $(HOST),$(HOST),$(if ${shell uname | egrep -i cygwin},cygwin,)) +HOST :=$(if $(HOST),$(HOST),$(if ${shell uname | egrep -i msys},msys,)) HOST :=$(if $(HOST),$(HOST),$(if ${shell uname | egrep -i mingw},msys,)) HOST :=$(if $(HOST),$(HOST),$(if ${shell uname | egrep -i windows},msys,)) HOST :=$(if $(HOST),$(HOST),linux) @@ -150,6 +151,7 @@ HOST :=$(if $(HOST),$(HOST),linux) PLAT :=$(if $(PLAT),$(PLAT),$(if ${shell uname | egrep -i linux},linux,)) PLAT :=$(if $(PLAT),$(PLAT),$(if ${shell uname | egrep -i darwin},macosx,)) PLAT :=$(if $(PLAT),$(PLAT),$(if ${shell uname | egrep -i cygwin},cygwin,)) +PLAT :=$(if $(PLAT),$(PLAT),$(if ${shell uname | egrep -i msys},msys,)) PLAT :=$(if $(PLAT),$(PLAT),$(if ${shell uname | egrep -i mingw},msys,)) PLAT :=$(if $(PLAT),$(PLAT),$(if ${shell uname | egrep -i windows},windows,)) PLAT :=$(if $(PLAT),$(PLAT),linux) @@ -26,6 +26,7 @@ endif PLAT :=$(if $(PLAT),$(PLAT),$(if ${shell uname | egrep -i linux},linux,)) PLAT :=$(if $(PLAT),$(PLAT),$(if ${shell uname | egrep -i darwin},macosx,)) PLAT :=$(if $(PLAT),$(PLAT),$(if ${shell uname | egrep -i cygwin},cygwin,)) +PLAT :=$(if $(PLAT),$(PLAT),$(if ${shell uname | egrep -i msys},msys,)) PLAT :=$(if $(PLAT),$(PLAT),$(if ${shell uname | egrep -i mingw},msys,)) PLAT :=$(if $(PLAT),$(PLAT),$(if ${shell uname | egrep -i windows},windows,)) PLAT :=$(if $(PLAT),$(PLAT),linux) diff --git a/xmake/platforms/cygwin/xmake.lua b/xmake/platforms/cygwin/xmake.lua index c03e1a992..87358da7d 100644 --- a/xmake/platforms/cygwin/xmake.lua +++ b/xmake/platforms/cygwin/xmake.lua @@ -31,7 +31,7 @@ platform("cygwin") set_archs("i386", "x86_64") -- set formats - set_formats {static = "lib$(name).a", object = "$(name).o", shared = "lib$(name).so", binary = "$(name).sym"} + set_formats {static = "lib$(name).a", object = "$(name).o", shared = "lib$(name).dll", binary = "$(name).exe", symbol = "$(name).sym"} -- set install directory set_installdir("/usr/local") diff --git a/xmake/platforms/msys/xmake.lua b/xmake/platforms/msys/xmake.lua index 6b7936a64..3bca69517 100644 --- a/xmake/platforms/msys/xmake.lua +++ b/xmake/platforms/msys/xmake.lua @@ -31,7 +31,7 @@ platform("msys") set_archs("i386", "x86_64") -- set formats - set_formats {static = "lib$(name).a", object = "$(name).o", shared = "lib$(name).so", binary = "$(name).sym"} + set_formats {static = "lib$(name).a", object = "$(name).o", shared = "lib$(name).dll", binary = "$(name).exe", symbol = "$(name).sym"} -- set install directory set_installdir("/usr/local") |