jeans/motioneyeos
jeans/motioneyeos
1
0
Fork 0
mirror of https://github.com/motioneye-project/motioneyeos.git synced 2025-08-01 23:47:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

package/solarus: allow building with lua 5.1

Browse Source 
Build with lua 5.1 has been fixed since version 1.6.1 and
611f81a90d

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
[Thomas: keep a select BR2_PACKAGE_LUAJIT, but make it "if
!BR2_PACKAGE_LUA_5_1"]
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
This commit is contained in:
Fabrice Fontaine 2019-12-15 14:13:57 +01:00 committed by Thomas Petazzoni
parent c4ebe26576
commit f83c9d97dd
2 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
package/solarus/Config.in
View File

@ -11,7 +11,7 @@ config BR2_PACKAGE_SOLARUS
select BR2_PACKAGE_LIBOGG select BR2_PACKAGE_LIBOGG
select BR2_PACKAGE_LIBPNG # runtime select BR2_PACKAGE_LIBPNG # runtime
select BR2_PACKAGE_LIBVORBIS select BR2_PACKAGE_LIBVORBIS
select BR2_PACKAGE_LUAJIT select BR2_PACKAGE_LUAJIT if !BR2_PACKAGE_LUA_5_1
select BR2_PACKAGE_OPENAL select BR2_PACKAGE_OPENAL
select BR2_PACKAGE_PHYSFS select BR2_PACKAGE_PHYSFS
select BR2_PACKAGE_SDL2 select BR2_PACKAGE_SDL2
@ -26,7 +26,7 @@ config BR2_PACKAGE_SOLARUS
https://github.com/solarus-games/solarus https://github.com/solarus-games/solarus
comment "solarus needs OpenGL and a toolchain w/ C++, gcc >= 4.8, NPTL, dynamic library" comment "solarus needs OpenGL and a toolchain w/ C++, gcc >= 4.8, NPTL, dynamic library"
depends on BR2_PACKAGE_LUAJIT_ARCH_SUPPORTS depends on BR2_PACKAGE_LUAJIT_ARCH_SUPPORTS || BR2_PACKAGE_LUA_5_1
depends on BR2_PACKAGE_OPENAL_ARCH_SUPPORTS depends on BR2_PACKAGE_OPENAL_ARCH_SUPPORTS
depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 \ depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 \
|| !BR2_TOOLCHAIN_HAS_THREADS_NPTL || BR2_STATIC_LIBS \ || !BR2_TOOLCHAIN_HAS_THREADS_NPTL || BR2_STATIC_LIBS \

10
package/solarus/solarus.mk
View File

@ -16,10 +16,18 @@ SOLARUS_LICENSE_FILES = license.txt
# Install libsolarus.so # Install libsolarus.so
SOLARUS_INSTALL_STAGING = YES SOLARUS_INSTALL_STAGING = YES
SOLARUS_DEPENDENCIES = libgl libmodplug libogg libvorbis luajit openal physfs sdl2 \ SOLARUS_DEPENDENCIES = libgl libmodplug libogg libvorbis openal physfs sdl2 \
sdl2_image sdl2_ttf sdl2_image sdl2_ttf
# Disable launcher GUI (requires Qt5) # Disable launcher GUI (requires Qt5)
SOLARUS_CONF_OPTS = -DSOLARUS_GUI=OFF SOLARUS_CONF_OPTS = -DSOLARUS_GUI=OFF
ifeq ($(BR2_PACKAGE_LUAJIT),y)
SOLARUS_CONF_OPTS += -DSOLARUS_USE_LUAJIT=ON
SOLARUS_DEPENDENCIES += luajit
else
SOLARUS_CONF_OPTS += -DSOLARUS_USE_LUAJIT=OFF
SOLARUS_DEPENDENCIES += lua
endif
$(eval $(cmake-package)) $(eval $(cmake-package))