summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorruki <[email protected]>2016-07-11 13:57:20 +0800
committerruki <[email protected]>2016-07-11 13:57:44 +0800
commit1557fd3df7e620069925ccfafb5f196a0ff60253 (patch)
tree7bc1314e57e900fded836e13d02e5ab7405ba2b3
parent7df92ed3a7a1414bf68abc7486c26f59edb79b67 (diff)
update luajit
-rw-r--r--core/pkg/luajit.pkg/inc/luajit/luaconf.h6
-rw-r--r--core/pkg/luajit.pkg/inc/luajit/luajit.h10
-rw-r--r--core/pkg/luajit.pkg/inc/luajit/lualib.h2
-rw-r--r--core/pkg/luajit.pkg/lib/mac/x64/libluajit.abin711176 -> 694840 bytes
-rw-r--r--core/pkg/luajit.pkg/lib/msvc/x86/luajit.libbin997662 -> 998806 bytes
-rw-r--r--xmake/core/main.lua2
6 files changed, 10 insertions, 10 deletions
diff --git a/core/pkg/luajit.pkg/inc/luajit/luaconf.h b/core/pkg/luajit.pkg/inc/luajit/luaconf.h
index 2688db3bb..89acb89a9 100644
--- a/core/pkg/luajit.pkg/inc/luajit/luaconf.h
+++ b/core/pkg/luajit.pkg/inc/luajit/luaconf.h
@@ -1,6 +1,6 @@
/*
** Configuration header.
-** Copyright (C) 2005-2014 Mike Pall. See Copyright Notice in luajit.h
+** Copyright (C) 2005-2015 Mike Pall. See Copyright Notice in luajit.h
*/
#ifndef luaconf_h
@@ -37,7 +37,7 @@
#endif
#define LUA_LROOT "/usr/local"
#define LUA_LUADIR "/lua/5.1/"
-#define LUA_LJDIR "/luajit-2.0.3/"
+#define LUA_LJDIR "/luajit-2.0.4/"
#ifdef LUA_ROOT
#define LUA_JROOT LUA_ROOT
@@ -127,8 +127,8 @@
#define LUA_INTFRMLEN "l"
#define LUA_INTFRM_T long
-#if 0
/* Linkage of public API functions. */
+#if 0
#if defined(LUA_BUILD_AS_DLL)
#if defined(LUA_CORE) || defined(LUA_LIB)
#define LUA_API __declspec(dllexport)
diff --git a/core/pkg/luajit.pkg/inc/luajit/luajit.h b/core/pkg/luajit.pkg/inc/luajit/luajit.h
index 66c76405e..c5227467d 100644
--- a/core/pkg/luajit.pkg/inc/luajit/luajit.h
+++ b/core/pkg/luajit.pkg/inc/luajit/luajit.h
@@ -1,7 +1,7 @@
/*
** LuaJIT -- a Just-In-Time Compiler for Lua. http://luajit.org/
**
-** Copyright (C) 2005-2014 Mike Pall. All rights reserved.
+** Copyright (C) 2005-2015 Mike Pall. All rights reserved.
**
** Permission is hereby granted, free of charge, to any person obtaining
** a copy of this software and associated documentation files (the
@@ -32,10 +32,10 @@
#include "lualib.h"
#include "lauxlib.h"
-#define LUAJIT_VERSION "LuaJIT 2.0.3"
-#define LUAJIT_VERSION_NUM 20003 /* Version 2.0.3 = 02.00.03. */
-#define LUAJIT_VERSION_SYM luaJIT_version_2_0_3
-#define LUAJIT_COPYRIGHT "Copyright (C) 2005-2014 Mike Pall"
+#define LUAJIT_VERSION "LuaJIT 2.0.4"
+#define LUAJIT_VERSION_NUM 20004 /* Version 2.0.4 = 02.00.04. */
+#define LUAJIT_VERSION_SYM luaJIT_version_2_0_4
+#define LUAJIT_COPYRIGHT "Copyright (C) 2005-2015 Mike Pall"
#define LUAJIT_URL "http://luajit.org/"
/* Modes for luaJIT_setmode. */
diff --git a/core/pkg/luajit.pkg/inc/luajit/lualib.h b/core/pkg/luajit.pkg/inc/luajit/lualib.h
index 1c1e31799..96530e79a 100644
--- a/core/pkg/luajit.pkg/inc/luajit/lualib.h
+++ b/core/pkg/luajit.pkg/inc/luajit/lualib.h
@@ -1,6 +1,6 @@
/*
** Standard library header.
-** Copyright (C) 2005-2014 Mike Pall. See Copyright Notice in luajit.h
+** Copyright (C) 2005-2015 Mike Pall. See Copyright Notice in luajit.h
*/
#ifndef _LUALIB_H
diff --git a/core/pkg/luajit.pkg/lib/mac/x64/libluajit.a b/core/pkg/luajit.pkg/lib/mac/x64/libluajit.a
index 34d38c513..73cd64373 100644
--- a/core/pkg/luajit.pkg/lib/mac/x64/libluajit.a
+++ b/core/pkg/luajit.pkg/lib/mac/x64/libluajit.a
Binary files differ
diff --git a/core/pkg/luajit.pkg/lib/msvc/x86/luajit.lib b/core/pkg/luajit.pkg/lib/msvc/x86/luajit.lib
index d6e43d9f0..50df1f898 100644
--- a/core/pkg/luajit.pkg/lib/msvc/x86/luajit.lib
+++ b/core/pkg/luajit.pkg/lib/msvc/x86/luajit.lib
Binary files differ
diff --git a/xmake/core/main.lua b/xmake/core/main.lua
index 37017a03c..3e8f02763 100644
--- a/xmake/core/main.lua
+++ b/xmake/core/main.lua
@@ -40,7 +40,7 @@ local menu =
title = xmake._VERSION .. ", The Automatic Cross-platform Build Tool"
-- copyright
-, copyright = "Copyright (C) 2015-2016 Ruki Wang, tboox.org\nCopyright (C) 2005-2014 Mike Pall, luajit.org"
+, copyright = "Copyright (C) 2015-2016 Ruki Wang, tboox.org\nCopyright (C) 2005-2015 Mike Pall, luajit.org"
-- the tasks: xmake [task]
, task.menu