From d4dbf8e19d8a094dd8ab9e9e9dcfddcfcf04693c Mon Sep 17 00:00:00 2001 From: Tomi Valkeinen Date: Mon, 30 Nov 2015 15:23:58 +0200 Subject: remove lua bindings --- CMakeLists.txt | 5 ----- README.md | 6 ++---- lua/CMakeLists.txt | 19 ------------------- lua/luakms.i | 25 ------------------------- lua/test.lua | 20 -------------------- 5 files changed, 2 insertions(+), 73 deletions(-) delete mode 100644 lua/CMakeLists.txt delete mode 100644 lua/luakms.i delete mode 100755 lua/test.lua diff --git a/CMakeLists.txt b/CMakeLists.txt index 539c219..45916d0 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -8,7 +8,6 @@ IF(NOT CMAKE_BUILD_TYPE) ENDIF(NOT CMAKE_BUILD_TYPE) set(LIBKMS_ENABLE_PYTHON ON CACHE BOOL "Enable Python wrappers") -set(LIBKMS_ENABLE_LUA OFF CACHE BOOL "Enable Lua wrappers") set(LIBKMS_ENABLE_KMSCUBE OFF CACHE BOOL "Enable kmscube") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -Wall") @@ -34,7 +33,3 @@ endif() if(LIBKMS_ENABLE_PYTHON) add_subdirectory(py) endif() - -if(LIBKMS_ENABLE_LUA) - add_subdirectory(lua) -endif() diff --git a/README.md b/README.md index cc46429..24cf75f 100644 --- a/README.md +++ b/README.md @@ -2,14 +2,13 @@ libkms++ is a C++11 library for kernel mode setting. -Also included are simple test tools for KMS and python and lua wrappers for libkms++. +Also included are simple test tools for KMS and python wrapper for libkms++. ## Dependencies: - libdrm -- SWIG 3.x (for python & lua bindings) +- SWIG 3.x (for python bindings) - Python 3.x (for python bindings) -- Lua 5.x (for lua bindings) ## Build instructions: @@ -51,7 +50,6 @@ Option name | Values | Default -------------------- | ------------- | -------- CMAKE_BUILD_TYPE | Release/Debug | Release LIBKMS_ENABLE_PYTHON | ON/OFF | ON -LIBKMS_ENABLE_LUA | ON/OFF | ON LIBKMS_ENABLE_KMSCUBEĀ | ON/OFF | OFF ## Env variables diff --git a/lua/CMakeLists.txt b/lua/CMakeLists.txt deleted file mode 100644 index 584648d..0000000 --- a/lua/CMakeLists.txt +++ /dev/null @@ -1,19 +0,0 @@ -set(SWIG_EXECUTABLE "swig3.0") -find_package(SWIG 3.0 REQUIRED) -include(${SWIG_USE_FILE}) - -include_directories(${LIBDRM_INCLUDE_DIRS}) -link_directories(${LIBDRM_LIBRARY_DIRS}) - -pkg_search_module(LUA REQUIRED lua5.2 lua) -include_directories(${LUA_INCLUDE_DIRS}) -link_directories(${LUA_LIBRARY_DIRS}) - -# XXX how to add these inc dirs in a proper way? -include_directories(../libkms++ ../libkmstest) - -set_source_files_properties(luakms.i PROPERTIES CPLUSPLUS ON) -swig_add_module(luakms lua luakms.i) -swig_link_libraries(luakms kms++ kmstest ${LIBDRM_LIBRARIES} ${LUA_LIBRARIES}) - -add_custom_target(luaextras SOURCES test.lua) diff --git a/lua/luakms.i b/lua/luakms.i deleted file mode 100644 index cdf802b..0000000 --- a/lua/luakms.i +++ /dev/null @@ -1,25 +0,0 @@ -%module libluakms -%{ -#include "kms++.h" - -#include "kmstest.h" - -using namespace kms; -%} - -%include "std_string.i" -%include "stdint.i" - -%include "decls.h" -%include "drmobject.h" -%include "atomicreq.h" -%include "crtc.h" -%include "card.h" -%include "property.h" -%include "framebuffer.h" -%include "dumbframebuffer.h" -%include "plane.h" -%include "connector.h" -%include "encoder.h" - -%include "kmstest.h" diff --git a/lua/test.lua b/lua/test.lua deleted file mode 100755 index c3de15c..0000000 --- a/lua/test.lua +++ /dev/null @@ -1,20 +0,0 @@ -#!/usr/bin/lua - -require("libluakms") -require("bit32") - -card = libluakms.Card() - -conn = card:get_first_connected_connector() - -mode = conn:get_default_mode() - -fb = libluakms.DumbFramebuffer(card, mode.hdisplay, mode.vdisplay, "XR24"); -libluakms.draw_test_pattern(fb); - -crtc = conn:get_current_crtc() - -crtc:set_mode(conn, fb, mode) - -print("Press enter to exit") -io.read() -- cgit v1.2.3