support msys and cygwin

4 files changed, 15 insertions, 10 deletions

diff --git a/core/src/tbox/inc/mingw/tbox.config.h b/core/src/tbox/inc/mingw/tbox.config.h
index 1ebf62cad..b59348bba 100755
--- a/core/src/tbox/inc/mingw/tbox.config.h
+++ b/core/src/tbox/inc/mingw/tbox.config.h
@@ -147,7 +147,7 @@
 #define TB_CONFIG_POSIX_HAVE_OPENDIR 1
 /* #undef TB_CONFIG_POSIX_HAVE_DLOPEN */
 #define TB_CONFIG_POSIX_HAVE_OPEN 1
-#define TB_CONFIG_POSIX_HAVE_STAT64 1
+/* #undef TB_CONFIG_POSIX_HAVE_STAT64 */
 /* #undef TB_CONFIG_POSIX_HAVE_GETHOSTNAME */
 /* #undef TB_CONFIG_POSIX_HAVE_GETIFADDRS */
 #define TB_CONFIG_POSIX_HAVE_SEM_INIT 1
@@ -168,19 +168,19 @@
 /* #undef TB_CONFIG_POSIX_HAVE_SENDFILE */
 /* #undef TB_CONFIG_POSIX_HAVE_EPOLL_CREATE */
 /* #undef TB_CONFIG_POSIX_HAVE_EPOLL_WAIT */
-/* #undef TB_CONFIG_POSIX_HAVE_POSIX_SPAWNP */
+#define TB_CONFIG_POSIX_HAVE_POSIX_SPAWNP 1
 #define TB_CONFIG_POSIX_HAVE_EXECVP 1
 #define TB_CONFIG_POSIX_HAVE_EXECVPE 1
 /* #undef TB_CONFIG_POSIX_HAVE_FORK */
 /* #undef TB_CONFIG_POSIX_HAVE_VFORK */
-/* #undef TB_CONFIG_POSIX_HAVE_WAITPID */
+#define TB_CONFIG_POSIX_HAVE_WAITPID 1
 /* #undef TB_CONFIG_POSIX_HAVE_GETDTABLESIZE */
 /* #undef TB_CONFIG_POSIX_HAVE_GETRLIMIT */
 /* #undef TB_CONFIG_POSIX_HAVE_GETADDRINFO */
 /* #undef TB_CONFIG_POSIX_HAVE_GETNAMEINFO */
 /* #undef TB_CONFIG_POSIX_HAVE_GETHOSTBYNAME */
 /* #undef TB_CONFIG_POSIX_HAVE_GETHOSTBYADDR */
-/* #undef TB_CONFIG_POSIX_HAVE_FCNTL */
+#define TB_CONFIG_POSIX_HAVE_FCNTL 1
 /* #undef TB_CONFIG_POSIX_HAVE_PIPE */
 /* #undef TB_CONFIG_POSIX_HAVE_PIPE2 */
 /* #undef TB_CONFIG_POSIX_HAVE_MKFIFO */
@@ -217,7 +217,7 @@
 /* #undef TB_CONFIG_WINDOWS_HAVE__INTERLOCKEDCOMPAREEXCHANGE64_REL */
 
 // freebsd functions
-/* #undef TB_CONFIG_FREEBSD_HAVE_FLOCK */
+#define TB_CONFIG_FREEBSD_HAVE_FLOCK 1
 
 // systemv functions
 /* #undef TB_CONFIG_SYSTEMV_HAVE_SEMGET */
diff --git a/core/src/tbox/makefile b/core/src/tbox/makefile
index 0cb17660b..37f0fcc61 100644
--- a/core/src/tbox/makefile
+++ b/core/src/tbox/makefile
@@ -272,6 +272,7 @@ tbox_C_FILES 			+= \
 						tbox/src/tbox/platform/windows/socket_pool \
 						tbox/src/tbox/platform/windows/interface/ws2_32 \
 						tbox/src/tbox/platform/windows/interface/shell32 \
+						tbox/src/tbox/platform/windows/interface/dbghelp \
 						tbox/src/tbox/platform/windows/interface/mswsock \
 						tbox/src/tbox/platform/windows/interface/kernel32 \
 						tbox/src/tbox/platform/windows/interface/iphlpapi \
diff --git a/core/src/tbox/tbox b/core/src/tbox/tbox
-Subproject 1c2fb0e4b972d5571ed3c6246e84ff168d64400
+Subproject bb10bf4631a8f5cff2e7bbe4da90c1fd9d5dc9b
diff --git a/core/src/xmake/machine.c b/core/src/xmake/machine.c
index c93223dc8..addfe7d7e 100644
--- a/core/src/xmake/machine.c
+++ b/core/src/xmake/machine.c
@@ -378,7 +378,7 @@ static tb_bool_t xm_machine_save_arguments(xm_machine_t* machine, tb_int_t argc,
     // check
     tb_assert_and_check_return_val(machine && machine->lua && argc >= 1 && argv, tb_false);
 
-#ifdef TB_CONFIG_OS_WINDOWS
+#if defined(TB_CONFIG_OS_WINDOWS) && !defined(TB_COMPILER_LIKE_UNIX)
     tb_wchar_t **argvw = CommandLineToArgvW(GetCommandLineW(), &argc);
 #endif
 
@@ -389,7 +389,7 @@ static tb_bool_t xm_machine_save_arguments(xm_machine_t* machine, tb_int_t argc,
     tb_int_t i = 0;
     for (i = 1; i < argc; i++)
     {
-#ifdef TB_CONFIG_OS_WINDOWS
+#if defined(TB_CONFIG_OS_WINDOWS) && !defined(TB_COMPILER_LIKE_UNIX)
         tb_char_t argvbuf[4096] = {0};
         tb_wcstombs(argvbuf, argvw[i], tb_arrayn(argvbuf));
         // table_new[table.getn(table_new) + 1] = argv[i]
@@ -567,7 +567,7 @@ static tb_void_t xm_machine_init_arch(xm_machine_t* machine)
     // check
     tb_assert_and_check_return(machine && machine->lua);
 
-#if defined(TB_CONFIG_OS_WINDOWS)
+#if defined(TB_CONFIG_OS_WINDOWS) && !defined(TB_COMPILER_LIKE_UNIX)
 
     // the GetNativeSystemInfo function type
     typedef void (WINAPI *GetNativeSystemInfo_t)(LPSYSTEM_INFO);
@@ -673,7 +673,13 @@ xm_machine_ref_t xm_machine_init()
 
         // init host
 #if defined(TB_CONFIG_OS_WINDOWS)
+#   if defined(TB_COMPILER_ON_MSYS)
+        lua_pushstring(machine->lua, "msys");
+#   elif defined(TB_COMPILER_ON_CYGWIN)
+        lua_pushstring(machine->lua, "cygwin");
+#   else
         lua_pushstring(machine->lua, "windows");
+#   endif
 #elif defined(TB_CONFIG_OS_MACOSX)
         lua_pushstring(machine->lua, "macosx");
 #elif defined(TB_CONFIG_OS_LINUX)
@@ -682,8 +688,6 @@ xm_machine_ref_t xm_machine_init()
         lua_pushstring(machine->lua, "ios");
 #elif defined(TB_CONFIG_OS_ANDROID)
         lua_pushstring(machine->lua, "android");
-#elif defined(TB_CONFIG_OS_LIKE_UNIX)
-        lua_pushstring(machine->lua, "unix");
 #else
         lua_pushstring(machine->lua, "unknown");
 #endif