updated Lua to 5.2.3 (win32, VC10)

CMakeLists.txt

@@ -10,7 +10,7 @@ if(WIN32)
 	if(BUNDLED_JPEG) # static
 		check_include_file ( stddef.h HAVE_STDDEF_H )
 		check_include_file ( stdlib.h HAVE_STDLIB_H )
-		
+
 		set(JPEG_LIB "${CMAKE_CURRENT_LIST_DIR}/jpeg")
 		if(MSVC)
     		add_definitions ( -D_CRT_SECURE_NO_WARNINGS )
@@ -19,11 +19,11 @@ if(WIN32)
 		if(WIN32 AND NOT CYGWIN)
 		  set(TWO_FILE_COMMANDLINE true)
 		endif()
-		
+
 		configure_file (${JPEG_LIB}/jconfig.h.cmake ${JPEG_LIB}/jconfig.h)
 
 		#include_directories(${CMAKE_CURRENT_BINARY_DIR})
-		FILE(GLOB JPEG_LIB_HEADERS 
+		FILE(GLOB JPEG_LIB_HEADERS
 		  ${JPEG_LIB}/jerror.h
 		  ${JPEG_LIB}/jmorecfg.h
 		  ${JPEG_LIB}/jpeglib.h
@@ -114,7 +114,7 @@ if(WIN32)
 	endif(BUNDLED_CURL)
 
 	#-----------------------------------------------------------------
-	# Build bundled Lua 5.1 library
+	# Build bundled Lua library
 	#-----------------------------------------------------------------
 	if(BUNDLED_LUA)
 		set(LUA_LIB "${CMAKE_CURRENT_LIST_DIR}/lua/src")
@@ -249,7 +249,7 @@ if(WIN32)
 		    ${VPATH}/lib/window.c
 		)
 
-		SET(VORBIS_HEADERS 
+		SET(VORBIS_HEADERS
 		    ${VPATH}/lib/backends.h
 		    ${VPATH}/lib/bitrate.h
 		    ${VPATH}/lib/codebook.h
@@ -327,13 +327,13 @@ if(WIN32)
 		set(OGG_VORBIS_BUNDLED_LIBRARIES bundled_ogg_vorbis bundled_ogg_vorbis_file)
 		set(OGG_VORBIS_BUNDLED_INCLUDE_DIR "${CMAKE_CURRENT_LIST_DIR}/vorbis/include")
 	endif(BUNDLED_OGG_VORBIS)
-	
+
 elseif(UNIX)
 
 	if(CROSS_COMPILE32)
 		set(CROSS_COMPILE32_FLAGS CFLAGS=-m32 LDFLAGS=-m32)
 	else(CROSS_COMPILE32)
-		
+
 		# when we don't cross compile we have to enable position independant code '-fPIC' for all bundled libs
 		# see http://stackoverflow.com/questions/7216244/why-is-fpic-absolutely-necessary-on-64-and-not-on-32bit-platforms
 		# let's misuse CROSS_COMPILE32_FLAGS var (for 64bit) to set our flag. FIXME: rename to CROSS_COMPILE_OPTIONAL_FLAGS?
@@ -365,7 +365,7 @@ elseif(UNIX)
 		set(CURL_BUNDLED_LIBRARY "${CMAKE_CURRENT_LIST_DIR}/curl/lib/.libs/libcurl.a")
 		set(CURL_BUNDLED_INCLUDE_DIR "${CMAKE_CURRENT_LIST_DIR}/curl/include")
 	endif(BUNDLED_CURL)
-	
+
 	#-----------------------------------------------------------------
 	# Build bundled JPEG library
 	#-----------------------------------------------------------------
@@ -402,7 +402,7 @@ elseif(UNIX)
 	endif(BUNDLED_SDL)
 
 	#-----------------------------------------------------------------
-	# Build bundled Lua 5.1 library
+	# Build bundled Lua library
 	#-----------------------------------------------------------------
 	# NOTE: the posix32bit target was added into the Lua Makefiles
 	if(BUNDLED_LUA)
@@ -512,7 +512,7 @@ if(BUNDLED_JANSSON)
 		CMAKE_ARGS	-DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} -DCMAKE_CXX_FLAGS=${CMAKE_CXX_FLAGS}  -DCMAKE_CXX_FLAGS_DEBUG=${CMAKE_CXX_FLAGS_DEBUG} -DCMAKE_CXX_FLAGS_RELEASE=${CMAKE_CXX_FLAGS_RELEASE} -DCMAKE_C_FLAGS=${CMAKE_C_FLAGS} -DJANSSON_WITHOUT_TESTS=1 -DBUILD_DOCS=0 -DJANSSON_STATIC_CRT=1 -DJANSSON_BUILD_DOCS=0
 		INSTALL_COMMAND  ""
 	)
-	
+
 	ExternalProject_Get_Property(bundled_jansson binary_dir)
 
 	if(WIN32 AND DEBUG_BUILD)
@@ -520,7 +520,7 @@ if(BUNDLED_JANSSON)
 	else(WIN32 AND DEBUG_BUILD)
 		set(jansson_name "jansson${CMAKE_STATIC_LIBRARY_SUFFIX}")
 	endif(WIN32 AND DEBUG_BUILD)
-	
+
 	if(VSTUDIO)
 		set(BUNDLED_JASSON_LIBRARIES optimized "${binary_dir}/lib/Release/jansson${CMAKE_STATIC_LIBRARY_SUFFIX}" debug "${binary_dir}/lib/Debug/jansson_d${CMAKE_STATIC_LIBRARY_SUFFIX}")
 	elseif(NMAKE_BUILD)

lua-windows/README.txt

@@ -1,3 +1,3 @@
-Precompiled binaries taken from the "Lua for Windows" project.
+Precompiled binaries taken from the "LuaBinaries" project.
 
-http://code.google.com/p/luaforwindows/
+http://luabinaries.sourceforge.net/