sort dir

2025-04-21 12:14:39 +00:00 · 2025-04-21 10:20:29 +09:00 · 2025-04-21 10:20:29 +09:00 · 0255759a3a
commit 0255759a3a
parent 52e0f0d89f
38 changed files with 15 additions and 11 deletions
--- a/engine/images/goldfish.bmp
+++ b/engine/images/goldfish.bmp
--- a/engine/images/goldfish.ico
+++ b/engine/images/goldfish.ico
--- a/engine/images/goldfish.png
+++ b/engine/images/goldfish.png
--- 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
--- a/engine/src/audio/gf_audio_mod.c
+++ b/engine/src/audio/gf_audio_mod.c
--- a/engine/src/audio/gf_audio_xm.c
+++ b/engine/src/audio/gf_audio_xm.c
--- a/engine/src/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
--- a/engine/src/gf_audio.c
+++ b/engine/src/gf_audio.c
--- a/engine/src/gf_client.c
+++ b/engine/src/gf_client.c
--- a/engine/src/gf_core.c
+++ b/engine/src/gf_core.c
--- a/engine/src/gf_draw_common.c
+++ b/engine/src/gf_draw_common.c
--- a/engine/src/gf_font.c
+++ b/engine/src/gf_font.c
--- a/engine/src/gf_graphic_common.c
+++ b/engine/src/gf_graphic_common.c
--- a/engine/src/gf_gui.c
+++ b/engine/src/gf_gui.c
--- a/engine/src/gf_input.c
+++ b/engine/src/gf_input.c
--- a/engine/src/gf_log.c
+++ b/engine/src/gf_log.c
--- a/engine/src/gf_math.c
+++ b/engine/src/gf_math.c
--- a/engine/src/gf_mesh.c
+++ b/engine/src/gf_mesh.c
--- a/engine/src/gf_miniaudio.c
+++ b/engine/src/gf_miniaudio.c
--- a/engine/src/gf_model.c
+++ b/engine/src/gf_model.c
--- a/engine/src/gf_physics.c
+++ b/engine/src/gf_physics.c
--- a/engine/src/gf_server.c
+++ b/engine/src/gf_server.c
--- a/engine/src/gf_stb_image.c
+++ b/engine/src/gf_stb_image.c
--- a/engine/src/gf_texture.c
+++ b/engine/src/gf_texture.c
--- a/engine/src/gf_version.c
+++ b/engine/src/gf_version.c
--- a/engine/src/graphic/directx/dx11/gf_draw.c
+++ b/engine/src/graphic/directx/dx11/gf_draw.c
--- a/engine/src/graphic/directx/gf_driver.c
+++ b/engine/src/graphic/directx/gf_driver.c
--- a/engine/src/graphic/directx/gf_graphic.c
+++ b/engine/src/graphic/directx/gf_graphic.c
--- a/engine/src/graphic/opengl/gf_driver.c
+++ b/engine/src/graphic/opengl/gf_driver.c
--- a/engine/src/graphic/opengl/gf_graphic.c
+++ b/engine/src/graphic/opengl/gf_graphic.c
--- a/engine/src/graphic/opengl/glfw/gf_draw.c
+++ b/engine/src/graphic/opengl/glfw/gf_draw.c
--- a/engine/src/graphic/opengl/glx/gf_draw.c
+++ b/engine/src/graphic/opengl/glx/gf_draw.c
--- a/engine/src/graphic/opengl/wgl/gf_draw.c
+++ b/engine/src/graphic/opengl/wgl/gf_draw.c
--- a/engine/src/thread/posix/gf_thread.c
+++ b/engine/src/thread/posix/gf_thread.c
--- a/engine/src/thread/win32/gf_thread.c
+++ b/engine/src/thread/win32/gf_thread.c
--- a/engine/util/engineinfo/engineinfo.rc
+++ b/engine/util/engineinfo/engineinfo.rc
@ -1,7 +1,7 @@
 #include <windows.h>

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