Merged default into minor

--HG--
branch : minor
This commit is contained in:
Alex Szpakowski
2015-01-22 02:18:56 -04:00
11 changed files with 418 additions and 6 deletions
+13
View File
@@ -1041,6 +1041,18 @@ set(LOVE_SRC_3P_LUASOCKET
add_library(love_3p_luasocket ${LOVE_SRC_3P_LUASOCKET})
target_link_libraries(love_3p_luasocket ${MEGA_LUA})
#
# Lua 5.3's UTF-8 library
#
set(LOVE_SRC_3P_LUAUTF8
src/libraries/luautf8/lprefix.h
src/libraries/luautf8/lutf8lib.c
src/libraries/luautf8/lutf8lib.h
)
add_library(love_3p_luautf8 ${LOVE_SRC_3P_LUAUTF8})
target_link_libraries(love_3p_luautf8 ${MEGA_LUA})
#
# noise1234
#
@@ -1106,6 +1118,7 @@ set(LOVE_3P
love_3p_glad
love_3p_lodepng
love_3p_luasocket
love_3p_luautf8
love_3p_noise1234
love_3p_wuff
)