From 7e1eaad77a9b18b3da5ad4f0148d59fb800d32ad Mon Sep 17 00:00:00 2001 From: ruki Date: Mon, 27 Apr 2015 15:28:05 +0800 Subject: add install.bat for windows --- core/build.bat | 9 +++++++++ core/build.sh | 5 +++++ core/pkg/luajit.pkg/inc/luajit/luaconf.h | 7 +++++++ core/pkg/luajit.pkg/lib/msvc/x86/luajit.lib | Bin 0 -> 997662 bytes core/pkg/luajit.pkg/manifest.json | 5 +++++ core/pkg/tbox.pkg/inc/msvc/x86/tbox.config.h | 4 ++-- core/pkg/tbox.pkg/lib/msvc/x86/tboxd.pdb | Bin 274432 -> 290816 bytes core/pkg/tbox.pkg/lib/msvc/x86/tboxr.pdb | Bin 274432 -> 282624 bytes install.bat | 11 +++++++++++ 9 files changed, 39 insertions(+), 2 deletions(-) create mode 100644 core/build.bat create mode 100755 core/build.sh create mode 100644 core/pkg/luajit.pkg/lib/msvc/x86/luajit.lib create mode 100644 install.bat diff --git a/core/build.bat b/core/build.bat new file mode 100644 index 000000000..d07a77d60 --- /dev/null +++ b/core/build.bat @@ -0,0 +1,9 @@ +@echo off +if not exist tool\msys\bin tool\7z.exe x tool\msys\bin.7z -otool\msys > nul +if not exist tool\msys\local\bin tool\7z.exe x tool\msys\local\bin.7z -otool\msys\local > nul +if not exist tool\msys\local\inc tool\7z.exe x tool\msys\local\inc.7z -otool\msys\local > nul +if not exist tool\msys\local\lib tool\7z.exe x tool\msys\local\lib.7z -otool\msys\local > nul +rem echo '%temp%' /tmp > tool\msys\etc\fstab +echo HOME='%~dp0' > tool\msys\etc\home +cmd /K tool\msys\msys.bat +exit diff --git a/core/build.sh b/core/build.sh new file mode 100755 index 000000000..53b916997 --- /dev/null +++ b/core/build.sh @@ -0,0 +1,5 @@ +#!/bin/sh +rm .config.mak +make f DEBUG=n +make r +exit diff --git a/core/pkg/luajit.pkg/inc/luajit/luaconf.h b/core/pkg/luajit.pkg/inc/luajit/luaconf.h index affb7da8f..2688db3bb 100644 --- a/core/pkg/luajit.pkg/inc/luajit/luaconf.h +++ b/core/pkg/luajit.pkg/inc/luajit/luaconf.h @@ -127,6 +127,7 @@ #define LUA_INTFRMLEN "l" #define LUA_INTFRM_T long +#if 0 /* Linkage of public API functions. */ #if defined(LUA_BUILD_AS_DLL) #if defined(LUA_CORE) || defined(LUA_LIB) @@ -137,6 +138,12 @@ #else #define LUA_API extern #endif +#endif +#if defined(_WIN32) +#define LUA_API extern "C" +#else +#define LUA_API extern +#endif #define LUALIB_API LUA_API diff --git a/core/pkg/luajit.pkg/lib/msvc/x86/luajit.lib b/core/pkg/luajit.pkg/lib/msvc/x86/luajit.lib new file mode 100644 index 000000000..d6e43d9f0 Binary files /dev/null and b/core/pkg/luajit.pkg/lib/msvc/x86/luajit.lib differ diff --git a/core/pkg/luajit.pkg/manifest.json b/core/pkg/luajit.pkg/manifest.json index 969f38530..315552ed7 100755 --- a/core/pkg/luajit.pkg/manifest.json +++ b/core/pkg/luajit.pkg/manifest.json @@ -26,5 +26,10 @@ { "x64": "$.compiler.default" } + + , "msvc" : + { + "x86": "$.compiler.default" + } } } diff --git a/core/pkg/tbox.pkg/inc/msvc/x86/tbox.config.h b/core/pkg/tbox.pkg/inc/msvc/x86/tbox.config.h index e53f6183d..cf912fd77 100644 --- a/core/pkg/tbox.pkg/inc/msvc/x86/tbox.config.h +++ b/core/pkg/tbox.pkg/inc/msvc/x86/tbox.config.h @@ -15,10 +15,10 @@ #define TB_CONFIG_VERSION_ALTER 8 // build version -#define TB_CONFIG_VERSION_BUILD 201412261501 +#define TB_CONFIG_VERSION_BUILD 201504271443 // small -#define TB_CONFIG_SMALL (0) +#define TB_CONFIG_SMALL (1) // os #define TB_CONFIG_OS_WINDOWS diff --git a/core/pkg/tbox.pkg/lib/msvc/x86/tboxd.pdb b/core/pkg/tbox.pkg/lib/msvc/x86/tboxd.pdb index 8ec864d1a..522dedf4d 100644 Binary files a/core/pkg/tbox.pkg/lib/msvc/x86/tboxd.pdb and b/core/pkg/tbox.pkg/lib/msvc/x86/tboxd.pdb differ diff --git a/core/pkg/tbox.pkg/lib/msvc/x86/tboxr.pdb b/core/pkg/tbox.pkg/lib/msvc/x86/tboxr.pdb index fb3449589..895a17b7e 100644 Binary files a/core/pkg/tbox.pkg/lib/msvc/x86/tboxr.pdb and b/core/pkg/tbox.pkg/lib/msvc/x86/tboxr.pdb differ diff --git a/install.bat b/install.bat new file mode 100644 index 000000000..e4196dc4b --- /dev/null +++ b/install.bat @@ -0,0 +1,11 @@ +@echo off + +rem compile xmake-core +echo compiling xmake-core... +cd core +cmd /K build.bat +cd .. + +rem ok +echo ok! +pause -- cgit v1.3.1