modify install.bat and install xmake directly

2 files changed, 8 insertions, 14 deletions

diff --git a/core/src/xmake/machine.c b/core/src/xmake/machine.c
index ebb360629..3f33f58ef 100755
--- a/core/src/xmake/machine.c
+++ b/core/src/xmake/machine.c
@@ -152,13 +152,6 @@ static luaL_Reg const g_process_functions[] =
 ,   { tb_null,          tb_null             }
 };
 
-// patch for linking error on vs2015: unresolved external symbol ___iob_func, fprintf, fscanf
-#if defined(TB_COMPILER_IS_MSVC) && _MSC_VER >= 1900
-#   pragma comment(lib, "legacy_stdio_definitions.lib")
-FILE                        _iob[] =                { *stdin, *stdout, *stderr }; 
-extern "C" FILE* __cdecl    __iob_func(tb_void_t)   { return _iob; }
-#endif
-
 /* //////////////////////////////////////////////////////////////////////////////////////
  * private implementation
  */
diff --git a/install.bat b/install.bat
index 452f2559d..080d3989b 100644
--- a/install.bat
+++ b/install.bat
@@ -34,16 +34,17 @@ if exist "%xmake_dir_install%" rmdir /s /q "%xmake_dir_install%"
 if not exist "%xmake_dir_install%" mkdir "%xmake_dir_install%"

 

 rem compile xmake-core

-echo compiling xmake-core...

-set XMAKE_PROGRAM_DIR=%~dp0\xmake

-cd core

-..\tools\xmake.exe f -c

-..\tools\xmake.exe

-cd ..

+rem echo compiling xmake-core...

+rem set XMAKE_PROGRAM_DIR=%~dp0\xmake

+rem cd core

+rem ..\tools\xmake.exe f -c

+rem ..\tools\xmake.exe

+rem cd ..

 

 rem install the xmake core file

 echo installing xmake-core...

-set xmake_core=core\build\demo.exe

+rem set xmake_core=core\build\demo.exe

+set xmake_core=tools\xmake.exe

 set xmake_core_install=%xmake_dir_install%\xmake.exe

 copy /Y "%xmake_core%" "%xmake_core_install%" > install.log