This commit is contained in:
Nishi 2026-01-08 00:35:00 +09:00
commit 15c5376364
Signed by: nishi
GPG key ID: 27EF69B208EB9343
12 changed files with 1358 additions and 1312 deletions

View file

@ -9,6 +9,8 @@ add_subdirectory(external/milsko)
add_subdirectory(engine) add_subdirectory(engine)
include_directories(external/stb)
install( install(
FILES resource/logo.png resource/font.png FILES resource/logo.png resource/font.png
DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/assaultfish DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/assaultfish

View file

@ -17,5 +17,11 @@ endmacro()
add_subdirectory(external/glad) add_subdirectory(external/glad)
add_subdirectory(net) add_subdirectory(net)
add_subdirectory(common)
add_subdirectory(tools) add_subdirectory(tools)
install(
FILES resource/shadow.vs resource/shadow.fs
DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/gearbox
)

View file

0
engine/common/log.c Normal file
View file

File diff suppressed because it is too large Load diff

View file

Before

Width:  |  Height:  |  Size: 6.6 KiB

After

Width:  |  Height:  |  Size: 6.6 KiB

Before After
Before After

View file

@ -3,7 +3,6 @@ include(GNUInstallDirs)
macro(compile_tool name) macro(compile_tool name)
file(GLOB ${name}_SRC ${name}/*.c) file(GLOB ${name}_SRC ${name}/*.c)
add_executable(${name} ${${name}_SRC}) add_executable(${name} ${${name}_SRC})
target_include_directories(${name} PRIVATE ../../external/stb)
endmacro() endmacro()
compile_tool(gb_dumpfont) compile_tool(gb_dumpfont)

View file

@ -1,2 +1,2 @@
#!/bin/sh #!/bin/sh
clang-format --verbose -i `find include server client tools src -name "*.c" -or -name "*.h"` clang-format --verbose -i `find engine/common engine/net engine/tools -name "*.c" -or -name "*.h"`