mirror of
https://github.com/love2d/love.git
synced 2026-08-17 11:00:31 +02:00
Merge branch '12.0' into GraphicsBuffer
This commit is contained in:
Alex Szpakowski
+15
-49
@@ -49,7 +49,6 @@ else()
|
||||
endif()
|
||||
|
||||
option(LOVE_JIT "Use LuaJIT" TRUE)
|
||||
option(LOVE_MPG123 "Use mpg123" TRUE)
|
||||
|
||||
if(LOVE_JIT)
|
||||
if(APPLE)
|
||||
@@ -60,10 +59,6 @@ else()
|
||||
message(STATUS "LuaJIT: Disabled")
|
||||
endif()
|
||||
|
||||
if(NOT LOVE_MPG123)
|
||||
add_definitions(-DLOVE_NOMPG123)
|
||||
endif()
|
||||
|
||||
message(STATUS "Target platform: ${LOVE_TARGET_PLATFORM}")
|
||||
|
||||
if(POLICY CMP0072)
|
||||
@@ -118,17 +113,6 @@ if(MEGA)
|
||||
${MEGA_OPENAL}
|
||||
)
|
||||
|
||||
if(LOVE_MPG123)
|
||||
set(LOVE_LINK_LIBRARIES
|
||||
${LOVE_LINK_LIBRARIES}
|
||||
${MEGA_MPEG123}
|
||||
)
|
||||
set(LOVE_MOVE_DLLS
|
||||
${LOVE_MOVE_DLLS}
|
||||
${MEGA_MPEG123}
|
||||
)
|
||||
endif()
|
||||
|
||||
if(LOVE_JIT)
|
||||
set(LOVE_LUA_LIBRARY ${MEGA_LUAJIT_LIB})
|
||||
# LOVE_EXTRA_DLLS are non-runtime DLLs which should be bundled with the
|
||||
@@ -209,18 +193,6 @@ Please see http://bitbucket.org/rude/megasource
|
||||
${ZLIB_LIBRARY}
|
||||
)
|
||||
|
||||
if(LOVE_MPG123)
|
||||
find_package(MPG123 REQUIRED)
|
||||
set(LOVE_LINK_LIBRARIES
|
||||
${LOVE_LINK_LIBRARIES}
|
||||
${MPG123_LIBRARY}
|
||||
)
|
||||
set(LOVE_INCLUDE_DIRS
|
||||
${LOVE_INCLUDE_DIRS}
|
||||
${MPG123_INCLUDE_DIR}
|
||||
)
|
||||
endif()
|
||||
|
||||
if(LOVE_JIT)
|
||||
find_package(LuaJIT REQUIRED)
|
||||
set(LOVE_LUA_LIBRARY ${LUAJIT_LIBRARY})
|
||||
@@ -518,8 +490,6 @@ source_group("modules\\font\\freetype" FILES ${LOVE_SRC_MODULE_FONT_FREETYPE})
|
||||
set(LOVE_SRC_MODULE_GRAPHICS_ROOT
|
||||
src/modules/graphics/Buffer.cpp
|
||||
src/modules/graphics/Buffer.h
|
||||
src/modules/graphics/Canvas.cpp
|
||||
src/modules/graphics/Canvas.h
|
||||
src/modules/graphics/Deprecations.cpp
|
||||
src/modules/graphics/Deprecations.h
|
||||
src/modules/graphics/Drawable.cpp
|
||||
@@ -528,8 +498,6 @@ set(LOVE_SRC_MODULE_GRAPHICS_ROOT
|
||||
src/modules/graphics/Font.h
|
||||
src/modules/graphics/Graphics.cpp
|
||||
src/modules/graphics/Graphics.h
|
||||
src/modules/graphics/Image.cpp
|
||||
src/modules/graphics/Image.h
|
||||
src/modules/graphics/Mesh.cpp
|
||||
src/modules/graphics/Mesh.h
|
||||
src/modules/graphics/ParticleSystem.cpp
|
||||
@@ -561,14 +529,10 @@ set(LOVE_SRC_MODULE_GRAPHICS_ROOT
|
||||
src/modules/graphics/Volatile.h
|
||||
src/modules/graphics/wrap_Buffer.cpp
|
||||
src/modules/graphics/wrap_Buffer.h
|
||||
src/modules/graphics/wrap_Canvas.cpp
|
||||
src/modules/graphics/wrap_Canvas.h
|
||||
src/modules/graphics/wrap_Font.cpp
|
||||
src/modules/graphics/wrap_Font.h
|
||||
src/modules/graphics/wrap_Graphics.cpp
|
||||
src/modules/graphics/wrap_Graphics.h
|
||||
src/modules/graphics/wrap_Image.cpp
|
||||
src/modules/graphics/wrap_Image.h
|
||||
src/modules/graphics/wrap_Mesh.cpp
|
||||
src/modules/graphics/wrap_Mesh.h
|
||||
src/modules/graphics/wrap_ParticleSystem.cpp
|
||||
@@ -590,14 +554,10 @@ set(LOVE_SRC_MODULE_GRAPHICS_ROOT
|
||||
set(LOVE_SRC_MODULE_GRAPHICS_OPENGL
|
||||
src/modules/graphics/opengl/Buffer.cpp
|
||||
src/modules/graphics/opengl/Buffer.h
|
||||
src/modules/graphics/opengl/Canvas.cpp
|
||||
src/modules/graphics/opengl/Canvas.h
|
||||
src/modules/graphics/opengl/FenceSync.cpp
|
||||
src/modules/graphics/opengl/FenceSync.h
|
||||
src/modules/graphics/opengl/Graphics.cpp
|
||||
src/modules/graphics/opengl/Graphics.h
|
||||
src/modules/graphics/opengl/Image.cpp
|
||||
src/modules/graphics/opengl/Image.h
|
||||
src/modules/graphics/opengl/OpenGL.cpp
|
||||
src/modules/graphics/opengl/OpenGL.h
|
||||
src/modules/graphics/opengl/Shader.cpp
|
||||
@@ -606,6 +566,8 @@ set(LOVE_SRC_MODULE_GRAPHICS_OPENGL
|
||||
src/modules/graphics/opengl/ShaderStage.h
|
||||
src/modules/graphics/opengl/StreamBuffer.cpp
|
||||
src/modules/graphics/opengl/StreamBuffer.h
|
||||
src/modules/graphics/opengl/Texture.cpp
|
||||
src/modules/graphics/opengl/Texture.h
|
||||
)
|
||||
|
||||
set(LOVE_SRC_MODULE_GRAPHICS
|
||||
@@ -923,6 +885,8 @@ 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/MP3Decoder.h
|
||||
src/modules/sound/lullaby/MP3Decoder.cpp
|
||||
src/modules/sound/lullaby/Sound.cpp
|
||||
src/modules/sound/lullaby/Sound.h
|
||||
src/modules/sound/lullaby/VorbisDecoder.cpp
|
||||
@@ -931,14 +895,6 @@ 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}
|
||||
@@ -1254,11 +1210,21 @@ add_library(love_3p_ddsparse ${LOVE_SRC_3P_DDSPARSE})
|
||||
#
|
||||
|
||||
set(LOVE_SRC_3P_DRFLAC
|
||||
src/libraries/dr_flac/dr_flac.h
|
||||
src/libraries/dr/dr_flac.h
|
||||
)
|
||||
|
||||
# dr_flac has no implementation files of its own.
|
||||
|
||||
#
|
||||
# dr_mp3
|
||||
#
|
||||
|
||||
set(LOVE_SRC_3P_DRMP3
|
||||
src/libraries/dr/dr_mp3.h
|
||||
)
|
||||
|
||||
# dr_mp3 has no implementation files of its own.
|
||||
|
||||
#
|
||||
# enet
|
||||
#
|
||||
|
||||
Reference in New Issue
Block a user