This repository was archived by the owner on Nov 20, 2020. It is now read-only.
File tree Expand file tree Collapse file tree 1 file changed +9
-1
lines changed Expand file tree Collapse file tree 1 file changed +9
-1
lines changed Original file line number Diff line number Diff line change @@ -36,12 +36,13 @@ else ()
36
36
set ( LUA_DIR ${CMAKE_INSTALL_PREFIX} CACHE STRING "Destination from which modules will be resolved. See INSTALL_LMOD and INSTALL_CMOD." )
37
37
endif ()
38
38
39
- set ( LUA_PATH_DEFAULT "./?.lua;${LUA_DIR}${LUA_LDIR} /?.lua;${LUA_DIR}${LUA_LDIR} /?/init.lua" )
39
+ set ( LUA_PATH_DEFAULT "./?.lua;${LUA_DIR}${LUA_LDIR} /?.lua;${LUA_DIR}${LUA_LDIR} /?/init.lua;./?/init.lua " )
40
40
set ( LUA_CPATH_DEFAULT "./?${LUA_MODULE_SUFFIX} ;${LUA_DIR}${LUA_CDIR} /?${LUA_MODULE_SUFFIX} ;${LUA_DIR}${LUA_CDIR} /loadall${LUA_MODULE_SUFFIX} " )
41
41
42
42
if ( WIN32 AND NOT CYGWIN )
43
43
# Windows systems
44
44
option ( LUA_WIN "Windows specific build." ON )
45
+ option ( LUA_BUILD_WLUA "Build wLua interpretter without console output." ON )
45
46
option ( LUA_BUILD_AS_DLL "Build Lua library as Dll." ON )
46
47
# Paths (Double escapes needed)
47
48
set ( LUA_DIRSEP "\\\\ " )
@@ -135,6 +136,13 @@ target_link_libraries ( liblua_static ${LIBS} )
135
136
add_executable ( lua ${SRC_LUA} ${LUA_RC} )
136
137
target_link_libraries ( lua liblua )
137
138
139
+ # On windows a variant of the lua interpreter without console output needs to be built
140
+ if (LUA_BUILD_WLUA )
141
+ add_executable ( wlua WIN32 ${SRC_LUA} ${LUA_RC} )
142
+ target_link_libraries ( wlua liblua )
143
+ install_executable ( wlua )
144
+ endif ()
145
+
138
146
add_executable ( luac ${SRC_LUAC} ${LUAC_RC} )
139
147
target_link_libraries ( luac liblua_static )
140
148
You can’t perform that action at this time.
0 commit comments