Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
32 commits
Select commit Hold shift + click to select a range
18bce9f
Update README.md
Dec 17, 2016
7bb5bb5
Use LUA 5.1 if 5.2 doesn't exists on the system
Feb 23, 2020
38e68f7
Merge pull request #69 from danni-m/master
greatwolf Feb 26, 2020
4044f63
Merge pull request #1 from bastibe/master
marcelvanherk Mar 16, 2020
e0419c6
Fix python calls with only named arguments and reading attribute
marcelvanherk Mar 16, 2020
f17143a
Merge pull request #72 from marcelvanherk/master
greatwolf Mar 16, 2020
658f1ff
Updated to use xenial.
greatwolf Apr 28, 2020
28b6b9d
Have CMake pass in the name of the python runtime being
greatwolf Apr 28, 2020
d513042
Merge pull request #75 from greatwolf/Python38
greatwolf Apr 28, 2020
31df26b
Added Lua 5.2 to test matrix.
greatwolf Apr 29, 2020
78c3efe
Merge pull request #76 from greatwolf/Lua52
greatwolf Apr 29, 2020
44437b2
Fixed warning.
greatwolf Apr 29, 2020
b2e44a2
Added project title and license badge.
greatwolf May 4, 2020
936dea9
Update README.md to make code blocks render correctly on GitHub
user202729 Nov 2, 2021
117dea6
Merge pull request #80 from user202729/fix-readme
bastibe Nov 2, 2021
82fd9b6
Modified function error handling after calling python function in py_…
sudheerhebbale Jul 4, 2024
c3367ad
Used traceback.format_exception so that the formatting is original.
sudheerhebbale Jul 4, 2024
3946a02
Further edit to previous commit, based on review
sudheerhebbale Jul 5, 2024
f484fac
Changes realted to impact due to introduction of #define PY_SSIZE_T_C…
sudheerhebbale Jul 7, 2024
d73cfbb
Defect fix: function LuaObject_richcmp was returning instance of Py_T…
sudheerhebbale Jul 7, 2024
406b46e
Edited code to remove unnecessary commented lines
sudheerhebbale Jul 8, 2024
1930603
Refactored code for error formatting
sudheerhebbale Jul 9, 2024
e6837bf
Refactored code for error formatting
sudheerhebbale Jul 9, 2024
d521cba
removed dependency on penlight lua library
sudheerhebbale Jul 9, 2024
008db8a
Merge pull request #87 from sudheerhebbale/master
greatwolf Jul 10, 2024
38c0ccd
modified cmake build to pick python3 if available else pick python2
sudheerhebbale Jul 11, 2024
f875b16
Changed minimum cmake version to 3.12
sudheerhebbale Jul 12, 2024
61dd313
Merge pull request #88 from sudheerhebbale/master
greatwolf Jul 19, 2024
5dae46a
Improve compatibility with LuaJIT
shmuz Apr 4, 2025
36a4da2
Merge pull request #90 from shmuz/master
bastibe Apr 25, 2025
1228580
Add syntax highlight
ShalokShalom May 7, 2025
6242cd1
Merge pull request #91 from ShalokShalom/patch-1
bastibe May 7, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 7 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,21 +1,25 @@
language: c

sudo: required
dist: trusty
dist: xenial

compiler:
- gcc

env:
- LUA_ENV=lua5.1 PY_ENV=python2.7 m_SUFFIX=
- LUA_ENV=lua5.2 PY_ENV=python2.7 m_SUFFIX=
- LUA_ENV=lua5.3 PY_ENV=python2.7 m_SUFFIX=
- LUA_ENV=lua5.1 PY_ENV=python3.6 m_SUFFIX=m
- LUA_ENV=lua5.2 PY_ENV=python3.6 m_SUFFIX=m
- LUA_ENV=lua5.3 PY_ENV=python3.6 m_SUFFIX=m
- LUA_ENV=lua5.1 PY_ENV=python3.8 m_SUFFIX=
- LUA_ENV=lua5.2 PY_ENV=python3.8 m_SUFFIX=
- LUA_ENV=lua5.3 PY_ENV=python3.8 m_SUFFIX=


before_install:
- sudo add-apt-repository -y "deb http://ppa.launchpad.net/grilo-team/travis/ubuntu trusty main"
- sudo add-apt-repository -y "deb http://ppa.launchpad.net/fkrull/deadsnakes/ubuntu trusty main"
- sudo add-apt-repository -y ppa:deadsnakes/ppa
- sudo apt-get update -qq

install:
Expand Down
60 changes: 29 additions & 31 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,31 +1,29 @@
cmake_minimum_required(VERSION 3.0.0)

set(CMAKE_BUILD_TYPE_INIT "Release")
set(EXECUTABLE_OUTPUT_PATH ${CMAKE_BINARY_DIR}/bin)
set(LIBRARY_OUTPUT_PATH ${EXECUTABLE_OUTPUT_PATH})


project(Lunatic)

find_package(Lua 5.1 REQUIRED)
find_package(PythonLibs 2.7 REQUIRED)


add_subdirectory(src)

add_library(python MODULE $<TARGET_OBJECTS:src>)
set_target_properties(python PROPERTIES
PREFIX "")

add_library(lua MODULE $<TARGET_OBJECTS:src>)
if (WIN32)
set_target_properties(lua PROPERTIES
PREFIX ""
SUFFIX ".pyd")
else (WIN32)
set_target_properties(lua PROPERTIES
PREFIX "")
endif (WIN32)

target_link_libraries(lua ${LUA_LIBRARIES} ${PYTHON_LIBRARIES})
target_link_libraries(python ${LUA_LIBRARIES} ${PYTHON_LIBRARIES})
cmake_minimum_required(VERSION 3.12.0)

set(CMAKE_BUILD_TYPE_INIT "Release")
set(EXECUTABLE_OUTPUT_PATH ${CMAKE_BINARY_DIR}/bin)
set(LIBRARY_OUTPUT_PATH ${EXECUTABLE_OUTPUT_PATH})

project(Lunatic)

find_package(Lua 5.1 REQUIRED)
find_package(Python REQUIRED COMPONENTS Interpreter Development)

add_subdirectory(src)

add_library(python MODULE $<TARGET_OBJECTS:src>)
set_target_properties(python PROPERTIES
PREFIX "")

add_library(lua MODULE $<TARGET_OBJECTS:src>)
if (WIN32)
set_target_properties(lua PROPERTIES
PREFIX ""
SUFFIX ".pyd")
else (WIN32)
set_target_properties(lua PROPERTIES
PREFIX "")
endif (WIN32)

target_link_libraries(lua ${LUA_LIBRARIES} ${Python_LIBRARIES})
target_link_libraries(python ${LUA_LIBRARIES} ${Python_LIBRARIES})
Loading