summaryrefslogtreecommitdiff
path: root/core
diff options
context:
space:
mode:
authorruki <[email protected]>2015-04-27 15:28:05 +0800
committerruki <[email protected]>2015-04-27 15:28:05 +0800
commit7e1eaad77a9b18b3da5ad4f0148d59fb800d32ad (patch)
tree26a6a8dbe2026f0089201e331242461a802da1a9 /core
parent3987c001cff96c26aed3067943886f3fd72d3fa8 (diff)
add install.bat for windows
Diffstat (limited to 'core')
-rw-r--r--core/build.bat9
-rwxr-xr-xcore/build.sh5
-rw-r--r--core/pkg/luajit.pkg/inc/luajit/luaconf.h7
-rw-r--r--core/pkg/luajit.pkg/lib/msvc/x86/luajit.libbin0 -> 997662 bytes
-rwxr-xr-xcore/pkg/luajit.pkg/manifest.json5
-rw-r--r--core/pkg/tbox.pkg/inc/msvc/x86/tbox.config.h4
-rw-r--r--core/pkg/tbox.pkg/lib/msvc/x86/tboxd.pdbbin274432 -> 290816 bytes
-rw-r--r--core/pkg/tbox.pkg/lib/msvc/x86/tboxr.pdbbin274432 -> 282624 bytes
8 files changed, 28 insertions, 2 deletions
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
--- /dev/null
+++ b/core/pkg/luajit.pkg/lib/msvc/x86/luajit.lib
Binary files 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
--- a/core/pkg/tbox.pkg/lib/msvc/x86/tboxd.pdb
+++ b/core/pkg/tbox.pkg/lib/msvc/x86/tboxd.pdb
Binary files 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
--- a/core/pkg/tbox.pkg/lib/msvc/x86/tboxr.pdb
+++ b/core/pkg/tbox.pkg/lib/msvc/x86/tboxr.pdb
Binary files differ