nishi/nishbox
1
Fork 0
mirror of https://github.com/nishiowo/nishbox synced 2025-04-21 20:24:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

sort dir

Browse Source
This commit is contained in:
NishiOwO 2025-04-21 10:20:29 +09:00
parent 52e0f0d89f
commit 0255759a3a
No known key found for this signature in database
GPG Key ID: 27EF69B208EB9343
38 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
engine/goldfish.bmp → engine/images/goldfish.bmp
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 48 KiB

After

Width:  |  Height:  |  Size: 48 KiB

0
engine/goldfish.ico → engine/images/goldfish.ico
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 14 KiB

After

Width:  |  Height:  |  Size: 14 KiB

0
engine/goldfish.png → engine/images/goldfish.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 13 KiB

After

Width:  |  Height:  |  Size: 13 KiB

15
engine/premake5.lua
View File

@ -282,6 +282,7 @@ project("GoldFish")
optimize("On") optimize("On")
gf_msvc_filters() gf_msvc_filters()
targetdir("lib/%{cfg.buildcfg}/%{cfg.platform}") targetdir("lib/%{cfg.buildcfg}/%{cfg.platform}")
objdir("obj")
targetname("goldfish") targetname("goldfish")
includedirs({ includedirs({
"include", "include",
@ -293,21 +294,21 @@ project("GoldFish")
}) })
files({ files({
"include/**.h", "include/**.h",
"*.c", "src/*.c",
"external/zlib/*.h", "external/zlib/*.h",
"external/zlib/*.c", "external/zlib/*.c",
"external/lua/l*.h", "external/lua/l*.h",
"external/lua/l*.c", "external/lua/l*.c",
}) })
files({ files({
"audio/*.c" "src/audio/*.c"
}) })
filter({ filter({
"system:windows", "system:windows",
"options:engine=dynamic" "options:engine=dynamic"
}) })
files({ files({
"engine.rc" "src/engine.rc"
}) })
filter({}) filter({})
removefiles({ removefiles({
@ -320,11 +321,11 @@ project("GoldFish")
filter("system:windows") filter("system:windows")
files({ files({
"thread/win32/gf_thread.c" "src/thread/win32/gf_thread.c"
}) })
filter("system:not windows") filter("system:not windows")
files({ files({
"thread/posix/gf_thread.c" "src/thread/posix/gf_thread.c"
}) })
filter({}) filter({})
@ -399,8 +400,8 @@ project("GoldFish")
"options:" .. k .. "=" .. k2 "options:" .. k .. "=" .. k2
}) })
files({ files({
"graphic/" .. k .. "/*.c", "src/graphic/" .. k .. "/*.c",
"graphic/" .. k .. "/" .. k2 .. "/*.c" "src/graphic/" .. k .. "/" .. k2 .. "/*.c"
}) })
end end
end end

0
engine/audio/gf_audio_mod.c → engine/src/audio/gf_audio_mod.c
View File

0
engine/audio/gf_audio_xm.c → engine/src/audio/gf_audio_xm.c
View File

2
engine/engine.rc → engine/src/engine.rc
View File

@ -9,7 +9,7 @@ BEGIN
BEGIN BEGIN
VALUE "CompanyName", "GoldFish contributors\0" VALUE "CompanyName", "GoldFish contributors\0"
VALUE "FileDescription", "GoldFish Engine\0" VALUE "FileDescription", "GoldFish Engine\0"
VALUE "LegalCopyright", "Public domain, original by GoldFish contributors\0" VALUE "LegalCopyright", "3-clause BSD, original by GoldFish contributors\0"
VALUE "FileVersion", "0.0.0.0\0" VALUE "FileVersion", "0.0.0.0\0"
VALUE "ProductName", "GoldFish Engine\0" VALUE "ProductName", "GoldFish Engine\0"
END END

0
engine/gf_audio.c → engine/src/gf_audio.c
View File

0
engine/gf_client.c → engine/src/gf_client.c
View File

0
engine/gf_core.c → engine/src/gf_core.c
View File

0
engine/gf_draw_common.c → engine/src/gf_draw_common.c
View File

0
engine/gf_font.c → engine/src/gf_font.c
View File

0
engine/gf_graphic_common.c → engine/src/gf_graphic_common.c
View File

0
engine/gf_gui.c → engine/src/gf_gui.c
View File

0
engine/gf_input.c → engine/src/gf_input.c
View File

0
engine/gf_log.c → engine/src/gf_log.c
View File

0
engine/gf_math.c → engine/src/gf_math.c
View File

0
engine/gf_mesh.c → engine/src/gf_mesh.c
View File

0
engine/gf_miniaudio.c → engine/src/gf_miniaudio.c
View File

0
engine/gf_model.c → engine/src/gf_model.c
View File

0
engine/gf_physics.c → engine/src/gf_physics.c
View File

0
engine/gf_server.c → engine/src/gf_server.c
View File

0
engine/gf_stb_image.c → engine/src/gf_stb_image.c
View File

0
engine/gf_texture.c → engine/src/gf_texture.c
View File

0
engine/gf_version.c → engine/src/gf_version.c
View File

0
engine/graphic/directx/dx11/gf_draw.c → engine/src/graphic/directx/dx11/gf_draw.c
View File

0
engine/graphic/directx/gf_driver.c → engine/src/graphic/directx/gf_driver.c
View File

0
engine/graphic/directx/gf_graphic.c → engine/src/graphic/directx/gf_graphic.c
View File

0
engine/graphic/opengl/gf_driver.c → engine/src/graphic/opengl/gf_driver.c
View File

0
engine/graphic/opengl/gf_graphic.c → engine/src/graphic/opengl/gf_graphic.c
View File

0
engine/graphic/opengl/glfw/gf_draw.c → engine/src/graphic/opengl/glfw/gf_draw.c
View File

0
engine/graphic/opengl/glx/gf_draw.c → engine/src/graphic/opengl/glx/gf_draw.c
View File

0
engine/graphic/opengl/wgl/gf_draw.c → engine/src/graphic/opengl/wgl/gf_draw.c
View File

0
engine/thread/posix/gf_thread.c → engine/src/thread/posix/gf_thread.c
View File

0
engine/thread/win32/gf_thread.c → engine/src/thread/win32/gf_thread.c
View File

4
engine/util/engineinfo/engineinfo.rc
View File

@ -1,7 +1,7 @@
#include <windows.h> #include <windows.h>
GAME ICON "../goldfish.ico" GAME ICON "../images/goldfish.ico"
GOLDFISH_BMP BITMAP "../goldfish.bmp" GOLDFISH_BMP BITMAP "../images/goldfish.bmp"
VS_VERSION_INFO VERSIONINFO VS_VERSION_INFO VERSIONINFO
FILEVERSION 0,0,0,0 FILEVERSION 0,0,0,0

3
engine/util/premake5.lua
View File

@ -5,7 +5,8 @@ project("EngineInfo")
kind("ConsoleApp") kind("ConsoleApp")
filter({}) filter({})
language("C") language("C")
targetdir("bin/%{cfg.buildcfg}/%{cfg.platform}") targetdir("../bin/%{cfg.buildcfg}/%{cfg.platform}")
objdir("../obj")
targetname("engineinfo") targetname("engineinfo")
includedirs({ includedirs({
"../include" "../include"

2
premake5.lua
View File

@ -85,6 +85,7 @@ project("NishBoxServer")
kind("ConsoleApp") kind("ConsoleApp")
language("C") language("C")
targetdir("bin/%{cfg.buildcfg}/%{cfg.platform}") targetdir("bin/%{cfg.buildcfg}/%{cfg.platform}")
objdir("obj/%{cfg.buildcfg}/%{cfg.platform}")
targetname("nishbox_server") targetname("nishbox_server")
includedirs({ includedirs({
"engine/include" "engine/include"
@ -120,6 +121,7 @@ project("NishBox")
kind("ConsoleApp") kind("ConsoleApp")
language("C") language("C")
targetdir("bin/%{cfg.buildcfg}/%{cfg.platform}") targetdir("bin/%{cfg.buildcfg}/%{cfg.platform}")
objdir("obj/%{cfg.buildcfg}/%{cfg.platform}")
targetname("nishbox") targetname("nishbox")
includedirs({ includedirs({
"engine/include" "engine/include"