From 5fbeb1e4e9459125d0ec6501fd6a30ae16533868 Mon Sep 17 00:00:00 2001 From: shylie Date: Fri, 31 Jan 2025 08:11:57 -0500 Subject: [PATCH] remove lua --- .gitmodules | 3 --- CMakeLists.txt | 30 ++++++----------------------- Lua | 1 - examples/CMakeLists.txt | 4 ++-- lua-examples/basic/main.lua | 35 ---------------------------------- lua-examples/basic/sprites.png | 3 --- 6 files changed, 8 insertions(+), 68 deletions(-) delete mode 160000 Lua delete mode 100644 lua-examples/basic/main.lua delete mode 100644 lua-examples/basic/sprites.png diff --git a/.gitmodules b/.gitmodules index 088957c..728bde6 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,6 +1,3 @@ [submodule "glfw"] path = glfw url = https://github.com/glfw/glfw.git -[submodule "Lua"] - path = Lua - url = https://github.com/walterschell/Lua.git diff --git a/CMakeLists.txt b/CMakeLists.txt index b8d92fb..e7affb5 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -15,9 +15,8 @@ set(GLERMINAL_CELL_SCALE 4 CACHE STRING "") configure_file(source/glerminal-config.h.in glerminal-config.h @ONLY) add_subdirectory(glfw) -add_subdirectory(Lua) -add_library(glerminallib STATIC +add_library(glerminal STATIC ${CMAKE_CURRENT_BINARY_DIR}/glerminal-config.h include/glerminal.h @@ -33,12 +32,12 @@ add_library(glerminallib STATIC source/miniaudio.c ) -set_target_properties(glerminallib +set_target_properties(glerminal PROPERTIES CXX_STANDARD 11 ) -target_include_directories(glerminallib +target_include_directories(glerminal PUBLIC include ${CMAKE_CURRENT_BINARY_DIR} @@ -46,12 +45,12 @@ target_include_directories(glerminallib source ) -target_link_libraries(glerminallib +target_link_libraries(glerminal PUBLIC glfw ) -target_compile_definitions(glerminallib +target_compile_definitions(glerminal PUBLIC GLERMINAL_VERSION=${PROJECT_VERSION} GLERMINAL_VERSION_MAJOR=${PROJECT_VERSION_MAJOR} @@ -59,27 +58,10 @@ target_compile_definitions(glerminallib GLERMINAL_VERSION_PATCH=${PROJECT_VERSION_PATCH} ) -if (MSVC) - target_link_options(glerminallib - PUBLIC - "/ENTRY:mainCRTStartup" - ) -endif() - -add_executable(glerminal WIN32 - source/glerminal-main.cpp -) - -target_link_libraries(glerminal - PRIVATE - glerminallib - lua_static -) - if (PROJECT_IS_TOP_LEVEL) add_subdirectory(examples examples) endif() if (GLERMINAL_TEST) add_subdirectory(tests tests) -endif() \ No newline at end of file +endif() diff --git a/Lua b/Lua deleted file mode 160000 index 88246d6..0000000 --- a/Lua +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 88246d621abf7b6fba9332f49229d507f020e450 diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt index b7a248b..2bb223b 100644 --- a/examples/CMakeLists.txt +++ b/examples/CMakeLists.txt @@ -36,5 +36,5 @@ list(TRANSFORM EXAMPLE_RESOURCES PREPEND ${CMAKE_CURRENT_BINARY_DIR}/) foreach(SOURCE_FILE ${EXAMPLE_SOURCES}) get_filename_component(SOURCE_FILENAME ${SOURCE_FILE} NAME_WLE) add_executable(${SOURCE_FILENAME} WIN32 ${SOURCE_FILE} ${EXAMPLE_RESOURCES}) - target_link_libraries(${SOURCE_FILENAME} PRIVATE glerminallib) -endforeach() \ No newline at end of file + target_link_libraries(${SOURCE_FILENAME} PRIVATE glerminal) +endforeach() diff --git a/lua-examples/basic/main.lua b/lua-examples/basic/main.lua deleted file mode 100644 index 8100b5a..0000000 --- a/lua-examples/basic/main.lua +++ /dev/null @@ -1,35 +0,0 @@ -local time = 0 - -function glerminal.init() - if not glerminal.sprites('sprites.png') then - print('failed to load sprites') - end - - for i = 1, 40 do - for j = 1, 25 do - glerminal.set(i, j, 1, 2) - end - end - - glerminal.tint(1, 0xA0FFFFFF) - - glerminal.flush() -end - -function glerminal.main(dt) - time = time + dt / 2 - - for i = 1, 40 do - for j = 1, 25 do - glerminal.offset(i, j, 1, math.cos(time * i / math.pi), math.sin(time * j / math.pi)) - end - end - - glerminal.flush() -end - -function glerminal.keypresse(key) end -function glerminal.keyrelease(key) end -function glerminal.mousemove(x, y) end -function glerminal.mousepress(button, x, y) end -function glerminal.mouserelease(button, x, y) end \ No newline at end of file diff --git a/lua-examples/basic/sprites.png b/lua-examples/basic/sprites.png deleted file mode 100644 index 4758f7b..0000000 --- a/lua-examples/basic/sprites.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:6dee3efcdfa72e54a602f69643907bb8e8a3328d2b40c2116dce22ff179d8892 -size 182