mirror of
https://github.com/yann64/haikuports.git
synced 2026-05-05 06:28:55 +02:00
7bfe0c3ccc
* Now builds and runs * Included patch to make solarus use luajit vs lua51, however as solarus seems to crash loading any game, i'm opting for the known should-be-working lua51
76 lines
2.1 KiB
Diff
76 lines
2.1 KiB
Diff
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
|
index 782799a..c17a479 100644
|
|
--- a/CMakeLists.txt
|
|
+++ b/CMakeLists.txt
|
|
@@ -16,7 +16,7 @@ find_package(OpenAL REQUIRED)
|
|
find_package(VorbisFile REQUIRED)
|
|
find_package(Ogg REQUIRED)
|
|
find_package(ModPlug REQUIRED)
|
|
-find_package(Lua51 REQUIRED)
|
|
+find_package(LuaJIT REQUIRED)
|
|
find_package(PhysFS REQUIRED)
|
|
|
|
# Explicit link to libdl is needed for Lua on some systems.
|
|
diff --git a/cmake/modules/FindLuaJIT.cmake b/cmake/modules/FindLuaJIT.cmake
|
|
new file mode 100644
|
|
index 0000000..6b45ed6
|
|
--- /dev/null
|
|
+++ b/cmake/modules/FindLuaJIT.cmake
|
|
@@ -0,0 +1,56 @@
|
|
+# Locate LuaJIT library
|
|
+# This module defines
|
|
+# LUAJIT_FOUND, if false, do not try to link to Lua
|
|
+# LUA_LIBRARIES
|
|
+# LUA_INCLUDE_DIR, where to find lua.h
|
|
+# LUAJIT_VERSION_STRING, the version of Lua found (since CMake 2.8.8)
|
|
+
|
|
+## Copied from default CMake FindLua51.cmake
|
|
+
|
|
+find_path(LUA_INCLUDE_DIR luajit.h
|
|
+ HINTS
|
|
+ ENV LUA_DIR
|
|
+ PATH_SUFFIXES include/luajit-2.0 include
|
|
+ PATHS
|
|
+ ~/Library/Frameworks
|
|
+ /Library/Frameworks
|
|
+ /sw # Fink
|
|
+ /opt/local # DarwinPorts
|
|
+ /opt/csw # Blastwave
|
|
+ /opt
|
|
+)
|
|
+
|
|
+find_library(LUA_LIBRARY
|
|
+ NAMES luajit-5.1
|
|
+ HINTS
|
|
+ ENV LUA_DIR
|
|
+ PATH_SUFFIXES lib
|
|
+ PATHS
|
|
+ ~/Library/Frameworks
|
|
+ /Library/Frameworks
|
|
+ /sw
|
|
+ /opt/local
|
|
+ /opt/csw
|
|
+ /opt
|
|
+)
|
|
+
|
|
+if(LUA_LIBRARY)
|
|
+ set( LUA_LIBRARIES "${LUA_LIBRARY}" CACHE STRING "Lua Libraries")
|
|
+endif()
|
|
+
|
|
+if(LUA_INCLUDE_DIR AND EXISTS "${LUA_INCLUDE_DIR}/luajit.h")
|
|
+ file(STRINGS "${LUA_INCLUDE_DIR}/luajit.h" luajit_version_str REGEX "^#define[ \t]+LUAJIT_VERSION[ \t]+\"LuaJIT .+\"")
|
|
+
|
|
+ string(REGEX REPLACE "^#define[ \t]+LUAJIT_VERSION[ \t]+\"LuaJIT ([^\"]+)\".*" "\\1" LUAJIT_VERSION_STRING "${luajit_version_str}")
|
|
+ unset(luajit_version_str)
|
|
+endif()
|
|
+
|
|
+include(FindPackageHandleStandardArgs)
|
|
+# handle the QUIETLY and REQUIRED arguments and set LUA_FOUND to TRUE if
|
|
+# all listed variables are TRUE
|
|
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(LuaJIT
|
|
+ REQUIRED_VARS LUA_LIBRARIES LUA_INCLUDE_DIR
|
|
+ VERSION_VAR LUAJIT_VERSION_STRING)
|
|
+
|
|
+mark_as_advanced(LUA_INCLUDE_DIR LUA_LIBRARIES LUA_LIBRARY LUA_MATH_LIBRARY)
|
|
+
|