From 0255759a3ac9ad30a1e8ce16faf3c28974888fe1 Mon Sep 17 00:00:00 2001 From: NishiOwO Date: Mon, 21 Apr 2025 10:20:29 +0900 Subject: [PATCH] sort dir --- engine/{ => images}/goldfish.bmp | Bin engine/{ => images}/goldfish.ico | Bin engine/{ => images}/goldfish.png | Bin engine/premake5.lua | 15 ++++++++------- engine/{ => src}/audio/gf_audio_mod.c | 0 engine/{ => src}/audio/gf_audio_xm.c | 0 engine/{ => src}/engine.rc | 2 +- engine/{ => src}/gf_audio.c | 0 engine/{ => src}/gf_client.c | 0 engine/{ => src}/gf_core.c | 0 engine/{ => src}/gf_draw_common.c | 0 engine/{ => src}/gf_font.c | 0 engine/{ => src}/gf_graphic_common.c | 0 engine/{ => src}/gf_gui.c | 0 engine/{ => src}/gf_input.c | 0 engine/{ => src}/gf_log.c | 0 engine/{ => src}/gf_math.c | 0 engine/{ => src}/gf_mesh.c | 0 engine/{ => src}/gf_miniaudio.c | 0 engine/{ => src}/gf_model.c | 0 engine/{ => src}/gf_physics.c | 0 engine/{ => src}/gf_server.c | 0 engine/{ => src}/gf_stb_image.c | 0 engine/{ => src}/gf_texture.c | 0 engine/{ => src}/gf_version.c | 0 engine/{ => src}/graphic/directx/dx11/gf_draw.c | 0 engine/{ => src}/graphic/directx/gf_driver.c | 0 engine/{ => src}/graphic/directx/gf_graphic.c | 0 engine/{ => src}/graphic/opengl/gf_driver.c | 0 engine/{ => src}/graphic/opengl/gf_graphic.c | 0 engine/{ => src}/graphic/opengl/glfw/gf_draw.c | 0 engine/{ => src}/graphic/opengl/glx/gf_draw.c | 0 engine/{ => src}/graphic/opengl/wgl/gf_draw.c | 0 engine/{ => src}/thread/posix/gf_thread.c | 0 engine/{ => src}/thread/win32/gf_thread.c | 0 engine/util/engineinfo/engineinfo.rc | 4 ++-- engine/util/premake5.lua | 3 ++- premake5.lua | 2 ++ 38 files changed, 15 insertions(+), 11 deletions(-) rename engine/{ => images}/goldfish.bmp (100%) rename engine/{ => images}/goldfish.ico (100%) rename engine/{ => images}/goldfish.png (100%) rename engine/{ => src}/audio/gf_audio_mod.c (100%) rename engine/{ => src}/audio/gf_audio_xm.c (100%) rename engine/{ => src}/engine.rc (85%) rename engine/{ => src}/gf_audio.c (100%) rename engine/{ => src}/gf_client.c (100%) rename engine/{ => src}/gf_core.c (100%) rename engine/{ => src}/gf_draw_common.c (100%) rename engine/{ => src}/gf_font.c (100%) rename engine/{ => src}/gf_graphic_common.c (100%) rename engine/{ => src}/gf_gui.c (100%) rename engine/{ => src}/gf_input.c (100%) rename engine/{ => src}/gf_log.c (100%) rename engine/{ => src}/gf_math.c (100%) rename engine/{ => src}/gf_mesh.c (100%) rename engine/{ => src}/gf_miniaudio.c (100%) rename engine/{ => src}/gf_model.c (100%) rename engine/{ => src}/gf_physics.c (100%) rename engine/{ => src}/gf_server.c (100%) rename engine/{ => src}/gf_stb_image.c (100%) rename engine/{ => src}/gf_texture.c (100%) rename engine/{ => src}/gf_version.c (100%) rename engine/{ => src}/graphic/directx/dx11/gf_draw.c (100%) rename engine/{ => src}/graphic/directx/gf_driver.c (100%) rename engine/{ => src}/graphic/directx/gf_graphic.c (100%) rename engine/{ => src}/graphic/opengl/gf_driver.c (100%) rename engine/{ => src}/graphic/opengl/gf_graphic.c (100%) rename engine/{ => src}/graphic/opengl/glfw/gf_draw.c (100%) rename engine/{ => src}/graphic/opengl/glx/gf_draw.c (100%) rename engine/{ => src}/graphic/opengl/wgl/gf_draw.c (100%) rename engine/{ => src}/thread/posix/gf_thread.c (100%) rename engine/{ => src}/thread/win32/gf_thread.c (100%) diff --git a/engine/goldfish.bmp b/engine/images/goldfish.bmp similarity index 100% rename from engine/goldfish.bmp rename to engine/images/goldfish.bmp diff --git a/engine/goldfish.ico b/engine/images/goldfish.ico similarity index 100% rename from engine/goldfish.ico rename to engine/images/goldfish.ico diff --git a/engine/goldfish.png b/engine/images/goldfish.png similarity index 100% rename from engine/goldfish.png rename to engine/images/goldfish.png diff --git a/engine/premake5.lua b/engine/premake5.lua index 6f5183f..28491e3 100644 --- a/engine/premake5.lua +++ b/engine/premake5.lua @@ -282,6 +282,7 @@ project("GoldFish") optimize("On") gf_msvc_filters() targetdir("lib/%{cfg.buildcfg}/%{cfg.platform}") + objdir("obj") targetname("goldfish") includedirs({ "include", @@ -293,21 +294,21 @@ project("GoldFish") }) files({ "include/**.h", - "*.c", + "src/*.c", "external/zlib/*.h", "external/zlib/*.c", "external/lua/l*.h", "external/lua/l*.c", }) files({ - "audio/*.c" + "src/audio/*.c" }) filter({ "system:windows", "options:engine=dynamic" }) files({ - "engine.rc" + "src/engine.rc" }) filter({}) removefiles({ @@ -320,11 +321,11 @@ project("GoldFish") filter("system:windows") files({ - "thread/win32/gf_thread.c" + "src/thread/win32/gf_thread.c" }) filter("system:not windows") files({ - "thread/posix/gf_thread.c" + "src/thread/posix/gf_thread.c" }) filter({}) @@ -399,8 +400,8 @@ project("GoldFish") "options:" .. k .. "=" .. k2 }) files({ - "graphic/" .. k .. "/*.c", - "graphic/" .. k .. "/" .. k2 .. "/*.c" + "src/graphic/" .. k .. "/*.c", + "src/graphic/" .. k .. "/" .. k2 .. "/*.c" }) end end diff --git a/engine/audio/gf_audio_mod.c b/engine/src/audio/gf_audio_mod.c similarity index 100% rename from engine/audio/gf_audio_mod.c rename to engine/src/audio/gf_audio_mod.c diff --git a/engine/audio/gf_audio_xm.c b/engine/src/audio/gf_audio_xm.c similarity index 100% rename from engine/audio/gf_audio_xm.c rename to engine/src/audio/gf_audio_xm.c diff --git a/engine/engine.rc b/engine/src/engine.rc similarity index 85% rename from engine/engine.rc rename to engine/src/engine.rc index 50ceb20..80a548f 100644 --- a/engine/engine.rc +++ b/engine/src/engine.rc @@ -9,7 +9,7 @@ BEGIN BEGIN VALUE "CompanyName", "GoldFish contributors\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 "ProductName", "GoldFish Engine\0" END diff --git a/engine/gf_audio.c b/engine/src/gf_audio.c similarity index 100% rename from engine/gf_audio.c rename to engine/src/gf_audio.c diff --git a/engine/gf_client.c b/engine/src/gf_client.c similarity index 100% rename from engine/gf_client.c rename to engine/src/gf_client.c diff --git a/engine/gf_core.c b/engine/src/gf_core.c similarity index 100% rename from engine/gf_core.c rename to engine/src/gf_core.c diff --git a/engine/gf_draw_common.c b/engine/src/gf_draw_common.c similarity index 100% rename from engine/gf_draw_common.c rename to engine/src/gf_draw_common.c diff --git a/engine/gf_font.c b/engine/src/gf_font.c similarity index 100% rename from engine/gf_font.c rename to engine/src/gf_font.c diff --git a/engine/gf_graphic_common.c b/engine/src/gf_graphic_common.c similarity index 100% rename from engine/gf_graphic_common.c rename to engine/src/gf_graphic_common.c diff --git a/engine/gf_gui.c b/engine/src/gf_gui.c similarity index 100% rename from engine/gf_gui.c rename to engine/src/gf_gui.c diff --git a/engine/gf_input.c b/engine/src/gf_input.c similarity index 100% rename from engine/gf_input.c rename to engine/src/gf_input.c diff --git a/engine/gf_log.c b/engine/src/gf_log.c similarity index 100% rename from engine/gf_log.c rename to engine/src/gf_log.c diff --git a/engine/gf_math.c b/engine/src/gf_math.c similarity index 100% rename from engine/gf_math.c rename to engine/src/gf_math.c diff --git a/engine/gf_mesh.c b/engine/src/gf_mesh.c similarity index 100% rename from engine/gf_mesh.c rename to engine/src/gf_mesh.c diff --git a/engine/gf_miniaudio.c b/engine/src/gf_miniaudio.c similarity index 100% rename from engine/gf_miniaudio.c rename to engine/src/gf_miniaudio.c diff --git a/engine/gf_model.c b/engine/src/gf_model.c similarity index 100% rename from engine/gf_model.c rename to engine/src/gf_model.c diff --git a/engine/gf_physics.c b/engine/src/gf_physics.c similarity index 100% rename from engine/gf_physics.c rename to engine/src/gf_physics.c diff --git a/engine/gf_server.c b/engine/src/gf_server.c similarity index 100% rename from engine/gf_server.c rename to engine/src/gf_server.c diff --git a/engine/gf_stb_image.c b/engine/src/gf_stb_image.c similarity index 100% rename from engine/gf_stb_image.c rename to engine/src/gf_stb_image.c diff --git a/engine/gf_texture.c b/engine/src/gf_texture.c similarity index 100% rename from engine/gf_texture.c rename to engine/src/gf_texture.c diff --git a/engine/gf_version.c b/engine/src/gf_version.c similarity index 100% rename from engine/gf_version.c rename to engine/src/gf_version.c diff --git a/engine/graphic/directx/dx11/gf_draw.c b/engine/src/graphic/directx/dx11/gf_draw.c similarity index 100% rename from engine/graphic/directx/dx11/gf_draw.c rename to engine/src/graphic/directx/dx11/gf_draw.c diff --git a/engine/graphic/directx/gf_driver.c b/engine/src/graphic/directx/gf_driver.c similarity index 100% rename from engine/graphic/directx/gf_driver.c rename to engine/src/graphic/directx/gf_driver.c diff --git a/engine/graphic/directx/gf_graphic.c b/engine/src/graphic/directx/gf_graphic.c similarity index 100% rename from engine/graphic/directx/gf_graphic.c rename to engine/src/graphic/directx/gf_graphic.c diff --git a/engine/graphic/opengl/gf_driver.c b/engine/src/graphic/opengl/gf_driver.c similarity index 100% rename from engine/graphic/opengl/gf_driver.c rename to engine/src/graphic/opengl/gf_driver.c diff --git a/engine/graphic/opengl/gf_graphic.c b/engine/src/graphic/opengl/gf_graphic.c similarity index 100% rename from engine/graphic/opengl/gf_graphic.c rename to engine/src/graphic/opengl/gf_graphic.c diff --git a/engine/graphic/opengl/glfw/gf_draw.c b/engine/src/graphic/opengl/glfw/gf_draw.c similarity index 100% rename from engine/graphic/opengl/glfw/gf_draw.c rename to engine/src/graphic/opengl/glfw/gf_draw.c diff --git a/engine/graphic/opengl/glx/gf_draw.c b/engine/src/graphic/opengl/glx/gf_draw.c similarity index 100% rename from engine/graphic/opengl/glx/gf_draw.c rename to engine/src/graphic/opengl/glx/gf_draw.c diff --git a/engine/graphic/opengl/wgl/gf_draw.c b/engine/src/graphic/opengl/wgl/gf_draw.c similarity index 100% rename from engine/graphic/opengl/wgl/gf_draw.c rename to engine/src/graphic/opengl/wgl/gf_draw.c diff --git a/engine/thread/posix/gf_thread.c b/engine/src/thread/posix/gf_thread.c similarity index 100% rename from engine/thread/posix/gf_thread.c rename to engine/src/thread/posix/gf_thread.c diff --git a/engine/thread/win32/gf_thread.c b/engine/src/thread/win32/gf_thread.c similarity index 100% rename from engine/thread/win32/gf_thread.c rename to engine/src/thread/win32/gf_thread.c diff --git a/engine/util/engineinfo/engineinfo.rc b/engine/util/engineinfo/engineinfo.rc index c8aab39..125b4d6 100644 --- a/engine/util/engineinfo/engineinfo.rc +++ b/engine/util/engineinfo/engineinfo.rc @@ -1,7 +1,7 @@ #include -GAME ICON "../goldfish.ico" -GOLDFISH_BMP BITMAP "../goldfish.bmp" +GAME ICON "../images/goldfish.ico" +GOLDFISH_BMP BITMAP "../images/goldfish.bmp" VS_VERSION_INFO VERSIONINFO FILEVERSION 0,0,0,0 diff --git a/engine/util/premake5.lua b/engine/util/premake5.lua index e7a7df8..c5b4334 100644 --- a/engine/util/premake5.lua +++ b/engine/util/premake5.lua @@ -5,7 +5,8 @@ project("EngineInfo") kind("ConsoleApp") filter({}) language("C") - targetdir("bin/%{cfg.buildcfg}/%{cfg.platform}") + targetdir("../bin/%{cfg.buildcfg}/%{cfg.platform}") + objdir("../obj") targetname("engineinfo") includedirs({ "../include" diff --git a/premake5.lua b/premake5.lua index bb2e854..47f4fab 100644 --- a/premake5.lua +++ b/premake5.lua @@ -85,6 +85,7 @@ project("NishBoxServer") kind("ConsoleApp") language("C") targetdir("bin/%{cfg.buildcfg}/%{cfg.platform}") + objdir("obj/%{cfg.buildcfg}/%{cfg.platform}") targetname("nishbox_server") includedirs({ "engine/include" @@ -120,6 +121,7 @@ project("NishBox") kind("ConsoleApp") language("C") targetdir("bin/%{cfg.buildcfg}/%{cfg.platform}") + objdir("obj/%{cfg.buildcfg}/%{cfg.platform}") targetname("nishbox") includedirs({ "engine/include"