Updated to love-android changeset 3b5e5e182a00

This commit is contained in:
Martin Felis
2014-01-12 21:21:46 +01:00
parent 0ff0941068
commit 69b200b144
396 changed files with 52558 additions and 2317 deletions
+93 -12
View File
@@ -1,5 +1,5 @@
#
# Copyright (c) 2006-2013 LOVE Development Team
# Copyright (c) 2006-2014 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
@@ -45,10 +45,29 @@ else()
set(LOVE_TARGET_PLATFORM x86)
endif()
option(LOVE_JIT "Use LuaJIT" TRUE)
if(LOVE_JIT)
message(STATUS "LuaJIT: Enabled")
else()
message(STATUS "LuaJIT: Disabled")
endif()
message(STATUS "Target platform: ${LOVE_TARGET_PLATFORM}")
find_package(OpenGL)
if(${LOVE_JIT})
set(MEGA_LUA ${MEGA_LUAJIT_LIB})
set(MEGA_EXTRA_INCLUDE ${MEGA_LUAJIT_INCLUDE})
set(MEGA_EXTRA_DLLS ${MEGA_LUAJIT_DLL})
set(MEGA_EXTRA_DEPENDECIES luajit)
else()
set(MEGA_LUA ${MEGA_LUA51})
# MEGA_LUA51 is a CMake target, so includes are handled
# automatically.
endif()
#
# common
#
@@ -230,15 +249,13 @@ source_group("modules\\font\\freetype" FILES ${LOVE_SRC_MODULE_FONT_FREETYPE})
set(LOVE_SRC_MODULE_GRAPHICS_ROOT
src/modules/graphics/Color.h
src/modules/graphics/Drawable.cpp
src/modules/graphics/Drawable.h
src/modules/graphics/DrawQable.h
src/modules/graphics/Graphics.cpp
src/modules/graphics/Graphics.h
src/modules/graphics/Image.cpp
src/modules/graphics/Image.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
)
@@ -266,6 +283,7 @@ 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/wrap_Canvas.cpp
@@ -286,6 +304,8 @@ set(LOVE_SRC_MODULE_GRAPHICS_OPENGL
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
)
set(LOVE_SRC_MODULE_GRAPHICS
@@ -904,7 +924,7 @@ set(LOVE_SRC_3P_ENET
)
add_library(love_3p_enet ${LOVE_SRC_3P_ENET})
target_link_libraries(love_3p_enet ${MEGA_LUA51})
target_link_libraries(love_3p_enet ${MEGA_LUA})
target_include_directories(love_3p_enet PUBLIC src/libraries/enet/libenet/include)
#
@@ -967,7 +987,7 @@ set(LOVE_SRC_3P_LUASOCKET
)
add_library(love_3p_luasocket ${LOVE_SRC_3P_LUASOCKET})
target_link_libraries(love_3p_luasocket ${MEGA_LUA51})
target_link_libraries(love_3p_luasocket ${MEGA_LUA})
#
# noise1234
@@ -1057,15 +1077,36 @@ include_directories(
src
src/libraries
src/modules
${MEGA_EXTRA_INCLUDE}
)
# SDL2 links with some DirectX libraries, and we apparently also
# pull those libraries in for linkage because we link with SDL2.
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_LUA}
${MEGA_MODPLUG}
${MEGA_MPEG123}
${MEGA_OPENAL}
${MEGA_PHYSFS}
${MEGA_SDL2MAIN}
${MEGA_SDL2}
${MEGA_TIFF}
${MEGA_ZLIB}
)
set(LOVE_LINK_LIBRARIES
${OPENGL_gl_LIBRARY}
${MEGA_3P}
${LOVE_MEGA_3P}
)
set(LOVE_RC)
@@ -1085,9 +1126,13 @@ endif()
add_library(${LOVE_LIB_NAME} SHARED ${LOVE_LIB_SRC} ${LOVE_RC})
target_link_libraries(liblove ${LOVE_LINK_LIBRARIES} ${LOVE_3P})
if(MEGA_EXTRA_DEPENDECIES)
add_dependencies(${LOVE_LIB_NAME} ${MEGA_EXTRA_DEPENDECIES})
endif()
if(MSVC)
set_target_properties(${LOVE_LIB_NAME} PROPERTIES RELEASE_OUTPUT_NAME "love")
set_target_properties(${LOVE_LIB_NAME} PROPERTIES DEBUG_OUTPUT_NAME "love")
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")
endif()
#
@@ -1102,7 +1147,12 @@ add_move_dll(love ${MEGA_MPEG123})
add_move_dll(love ${MEGA_SDL2})
add_move_dll(love ${MEGA_OPENAL})
add_move_dll(love ${MEGA_DEVIL})
add_move_dll(love ${MEGA_LUA51})
if(LOVE_JIT)
add_move_file(love ${MEGA_LUAJIT_DLL})
else()
add_move_dll(love ${MEGA_LUA51})
endif()
###################################
# Version
@@ -1131,6 +1181,15 @@ message(STATUS "Version: ${LOVE_VERSION_STR}")
###################################
install(TARGETS love ${LOVE_LIB_NAME} RUNTIME DESTINATION .)
# Extra DLLs.
if(MEGA_EXTRA_DLLS)
foreach(DLL ${MEGA_EXTRA_DLLS})
get_filename_component(DLL_NAME ${DLL} NAME)
message(STATUS "Extra DLL: ${DLL_NAME}")
endforeach()
install(FILES ${MEGA_EXTRA_DLLS} DESTINATION .)
endif()
# Dynamic runtime libs.
if(MEGA_MSVC_DLLS)
foreach(DLL ${MEGA_MSVC_DLLS})
@@ -1158,6 +1217,12 @@ install(FILES
${CMAKE_CURRENT_BINARY_DIR}/readme.txt
DESTINATION .)
# Icons
install(FILES
${CMAKE_CURRENT_SOURCE_DIR}/extra/nsis/love.ico
${CMAKE_CURRENT_SOURCE_DIR}/extra/nsis/game.ico
DESTINATION .)
set(CPACK_GENERATOR ZIP NSIS)
set(CPACK_PACKAGE_NAME "love")
set(CPACK_PACKAGE_VENDOR "love2d.org")
@@ -1172,7 +1237,7 @@ set(CPACK_RESOURCE_FILE_README "${CMAKE_CURRENT_SOURCE_DIR}/readme.md")
set(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/license.txt")
set(CPACK_NSIS_EXECUTABLES_DIRECTORY .)
set(CPACK_NSIS_PACKAGE_NAME "LÖVE")
set(CPACK_NSIS_PACKAGE_NAME "LOVE")
set(CPACK_NSIS_DISPLAY_NAME "LÖVE ${LOVE_VERSION_STR}")
set(CPACK_NSIS_MODIFY_PATH OFF)
@@ -1200,4 +1265,20 @@ set(CPACK_NSIS_INSTALLER_MUI_ICON_CODE "
!define MUI_UNICON \\\"${NSIS_MUI_UNICON}\\\"
")
set(CPACK_NSIS_EXTRA_INSTALL_COMMANDS "
WriteRegStr HKCR \\\".love\\\" \\\"\\\" \\\"LOVE\\\"
WriteRegStr HKCR \\\"LOVE\\\" \\\"\\\" \\\"LOVE Game File\\\"
WriteRegStr HKCR \\\"LOVE\\\\DefaultIcon\\\" \\\"\\\" \\\"$INSTDIR\\\\game.ico\\\"
WriteRegStr HKCR \\\"LOVE\\\\shell\\\" \\\"\\\" \\\"open\\\"
WriteRegStr HKCR \\\"LOVE\\\\shell\\\\open\\\" \\\"\\\" \\\"Open in LOVE\\\"
WriteRegStr HKCR \\\"LOVE\\\\shell\\\\open\\\\command\\\" \\\"\\\" \\\"$INSTDIR\\\\love.exe $\\\\\\\"%1$\\\\\\\"\\\"
System::Call 'shell32.dll::SHChangeNotify(i, i, i, i) v (0x08000000, 0, 0, 0)'
")
set(CPACK_NSIS_EXTRA_UNINSTALL_COMMANDS "
DeleteRegKey HKCR \\\"LOVE\\\"
DeleteRegKey HKCR \\\".love\\\"
System::Call 'shell32.dll::SHChangeNotify(i, i, i, i) v (0x08000000, 0, 0, 0)'
")
include(CPack)