add lj_vm.o for msys/cygwin

6 files changed, 16 insertions, 0 deletions

diff --git a/core/src/luajit/autogen/cygwin/jit/i386/lj_vm.o b/core/src/luajit/autogen/cygwin/jit/i386/lj_vm.o
new file mode 100644
index 000000000..bf42d8ec5
--- /dev/null
+++ b/core/src/luajit/autogen/cygwin/jit/i386/lj_vm.o
diff --git a/core/src/luajit/autogen/cygwin/jit/x86_64/lj_vm.o b/core/src/luajit/autogen/cygwin/jit/x86_64/lj_vm.o
new file mode 100644
index 000000000..8d085a783
--- /dev/null
+++ b/core/src/luajit/autogen/cygwin/jit/x86_64/lj_vm.o
diff --git a/core/src/luajit/autogen/msys/jit/i386/lj_vm.o b/core/src/luajit/autogen/msys/jit/i386/lj_vm.o
new file mode 100644
index 000000000..bf42d8ec5
--- /dev/null
+++ b/core/src/luajit/autogen/msys/jit/i386/lj_vm.o
diff --git a/core/src/luajit/autogen/msys/jit/x86_64/lj_vm.o b/core/src/luajit/autogen/msys/jit/x86_64/lj_vm.o
new file mode 100644
index 000000000..8d085a783
--- /dev/null
+++ b/core/src/luajit/autogen/msys/jit/x86_64/lj_vm.o
diff --git a/core/src/tbox/tbox b/core/src/tbox/tbox
-Subproject 7c1b61e0cccb145595624774e89a621204898fa
+Subproject 9d66b8f56865829017fd74eb594a67cfe78c0af
diff --git a/makefile b/makefile
index c10406f0f..390d22af5 100644
--- a/makefile
+++ b/makefile
@@ -63,9 +63,25 @@ endif
 # to match a directory for a platform dependent implementation.
 ARCH 		:=$(if $(findstring amd64,$(ARCH)),x86_64,$(ARCH))
 
+# is windows?
+iswin =
+ifeq ($(PLAT),windows)
+	iswin = yes
+endif
+ifeq ($(PLAT),msys)
+	iswin = yes
+endif
+ifeq ($(PLAT),cygwin)
+	iswin = yes
+endif
+
 xmake_dir_install   :=$(prefix)/share/xmake
 xmake_core          :=./core/src/demo/demo.b
+ifdef iswin
+xmake_core_install  :=$(xmake_dir_install)/xmake.exe
+else
 xmake_core_install  :=$(xmake_dir_install)/xmake
+endif
 xmake_loader        :=$(TMP_DIR)/xmake_loader
 xmake_loader_install:=$(prefix)/bin/xmake