summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
Diffstat (limited to 'lib')
m---------lib/polarssl0
-rw-r--r--lib/polarssl.cmake4
-rw-r--r--lib/tolua++/src/bin/lua/_driver.lua30
3 files changed, 17 insertions, 17 deletions
diff --git a/lib/polarssl b/lib/polarssl
-Subproject 1ed82759c68f92c4acc7e3f33b850cf9f01c8ab
+Subproject 784b04ff9afd5faeaeb15c3fa159ff98adf5518
diff --git a/lib/polarssl.cmake b/lib/polarssl.cmake
index 91f0fa145..ced70b94e 100644
--- a/lib/polarssl.cmake
+++ b/lib/polarssl.cmake
@@ -1,9 +1,9 @@
if(NOT TARGET polarssl)
message("including polarssl")
+ set(ENABLE_TESTING OFF CACHE BOOL "Disable tests")
+ set(ENABLE_PROGRAMS OFF CACHE BOOL "Disable programs")
if (SELF_TEST)
- set(ENABLE_TESTING OFF CACHE BOOL "Disable tests")
- set(ENABLE_PROGRAMS OFF CACHE BOOL "Disable programs")
add_subdirectory(${CMAKE_CURRENT_LIST_DIR}/polarssl/ ${CMAKE_CURRENT_BINARY_DIR}/lib/polarssl)
else()
add_subdirectory(${CMAKE_CURRENT_LIST_DIR}/polarssl/ ${CMAKE_CURRENT_BINARY_DIR}/lib/polarssl EXCLUDE_FROM_ALL)
diff --git a/lib/tolua++/src/bin/lua/_driver.lua b/lib/tolua++/src/bin/lua/_driver.lua
index 21db96098..87ecd42ea 100644
--- a/lib/tolua++/src/bin/lua/_driver.lua
+++ b/lib/tolua++/src/bin/lua/_driver.lua
@@ -6,21 +6,21 @@ if mobdebugfound then mobdebug.start() end
-- The list of valid arguments that the ToLua scripts can process:
local KnownArgs = {
['v'] = true,
- ['h'] = true,
- ['p'] = true,
- ['P'] = true,
- ['o'] = true,
- ['n'] = true,
- ['H'] = true,
- ['S'] = true,
- ['1'] = true,
- ['L'] = true,
- ['D'] = true,
- ['W'] = true,
- ['C'] = true,
- ['E'] = true,
- ['t'] = true,
- ['q'] = true,
+ ['h'] = true,
+ ['p'] = true,
+ ['P'] = true,
+ ['o'] = true,
+ ['n'] = true,
+ ['H'] = true,
+ ['S'] = true,
+ ['1'] = true,
+ ['L'] = true,
+ ['D'] = true,
+ ['W'] = true,
+ ['C'] = true,
+ ['E'] = true,
+ ['t'] = true,
+ ['q'] = true,
}