mirror/glerminal
1
0
Fork 0
mirror of https://git.shylie.info/shylie/glerminal.git synced 2025-02-07 03:10:12 +00:00
Code Issues Projects Releases Wiki Activity

remove lua

Browse Source
This commit is contained in:
shylie 2025-01-31 08:11:57 -05:00
parent 11ffc40bbb
commit 5fbeb1e4e9
6 changed files with 8 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.gitmodules vendored
View File

@ -1,6 +1,3 @@
[submodule "glfw"] [submodule "glfw"]
path = glfw path = glfw
url = https://github.com/glfw/glfw.git url = https://github.com/glfw/glfw.git
[submodule "Lua"]
path = Lua
url = https://github.com/walterschell/Lua.git

30
CMakeLists.txt
View File

@ -15,9 +15,8 @@ set(GLERMINAL_CELL_SCALE 4 CACHE STRING "")
configure_file(source/glerminal-config.h.in glerminal-config.h @ONLY) configure_file(source/glerminal-config.h.in glerminal-config.h @ONLY)
add_subdirectory(glfw) add_subdirectory(glfw)
add_subdirectory(Lua)
add_library(glerminallib STATIC add_library(glerminal STATIC
${CMAKE_CURRENT_BINARY_DIR}/glerminal-config.h ${CMAKE_CURRENT_BINARY_DIR}/glerminal-config.h
include/glerminal.h include/glerminal.h
@ -33,12 +32,12 @@ add_library(glerminallib STATIC
source/miniaudio.c source/miniaudio.c
) )
set_target_properties(glerminallib set_target_properties(glerminal
PROPERTIES PROPERTIES
CXX_STANDARD 11 CXX_STANDARD 11
) )
target_include_directories(glerminallib target_include_directories(glerminal
PUBLIC PUBLIC
include include
${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_BINARY_DIR}
@ -46,12 +45,12 @@ target_include_directories(glerminallib
source source
) )
target_link_libraries(glerminallib target_link_libraries(glerminal
PUBLIC PUBLIC
glfw glfw
) )
target_compile_definitions(glerminallib target_compile_definitions(glerminal
PUBLIC PUBLIC
GLERMINAL_VERSION=${PROJECT_VERSION} GLERMINAL_VERSION=${PROJECT_VERSION}
GLERMINAL_VERSION_MAJOR=${PROJECT_VERSION_MAJOR} GLERMINAL_VERSION_MAJOR=${PROJECT_VERSION_MAJOR}
@ -59,27 +58,10 @@ target_compile_definitions(glerminallib
GLERMINAL_VERSION_PATCH=${PROJECT_VERSION_PATCH} 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) if (PROJECT_IS_TOP_LEVEL)
add_subdirectory(examples examples) add_subdirectory(examples examples)
endif() endif()
if (GLERMINAL_TEST) if (GLERMINAL_TEST)
add_subdirectory(tests tests) add_subdirectory(tests tests)
endif() endif()

1
Lua

@ -1 +0,0 @@
Subproject commit 88246d621abf7b6fba9332f49229d507f020e450

4
examples/CMakeLists.txt
View File

@ -36,5 +36,5 @@ list(TRANSFORM EXAMPLE_RESOURCES PREPEND ${CMAKE_CURRENT_BINARY_DIR}/)
foreach(SOURCE_FILE ${EXAMPLE_SOURCES}) foreach(SOURCE_FILE ${EXAMPLE_SOURCES})
get_filename_component(SOURCE_FILENAME ${SOURCE_FILE} NAME_WLE) get_filename_component(SOURCE_FILENAME ${SOURCE_FILE} NAME_WLE)
add_executable(${SOURCE_FILENAME} WIN32 ${SOURCE_FILE} ${EXAMPLE_RESOURCES}) add_executable(${SOURCE_FILENAME} WIN32 ${SOURCE_FILE} ${EXAMPLE_RESOURCES})
target_link_libraries(${SOURCE_FILENAME} PRIVATE glerminallib) target_link_libraries(${SOURCE_FILENAME} PRIVATE glerminal)
endforeach() endforeach()

35
lua-examples/basic/main.lua
View File

@ -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

3
lua-examples/basic/sprites.png
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:6dee3efcdfa72e54a602f69643907bb8e8a3328d2b40c2116dce22ff179d8892
size 182