add g++ and support linux

6 files changed, 232 insertions, 0 deletions

diff --git a/core/pkg/luajit.pkg/lib/linux/x64/libluajit.a b/core/pkg/luajit.pkg/lib/linux/x64/libluajit.a
new file mode 100644
index 000000000..0207c4ad7
--- /dev/null
+++ b/core/pkg/luajit.pkg/lib/linux/x64/libluajit.a
diff --git a/core/pkg/luajit.pkg/manifest.json b/core/pkg/luajit.pkg/manifest.json
index 315552ed7..2043e853d 100755
--- a/core/pkg/luajit.pkg/manifest.json
+++ b/core/pkg/luajit.pkg/manifest.json
@@ -27,6 +27,12 @@
             "x64":      "$.compiler.default"
         }
 
+    ,   "linux" :
+        {
+            "x64":      "$.compiler.default"
+        ,   "x86":      "$.compiler.default"
+        }
+
     ,   "msvc" :
         {
             "x86":      "$.compiler.default"
diff --git a/core/pkg/tbox.pkg/inc/linux/x64/tbox.config.h b/core/pkg/tbox.pkg/inc/linux/x64/tbox.config.h
new file mode 100755
index 000000000..e2c7d55d9
--- /dev/null
+++ b/core/pkg/tbox.pkg/inc/linux/x64/tbox.config.h
@@ -0,0 +1,101 @@
+#ifndef TB_CONFIG_H
+#define TB_CONFIG_H
+
+// packages
+           #define TB_CONFIG_PACKAGE_HAVE_BASE
+
+
+// major version
+#define TB_CONFIG_VERSION_MAJOR         1
+
+// minor version
+#define TB_CONFIG_VERSION_MINOR         4
+
+// alter version
+#define TB_CONFIG_VERSION_ALTER         8
+
+// build version
+#define TB_CONFIG_VERSION_BUILD         201506071729
+
+// debug
+#define TB_CONFIG_DEBUG                 (1)
+
+// small
+#define TB_CONFIG_SMALL                 (0)
+
+// os
+#define TB_CONFIG_OS_LINUX
+#define TB_CONFIG_OS_LIKE_UNIX
+
+// api
+#define TB_CONFIG_API_HAVE_POSIX
+#define TB_CONFIG_API_HAVE_SYSTEMV
+
+// type
+#define TB_CONFIG_TYPE_FLOAT
+
+// memory
+//#define TB_CONFIG_MEMORY_UNALIGNED_ACCESS_ENABLE
+
+// trace
+//#define TB_CONFIG_TRACE_INFO_ONLY
+
+// exception
+#define TB_CONFIG_EXCEPTION_ENABLE
+
+// libc
+#define TB_CONFIG_LIBC_HAVE_MEMCPY
+//#define TB_CONFIG_LIBC_HAVE_MEMSET
+#define TB_CONFIG_LIBC_HAVE_MEMMOV
+#define TB_CONFIG_LIBC_HAVE_MEMCMP
+#define TB_CONFIG_LIBC_HAVE_STRCAT
+#define TB_CONFIG_LIBC_HAVE_STRNCAT
+//#define TB_CONFIG_LIBC_HAVE_STRCPY
+//#define TB_CONFIG_LIBC_HAVE_STRNCPY
+//#define TB_CONFIG_LIBC_HAVE_STRLCPY
+#define TB_CONFIG_LIBC_HAVE_STRLEN 
+#define TB_CONFIG_LIBC_HAVE_STRNLEN
+#define TB_CONFIG_LIBC_HAVE_STRSTR
+#define TB_CONFIG_LIBC_HAVE_STRISTR
+#define TB_CONFIG_LIBC_HAVE_STRCMP
+#define TB_CONFIG_LIBC_HAVE_STRICMP
+#define TB_CONFIG_LIBC_HAVE_STRNCMP
+#define TB_CONFIG_LIBC_HAVE_STRNICMP
+#define TB_CONFIG_LIBC_HAVE_WCSCAT
+#define TB_CONFIG_LIBC_HAVE_WCSNCAT
+#define TB_CONFIG_LIBC_HAVE_WCSCPY
+#define TB_CONFIG_LIBC_HAVE_WCSNCPY
+//#define TB_CONFIG_LIBC_HAVE_WCSLCPY
+#define TB_CONFIG_LIBC_HAVE_WCSLEN 
+#define TB_CONFIG_LIBC_HAVE_WCSNLEN
+#define TB_CONFIG_LIBC_HAVE_WCSSTR
+//#define TB_CONFIG_LIBC_HAVE_WCSISTR
+#define TB_CONFIG_LIBC_HAVE_WCSCMP
+//#define TB_CONFIG_LIBC_HAVE_WCSICMP
+#define TB_CONFIG_LIBC_HAVE_WCSNCMP
+//#define TB_CONFIG_LIBC_HAVE_WCSNICMP
+#define TB_CONFIG_LIBC_HAVE_WCSTOMBS
+#define TB_CONFIG_LIBC_HAVE_MBSTOWCS
+#define TB_CONFIG_LIBC_HAVE_GMTIME
+#define TB_CONFIG_LIBC_HAVE_MKTIME
+#define TB_CONFIG_LIBC_HAVE_LOCALTIME
+#define TB_CONFIG_LIBC_HAVE_SIGNAL
+#define TB_CONFIG_LIBC_HAVE_SETJMP
+#define TB_CONFIG_LIBC_HAVE_SIGSETJMP
+#define TB_CONFIG_LIBC_HAVE_BACKTRACE
+
+// libm
+#define TB_CONFIG_LIBM_HAVE_SINCOS
+#define TB_CONFIG_LIBM_HAVE_SINCOSF
+#define TB_CONFIG_LIBM_HAVE_LOG2
+#define TB_CONFIG_LIBM_HAVE_LOG2F
+
+// module
+#define TB_CONFIG_MODULE_HAVE_XML
+#define TB_CONFIG_MODULE_HAVE_ZIP
+#define TB_CONFIG_MODULE_HAVE_ASIO
+#define TB_CONFIG_MODULE_HAVE_OBJECT
+#define TB_CONFIG_MODULE_HAVE_CHARSET
+#define TB_CONFIG_MODULE_HAVE_DATABASE
+
+#endif
diff --git a/core/pkg/tbox.pkg/inc/linux/x86/tbox.config.h b/core/pkg/tbox.pkg/inc/linux/x86/tbox.config.h
new file mode 100755
index 000000000..22fd0fdca
--- /dev/null
+++ b/core/pkg/tbox.pkg/inc/linux/x86/tbox.config.h
@@ -0,0 +1,101 @@
+#ifndef TB_CONFIG_H
+#define TB_CONFIG_H
+
+// packages
+           #define TB_CONFIG_PACKAGE_HAVE_BASE
+
+
+// major version
+#define TB_CONFIG_VERSION_MAJOR         1
+
+// minor version
+#define TB_CONFIG_VERSION_MINOR         4
+
+// alter version
+#define TB_CONFIG_VERSION_ALTER         8
+
+// build version
+#define TB_CONFIG_VERSION_BUILD         201506071729
+
+// debug
+#define TB_CONFIG_DEBUG                 (0)
+
+// small
+#define TB_CONFIG_SMALL                 (0)
+
+// os
+#define TB_CONFIG_OS_LINUX
+#define TB_CONFIG_OS_LIKE_UNIX
+
+// api
+#define TB_CONFIG_API_HAVE_POSIX
+#define TB_CONFIG_API_HAVE_SYSTEMV
+
+// type
+#define TB_CONFIG_TYPE_FLOAT
+
+// memory
+//#define TB_CONFIG_MEMORY_UNALIGNED_ACCESS_ENABLE
+
+// trace
+//#define TB_CONFIG_TRACE_INFO_ONLY
+
+// exception
+#define TB_CONFIG_EXCEPTION_ENABLE
+
+// libc
+#define TB_CONFIG_LIBC_HAVE_MEMCPY
+//#define TB_CONFIG_LIBC_HAVE_MEMSET
+#define TB_CONFIG_LIBC_HAVE_MEMMOV
+#define TB_CONFIG_LIBC_HAVE_MEMCMP
+#define TB_CONFIG_LIBC_HAVE_STRCAT
+#define TB_CONFIG_LIBC_HAVE_STRNCAT
+//#define TB_CONFIG_LIBC_HAVE_STRCPY
+//#define TB_CONFIG_LIBC_HAVE_STRNCPY
+//#define TB_CONFIG_LIBC_HAVE_STRLCPY
+#define TB_CONFIG_LIBC_HAVE_STRLEN 
+#define TB_CONFIG_LIBC_HAVE_STRNLEN
+#define TB_CONFIG_LIBC_HAVE_STRSTR
+#define TB_CONFIG_LIBC_HAVE_STRISTR
+#define TB_CONFIG_LIBC_HAVE_STRCMP
+#define TB_CONFIG_LIBC_HAVE_STRICMP
+#define TB_CONFIG_LIBC_HAVE_STRNCMP
+#define TB_CONFIG_LIBC_HAVE_STRNICMP
+#define TB_CONFIG_LIBC_HAVE_WCSCAT
+#define TB_CONFIG_LIBC_HAVE_WCSNCAT
+#define TB_CONFIG_LIBC_HAVE_WCSCPY
+#define TB_CONFIG_LIBC_HAVE_WCSNCPY
+//#define TB_CONFIG_LIBC_HAVE_WCSLCPY
+#define TB_CONFIG_LIBC_HAVE_WCSLEN 
+#define TB_CONFIG_LIBC_HAVE_WCSNLEN
+#define TB_CONFIG_LIBC_HAVE_WCSSTR
+//#define TB_CONFIG_LIBC_HAVE_WCSISTR
+#define TB_CONFIG_LIBC_HAVE_WCSCMP
+//#define TB_CONFIG_LIBC_HAVE_WCSICMP
+#define TB_CONFIG_LIBC_HAVE_WCSNCMP
+//#define TB_CONFIG_LIBC_HAVE_WCSNICMP
+#define TB_CONFIG_LIBC_HAVE_WCSTOMBS
+#define TB_CONFIG_LIBC_HAVE_MBSTOWCS
+#define TB_CONFIG_LIBC_HAVE_GMTIME
+#define TB_CONFIG_LIBC_HAVE_MKTIME
+#define TB_CONFIG_LIBC_HAVE_LOCALTIME
+#define TB_CONFIG_LIBC_HAVE_SIGNAL
+#define TB_CONFIG_LIBC_HAVE_SETJMP
+#define TB_CONFIG_LIBC_HAVE_SIGSETJMP
+#define TB_CONFIG_LIBC_HAVE_BACKTRACE
+
+// libm
+#define TB_CONFIG_LIBM_HAVE_SINCOS
+#define TB_CONFIG_LIBM_HAVE_SINCOSF
+#define TB_CONFIG_LIBM_HAVE_LOG2
+#define TB_CONFIG_LIBM_HAVE_LOG2F
+
+// module
+#define TB_CONFIG_MODULE_HAVE_XML
+#define TB_CONFIG_MODULE_HAVE_ZIP
+#define TB_CONFIG_MODULE_HAVE_ASIO
+#define TB_CONFIG_MODULE_HAVE_OBJECT
+#define TB_CONFIG_MODULE_HAVE_CHARSET
+#define TB_CONFIG_MODULE_HAVE_DATABASE
+
+#endif
diff --git a/xmake/scripts/platform/linux/prober.lua b/xmake/scripts/platform/linux/prober.lua
index 1a3024df1..963cc440d 100644
--- a/xmake/scripts/platform/linux/prober.lua
+++ b/xmake/scripts/platform/linux/prober.lua
@@ -25,6 +25,7 @@ local os        = require("base/os")
 local path      = require("base/path")
 local utils     = require("base/utils")
 local string    = require("base/string")
+local tools     = require("tools/tools")
 
 -- define module: prober
 local prober = prober or {}
diff --git a/xmake/scripts/tools/g++.lua b/xmake/scripts/tools/g++.lua
new file mode 100644
index 000000000..f60a86ba5
--- /dev/null
+++ b/xmake/scripts/tools/g++.lua
@@ -0,0 +1,23 @@
+--!The Automatic Cross-platform Build Tool
+-- 
+-- XMake is free software; you can redistribute it and/or modify
+-- it under the terms of the GNU Lesser General Public License as published by
+-- the Free Software Foundation; either version 2.1 of the License, or
+-- (at your option) any later version.
+-- 
+-- XMake is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU Lesser General Public License for more details.
+-- 
+-- You should have received a copy of the GNU Lesser General Public License
+-- along with XMake; 
+-- If not, see <a href="http://www.gnu.org/licenses/"> http://www.gnu.org/licenses/</a>
+-- 
+-- Copyright (C) 2009 - 2015, ruki All rights reserved.
+--
+-- @author      ruki
+-- @file        g++.lua
+--
+
+return require("tools/gcc")