New release 0.10.1

This commit is contained in:
Martin Felis
2016-02-14 00:30:02 +01:00
parent 7aaeb1485e
commit 7459285690
36 changed files with 761 additions and 209 deletions
+155 -44
View File
@@ -1,5 +1,5 @@
#
# Copyright (c) 2006-2014 LOVE Development Team
# Copyright (c) 2006-2016 LOVE Development Team
#
# This software is provided 'as-is', without any express or implied
# warranty. In no event will the authors be held liable for any damages
@@ -46,6 +46,7 @@ else()
endif()
option(LOVE_JIT "Use LuaJIT" TRUE)
option(LOVE_MPG123 "Use mpg123" TRUE)
if(LOVE_JIT)
message(STATUS "LuaJIT: Enabled")
@@ -53,6 +54,10 @@ else()
message(STATUS "LuaJIT: Disabled")
endif()
if(NOT LOVE_MPG123)
add_definitions(-DLOVE_NOMPG123)
endif()
message(STATUS "Target platform: ${LOVE_TARGET_PLATFORM}")
find_package(OpenGL)
@@ -97,6 +102,7 @@ set(LOVE_SRC_COMMON
src/common/runtime.cpp
src/common/runtime.h
src/common/StringMap.h
src/common/types.cpp
src/common/types.h
src/common/utf8.cpp
src/common/utf8.h
@@ -159,13 +165,13 @@ source_group("modules\\audio\\openal" FILES ${LOVE_SRC_MODULE_AUDIO_OPENAL})
set(LOVE_SRC_MODULE_EVENT_ROOT
src/modules/event/Event.cpp
src/modules/event/Event.h
src/modules/event/wrap_Event.cpp
src/modules/event/wrap_Event.h
)
set(LOVE_SRC_MODULE_EVENT_SDL
src/modules/event/sdl/Event.cpp
src/modules/event/sdl/Event.h
src/modules/event/sdl/wrap_Event.cpp
src/modules/event/sdl/wrap_Event.h
)
set(LOVE_SRC_MODULE_EVENT
@@ -181,10 +187,16 @@ source_group("modules\\event\\sdl" FILES ${LOVE_SRC_MODULE_EVENT_SDL})
#
set(LOVE_SRC_MODULE_FILESYSTEM_ROOT
src/modules/filesystem/DroppedFile.cpp
src/modules/filesystem/DroppedFile.h
src/modules/filesystem/File.cpp
src/modules/filesystem/File.h
src/modules/filesystem/FileData.cpp
src/modules/filesystem/FileData.h
src/modules/filesystem/Filesystem.cpp
src/modules/filesystem/Filesystem.h
src/modules/filesystem/wrap_DroppedFile.cpp
src/modules/filesystem/wrap_DroppedFile.h
src/modules/filesystem/wrap_File.cpp
src/modules/filesystem/wrap_File.h
src/modules/filesystem/wrap_FileData.cpp
@@ -213,6 +225,9 @@ source_group("modules\\filesystem\\physfs" FILES ${LOVE_SRC_MODULE_FILESYSTEM_PH
#
set(LOVE_SRC_MODULE_FONT_ROOT
src/modules/font/BMFontRasterizer.cpp
src/modules/font/BMFontRasterizer.h
src/modules/font/Font.cpp
src/modules/font/Font.h
src/modules/font/GlyphData.cpp
src/modules/font/GlyphData.h
@@ -220,6 +235,10 @@ set(LOVE_SRC_MODULE_FONT_ROOT
src/modules/font/ImageRasterizer.h
src/modules/font/Rasterizer.cpp
src/modules/font/Rasterizer.h
src/modules/font/TrueTypeRasterizer.cpp
src/modules/font/TrueTypeRasterizer.h
src/modules/font/wrap_Font.cpp
src/modules/font/wrap_Font.h
src/modules/font/wrap_GlyphData.cpp
src/modules/font/wrap_GlyphData.h
src/modules/font/wrap_Rasterizer.cpp
@@ -231,8 +250,6 @@ set(LOVE_SRC_MODULE_FONT_FREETYPE
src/modules/font/freetype/Font.h
src/modules/font/freetype/TrueTypeRasterizer.cpp
src/modules/font/freetype/TrueTypeRasterizer.h
src/modules/font/freetype/wrap_Font.cpp
src/modules/font/freetype/wrap_Font.h
)
set(LOVE_SRC_MODULE_FONT
@@ -252,12 +269,18 @@ set(LOVE_SRC_MODULE_GRAPHICS_ROOT
src/modules/graphics/Drawable.h
src/modules/graphics/Graphics.cpp
src/modules/graphics/Graphics.h
src/modules/graphics/ParticleSystem.cpp
src/modules/graphics/ParticleSystem.h
src/modules/graphics/Quad.cpp
src/modules/graphics/Quad.h
src/modules/graphics/Texture.cpp
src/modules/graphics/Texture.h
src/modules/graphics/Volatile.cpp
src/modules/graphics/Volatile.h
src/modules/graphics/wrap_Quad.cpp
src/modules/graphics/wrap_Quad.h
src/modules/graphics/wrap_Texture.cpp
src/modules/graphics/wrap_Texture.h
)
set(LOVE_SRC_MODULE_GRAPHICS_OPENGL
@@ -265,8 +288,8 @@ set(LOVE_SRC_MODULE_GRAPHICS_OPENGL
src/modules/graphics/opengl/Canvas.h
src/modules/graphics/opengl/Font.cpp
src/modules/graphics/opengl/Font.h
src/modules/graphics/opengl/GLee.c
src/modules/graphics/opengl/GLee.h
src/modules/graphics/opengl/GLBuffer.cpp
src/modules/graphics/opengl/GLBuffer.h
src/modules/graphics/opengl/Graphics.cpp
src/modules/graphics/opengl/Graphics.h
src/modules/graphics/opengl/Image.cpp
@@ -283,9 +306,10 @@ set(LOVE_SRC_MODULE_GRAPHICS_OPENGL
src/modules/graphics/opengl/Shader.h
src/modules/graphics/opengl/SpriteBatch.cpp
src/modules/graphics/opengl/SpriteBatch.h
src/modules/graphics/opengl/Texture.h
src/modules/graphics/opengl/VertexBuffer.cpp
src/modules/graphics/opengl/VertexBuffer.h
src/modules/graphics/opengl/Text.cpp
src/modules/graphics/opengl/Text.h
src/modules/graphics/opengl/Video.cpp
src/modules/graphics/opengl/Video.h
src/modules/graphics/opengl/wrap_Canvas.cpp
src/modules/graphics/opengl/wrap_Canvas.h
src/modules/graphics/opengl/wrap_Font.cpp
@@ -298,14 +322,14 @@ set(LOVE_SRC_MODULE_GRAPHICS_OPENGL
src/modules/graphics/opengl/wrap_Mesh.h
src/modules/graphics/opengl/wrap_ParticleSystem.cpp
src/modules/graphics/opengl/wrap_ParticleSystem.h
src/modules/graphics/opengl/wrap_Quad.cpp
src/modules/graphics/opengl/wrap_Quad.h
src/modules/graphics/opengl/wrap_Shader.cpp
src/modules/graphics/opengl/wrap_Shader.h
src/modules/graphics/opengl/wrap_SpriteBatch.cpp
src/modules/graphics/opengl/wrap_SpriteBatch.h
src/modules/graphics/opengl/wrap_Texture.cpp
src/modules/graphics/opengl/wrap_Texture.h
src/modules/graphics/opengl/wrap_Text.cpp
src/modules/graphics/opengl/wrap_Text.h
src/modules/graphics/opengl/wrap_Video.cpp
src/modules/graphics/opengl/wrap_Video.h
)
set(LOVE_SRC_MODULE_GRAPHICS
@@ -321,13 +345,13 @@ source_group("modules\\graphics\\opengl" FILES ${LOVE_SRC_MODULE_GRAPHICS_OPENGL
#
set(LOVE_SRC_MODULE_IMAGE_ROOT
src/modules/image/CompressedData.cpp
src/modules/image/CompressedData.h
src/modules/image/CompressedImageData.cpp
src/modules/image/CompressedImageData.h
src/modules/image/Image.h
src/modules/image/ImageData.cpp
src/modules/image/ImageData.h
src/modules/image/wrap_CompressedData.cpp
src/modules/image/wrap_CompressedData.h
src/modules/image/wrap_CompressedImageData.cpp
src/modules/image/wrap_CompressedImageData.h
src/modules/image/wrap_Image.cpp
src/modules/image/wrap_Image.h
src/modules/image/wrap_ImageData.cpp
@@ -335,29 +359,27 @@ set(LOVE_SRC_MODULE_IMAGE_ROOT
)
set(LOVE_SRC_MODULE_IMAGE_MAGPIE
src/modules/image/magpie/CompressedData.cpp
src/modules/image/magpie/CompressedData.h
src/modules/image/magpie/ASTCHandler.cpp
src/modules/image/magpie/ASTCHandler.h
src/modules/image/magpie/CompressedImageData.cpp
src/modules/image/magpie/CompressedImageData.h
src/modules/image/magpie/CompressedFormatHandler.h
src/modules/image/magpie/ddsHandler.cpp
src/modules/image/magpie/ddsHandler.h
src/modules/image/magpie/DevilHandler.cpp
src/modules/image/magpie/DevilHandler.h
src/modules/image/magpie/FormatHandler.cpp
src/modules/image/magpie/FormatHandler.h
src/modules/image/magpie/Image.cpp
src/modules/image/magpie/Image.h
src/modules/image/magpie/ImageData.cpp
src/modules/image/magpie/ImageData.h
src/modules/image/magpie/JPEGHandler.cpp
src/modules/image/magpie/JPEGHandler.h
src/modules/image/magpie/KTXHandler.cpp
src/modules/image/magpie/KTXHandler.h
src/modules/image/magpie/PKMHandler.cpp
src/modules/image/magpie/PKMHandler.h
src/modules/image/magpie/PVRHandler.cpp
src/modules/image/magpie/PVRHandler.h
src/modules/image/magpie/PNGHandler.cpp
src/modules/image/magpie/PNGHandler.h
src/modules/image/magpie/PVRHandler.cpp
src/modules/image/magpie/PVRHandler.h
src/modules/image/magpie/STBHandler.cpp
src/modules/image/magpie/STBHandler.h
)
@@ -430,12 +452,18 @@ source_group("modules\\keyboard\\sdl" FILES ${LOVE_SRC_MODULE_KEYBOARD_SDL})
set(LOVE_SRC_MODULE_MATH
src/modules/math/BezierCurve.cpp
src/modules/math/BezierCurve.h
src/modules/math/CompressedData.cpp
src/modules/math/CompressedData.h
src/modules/math/Compressor.cpp
src/modules/math/Compressor.h
src/modules/math/MathModule.cpp
src/modules/math/MathModule.h
src/modules/math/RandomGenerator.cpp
src/modules/math/RandomGenerator.h
src/modules/math/wrap_BezierCurve.cpp
src/modules/math/wrap_BezierCurve.h
src/modules/math/wrap_CompressedData.cpp
src/modules/math/wrap_CompressedData.h
src/modules/math/wrap_Math.cpp
src/modules/math/wrap_Math.h
src/modules/math/wrap_RandomGenerator.cpp
@@ -461,7 +489,6 @@ source_group("modules\\love" FILES ${LOVE_SRC_MODULE_LOVE})
set(LOVE_SRC_MODULE_MOUSE_ROOT
src/modules/mouse/Cursor.cpp
src/modules/mouse/Cursor.h
src/modules/mouse/Mouse.cpp
src/modules/mouse/Mouse.h
src/modules/mouse/wrap_Cursor.cpp
src/modules/mouse/wrap_Cursor.h
@@ -623,8 +650,6 @@ set(LOVE_SRC_MODULE_SOUND_LULLABY
src/modules/sound/lullaby/GmeDecoder.h
src/modules/sound/lullaby/ModPlugDecoder.cpp
src/modules/sound/lullaby/ModPlugDecoder.h
src/modules/sound/lullaby/Mpg123Decoder.cpp
src/modules/sound/lullaby/Mpg123Decoder.h
src/modules/sound/lullaby/Sound.cpp
src/modules/sound/lullaby/Sound.h
src/modules/sound/lullaby/VorbisDecoder.cpp
@@ -633,6 +658,14 @@ set(LOVE_SRC_MODULE_SOUND_LULLABY
src/modules/sound/lullaby/WaveDecoder.h
)
if(LOVE_MPG123)
set(LOVE_SRC_MODULE_SOUND_LULLABY
${LOVE_SRC_MODULE_SOUND_LULLABY}
src/modules/sound/lullaby/Mpg123Decoder.cpp
src/modules/sound/lullaby/Mpg123Decoder.h
)
endif()
set(LOVE_SRC_MODULE_SOUND
${LOVE_SRC_MODULE_SOUND_ROOT}
${LOVE_SRC_MODULE_SOUND_LULLABY}
@@ -707,6 +740,7 @@ source_group("modules\\thread\\sdl" FILES ${LOVE_SRC_MODULE_THREAD_SDL})
#
set(LOVE_SRC_MODULE_TIMER_ROOT
src/modules/timer/Timer.cpp
src/modules/timer/Timer.h
src/modules/timer/wrap_Timer.cpp
src/modules/timer/wrap_Timer.h
@@ -748,6 +782,35 @@ set(LOVE_SRC_MODULE_TOUCH
source_group("modules\\touch" FILES ${LOVE_SRC_MODULE_TOUCH_ROOT})
source_group("modules\\touch\\sdl" FILES ${LOVE_SRC_MODULE_TOUCH_SDL})
#
# love.video
#
set(LOVE_SRC_MODULE_VIDEO_ROOT
src/modules/video/Video.h
src/modules/video/VideoStream.cpp
src/modules/video/VideoStream.h
src/modules/video/wrap_Video.cpp
src/modules/video/wrap_Video.h
src/modules/video/wrap_VideoStream.cpp
src/modules/video/wrap_VideoStream.h
)
set(LOVE_SRC_MODULE_VIDEO_THEORA
src/modules/video/theora/Video.cpp
src/modules/video/theora/Video.h
src/modules/video/theora/VideoStream.cpp
src/modules/video/theora/VideoStream.h
)
set(LOVE_SRC_MODULE_VIDEO
${LOVE_SRC_MODULE_VIDEO_ROOT}
${LOVE_SRC_MODULE_VIDEO_THEORA}
)
source_group("modules\\video" FILES ${LOVE_SRC_MODULE_VIDEO_ROOT})
source_group("modules\\video\\theora" FILES ${LOVE_SRC_MODULE_VIDEO_THEORA})
#
# love.window
#
@@ -964,6 +1027,18 @@ add_library(love_3p_enet ${LOVE_SRC_3P_ENET})
target_link_libraries(love_3p_enet ${MEGA_LUA})
target_include_directories(love_3p_enet PUBLIC src/libraries/enet/libenet/include)
#
# GLAD
#
set(LOVE_SRC_3P_GLAD
src/libraries/glad/glad.cpp
src/libraries/glad/glad.hpp
src/libraries/glad/gladfuncs.hpp
)
add_library(love_3p_glad ${LOVE_SRC_3P_GLAD})
#
# LodePNG
#
@@ -1037,11 +1112,39 @@ 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})
#
# lz4
#
set(LOVE_SRC_3P_LZ4
src/libraries/lz4/lz4.c
src/libraries/lz4/lz4.h
src/libraries/lz4/lz4hc.c
src/libraries/lz4/lz4hc.h
)
add_library(love_3p_lz4 ${LOVE_SRC_3P_LZ4})
#
# noise1234
#
set(LOVE_SRC_3P_NOISE1234
src/libraries/noise1234/noise1234.cpp
src/libraries/noise1234/noise1234.h
src/libraries/noise1234/simplexnoise1234.cpp
src/libraries/noise1234/simplexnoise1234.h
)
@@ -1056,7 +1159,7 @@ set(LOVE_SRC_3P_STB
src/libraries/stb/stb_image.h
)
add_library(love_3p_stb ${LOVE_SRC_3P_STB})
# stb_image has no implementation files of its own.
#
# utf8
@@ -1099,10 +1202,12 @@ set(LOVE_3P
love_3p_box2d
love_3p_ddsparse
love_3p_enet
love_3p_glad
love_3p_lodepng
love_3p_luasocket
love_3p_luautf8
love_3p_lz4
love_3p_noise1234
love_3p_stb
love_3p_wuff
)
@@ -1130,7 +1235,8 @@ set(LOVE_LIB_SRC
${LOVE_SRC_MODULE_SYSTEM}
${LOVE_SRC_MODULE_THREAD}
${LOVE_SRC_MODULE_TIMER}
#{LOVE_SRC_MODULE_TOUCH}
${LOVE_SRC_MODULE_TOUCH}
${LOVE_SRC_MODULE_VIDEO}
${LOVE_SRC_MODULE_WINDOW}
)
@@ -1146,25 +1252,28 @@ include_directories(
link_directories(${SDL_LINK_DIR})
set(LOVE_MEGA_3P
${MEGA_DEVIL}
${MEGA_FREETYPE}
${MEGA_JASPER}
${MEGA_JPEG}
${MEGA_LIBOGG}
${MEGA_LIBPNG}
${MEGA_LIBVORBISFILE}
${MEGA_LIBVORBIS}
${MEGA_LIBTHEORA}
${MEGA_LUA}
${MEGA_MODPLUG}
${MEGA_MPEG123}
${MEGA_OPENAL}
${MEGA_PHYSFS}
${MEGA_SDL2MAIN}
${MEGA_SDL2}
${MEGA_TIFF}
${MEGA_ZLIB}
)
if(LOVE_MPG123)
set(LOVE_MEGA_3P
${LOVE_MEGA_3P}
${MEGA_MPEG123}
)
endif()
set(LOVE_LINK_LIBRARIES
${OPENGL_gl_LIBRARY}
${LOVE_MEGA_3P}
@@ -1192,8 +1301,8 @@ if(MEGA_EXTRA_DEPENDECIES)
endif()
if(MSVC)
set_target_properties(${LOVE_LIB_NAME} PROPERTIES RELEASE_OUTPUT_NAME "love" PDB_NAME "liblove")
set_target_properties(${LOVE_LIB_NAME} PROPERTIES DEBUG_OUTPUT_NAME "love" PDB_NAME "liblove")
set_target_properties(${LOVE_LIB_NAME} PROPERTIES RELEASE_OUTPUT_NAME "love" PDB_NAME "liblove" IMPORT_PREFIX "lib")
set_target_properties(${LOVE_LIB_NAME} PROPERTIES DEBUG_OUTPUT_NAME "love" PDB_NAME "liblove" IMPORT_PREFIX "lib")
endif()
#
@@ -1204,10 +1313,12 @@ target_link_libraries(love liblove)
# Add post build steps to move the DLLs next to the binary. Otherwise
# running/debugging the binary will not work from inside VS.
add_move_dll(love ${MEGA_MPEG123})
if(LOVE_MPG123)
add_move_dll(love ${MEGA_MPEG123})
endif()
add_move_dll(love ${MEGA_SDL2})
add_move_dll(love ${MEGA_OPENAL})
add_move_dll(love ${MEGA_DEVIL})
if(LOVE_JIT)
add_move_file(love ${MEGA_LUAJIT_DLL})
@@ -1299,7 +1410,7 @@ set(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/license.txt")
set(CPACK_NSIS_EXECUTABLES_DIRECTORY .)
set(CPACK_NSIS_PACKAGE_NAME "LOVE")
set(CPACK_NSIS_DISPLAY_NAME "LÖVE ${LOVE_VERSION_STR}")
set(CPACK_NSIS_DISPLAY_NAME "LOVE ${LOVE_VERSION_STR}")
set(CPACK_NSIS_MODIFY_PATH OFF)
if(LOVE_X64)
@@ -1319,7 +1430,7 @@ set(NSIS_MUI_ICON "${CMAKE_CURRENT_SOURCE_DIR}/extra/nsis\\\\love.ico")
set(NSIS_MUI_UNICON "${CMAKE_CURRENT_SOURCE_DIR}/extra/nsis\\\\love.ico")
set(CPACK_NSIS_INSTALLER_MUI_ICON_CODE "
!define MUI_WELCOMEPAGE_TITLE \\\"LÖVE ${LOVE_VERSION_STR} Setup\\\"
!define MUI_WELCOMEPAGE_TITLE \\\"LOVE ${LOVE_VERSION_STR} Setup\\\"
!define MUI_WELCOMEFINISHPAGE_BITMAP \\\"${NSIS_LEFT_BMP}\\\"
!define MUI_HEADERIMAGE_BITMAP \\\"${NSIS_TOP_BMP}\\\"
!define MUI_ICON \\\"${NSIS_MUI_ICON}\\\"