forked from Revolutionary-Games/Thrive
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'lua' of https://github.com/Nimbal/Thrive
Conflicts: CMakeLists.txt mingw_setup/boost/install.ps1 mingw_setup/gtest/install.sh mingw_setup/readme.txt mingw_setup/setup.ps1 mingw_setup/toolchain_win.cmake.in
- Loading branch information
Showing
186 changed files
with
42,248 additions
and
1,529 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -68,3 +68,6 @@ install_manifest.txt | |
|
|
||
| # NetBeans project directory | ||
| nbproject/ | ||
|
|
||
| # Vim swap files | ||
| *.swp | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,6 @@ | ||
| [submodule "contrib/googletest"] | ||
| path = contrib/googletest | ||
| url = git://github.com/liquid-mirror/googletest.git | ||
| [submodule "contrib/luabind"] | ||
| path = contrib/luabind | ||
| url = git://github.com/rpavlik/luabind.git |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,54 @@ | ||
| ################################################################################ | ||
| # Join function to make a string out of the lists | ||
| ################################################################################ | ||
|
|
||
| function(join TARGET) | ||
| set(_list) | ||
| foreach(_element ${ARGN}) | ||
| set(_list "${_list} ${_element}") | ||
| endforeach() | ||
| string(STRIP ${_list} _list) | ||
| set(${TARGET} ${_list} PARENT_SCOPE) | ||
| endfunction() | ||
|
|
||
|
|
||
| ################################################################################ | ||
| # GCC warning flags | ||
| ################################################################################ | ||
|
|
||
| if(CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_GNUCXX) | ||
|
|
||
| join(WARNING_FLAGS | ||
| -pedantic | ||
| -Werror | ||
| -Wall | ||
| -Wextra | ||
| # Miscellaneous warnings: | ||
| -Wcast-align | ||
| -Wcast-qual | ||
| -Wdisabled-optimization | ||
| -Wfloat-equal | ||
| -Wformat=2 | ||
| -Winit-self | ||
| #-Winline # Generates many useless warnings about destructors | ||
| -Wlogical-op | ||
| -Wmissing-declarations | ||
| -Wmissing-include-dirs | ||
| -Wpointer-arith | ||
| -Wredundant-decls | ||
| -Wstrict-overflow=5 | ||
| -Wswitch-default | ||
| -Wswitch-enum | ||
| -Wundef | ||
| -Wunreachable-code | ||
| # C++ specific | ||
| -Wctor-dtor-privacy | ||
| #-Weffc++ # Annoying member initialization | ||
| -Wold-style-cast | ||
| -Woverloaded-virtual | ||
| -Wsign-promo | ||
| -Wstrict-null-sentinel | ||
| ) | ||
|
|
||
| endif() | ||
|
|
Submodule googletest
added at
b3d0b4
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,86 @@ | ||
| cmake_minimum_required(VERSION 2.8) | ||
|
|
||
| project(lua CXX) | ||
|
|
||
| set(SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/lua/src) | ||
|
|
||
| set(LIB_SOURCES | ||
| ${SOURCE_DIR}/lapi.c | ||
| ${SOURCE_DIR}/lauxlib.c | ||
| ${SOURCE_DIR}/lbaselib.c | ||
| ${SOURCE_DIR}/lbitlib.c | ||
| ${SOURCE_DIR}/lcode.c | ||
| ${SOURCE_DIR}/lcorolib.c | ||
| ${SOURCE_DIR}/lctype.c | ||
| ${SOURCE_DIR}/ldblib.c | ||
| ${SOURCE_DIR}/ldebug.c | ||
| ${SOURCE_DIR}/ldo.c | ||
| ${SOURCE_DIR}/ldump.c | ||
| ${SOURCE_DIR}/lfunc.c | ||
| ${SOURCE_DIR}/lgc.c | ||
| ${SOURCE_DIR}/linit.c | ||
| ${SOURCE_DIR}/liolib.c | ||
| ${SOURCE_DIR}/llex.c | ||
| ${SOURCE_DIR}/lmathlib.c | ||
| ${SOURCE_DIR}/lmem.c | ||
| ${SOURCE_DIR}/loadlib.c | ||
| ${SOURCE_DIR}/lobject.c | ||
| ${SOURCE_DIR}/lopcodes.c | ||
| ${SOURCE_DIR}/loslib.c | ||
| ${SOURCE_DIR}/lparser.c | ||
| ${SOURCE_DIR}/lstate.c | ||
| ${SOURCE_DIR}/lstring.c | ||
| ${SOURCE_DIR}/lstrlib.c | ||
| ${SOURCE_DIR}/ltable.c | ||
| ${SOURCE_DIR}/ltablib.c | ||
| ${SOURCE_DIR}/ltm.c | ||
| ${SOURCE_DIR}/lundump.c | ||
| ${SOURCE_DIR}/lvm.c | ||
| ${SOURCE_DIR}/lzio.c | ||
| ) | ||
|
|
||
| set(LIB_HEADERS | ||
| ${SOURCE_DIR}/lapi.h | ||
| ${SOURCE_DIR}/lauxlib.h | ||
| ${SOURCE_DIR}/lcode.h | ||
| ${SOURCE_DIR}/lctype.h | ||
| ${SOURCE_DIR}/ldebug.h | ||
| ${SOURCE_DIR}/ldo.h | ||
| ${SOURCE_DIR}/lfunc.h | ||
| ${SOURCE_DIR}/lgc.h | ||
| ${SOURCE_DIR}/llex.h | ||
| ${SOURCE_DIR}/llimits.h | ||
| ${SOURCE_DIR}/lmem.h | ||
| ${SOURCE_DIR}/lobject.h | ||
| ${SOURCE_DIR}/lopcodes.h | ||
| ${SOURCE_DIR}/lparser.h | ||
| ${SOURCE_DIR}/lstate.h | ||
| ${SOURCE_DIR}/lstring.h | ||
| ${SOURCE_DIR}/ltable.h | ||
| ${SOURCE_DIR}/ltm.h | ||
| ${SOURCE_DIR}/luaconf.h | ||
| ${SOURCE_DIR}/lualib.h | ||
| ${SOURCE_DIR}/lundump.h | ||
| ${SOURCE_DIR}/lvm.h | ||
| ${SOURCE_DIR}/lzio.h | ||
| ) | ||
|
|
||
| set_source_files_properties( | ||
| ${LIB_SOURCES} | ||
| PROPERTIES LANGUAGE CXX | ||
| ) | ||
|
|
||
| include_directories( | ||
| ${SOURCE_DIR} | ||
| ) | ||
|
|
||
| add_library(lua SHARED | ||
| ${LIB_SOURCES} | ||
| ${LIB_HEADERS} | ||
| ) | ||
|
|
||
| install(TARGETS lua | ||
| EXPORT lua | ||
| RUNTIME DESTINATION bin | ||
| LIBRARY DESTINATION bin | ||
| ) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,6 @@ | ||
|
|
||
| This is Lua 5.2.2, released on 21 Mar 2013. | ||
|
|
||
| For installation instructions, license details, and | ||
| further information about Lua, see doc/readme.html. | ||
|
|
Oops, something went wrong.