sergeypdev/gutter_runner
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

More fixes, add DEV define to enable some dev features only for hot reload build

Browse Source
This commit is contained in:
sergeypdev 2025-05-27 16:32:01 +04:00
parent 729fc277cb
commit 328dac0617
2 changed files with 17 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
builder/builder.odin
View File

@ -139,12 +139,15 @@ build_deps :: proc(opts: Options) -> []string {
when ODIN_OS == .Windows { when ODIN_OS == .Windows {
TRACY_NAME_SHARED :: "tracy.dll" TRACY_NAME_SHARED :: "tracy.dll"
TRACY_NAME_STATIC :: "tracy.lib" TRACY_NAME_STATIC :: "tracy.lib"
TRACY_FLAGS :: []string{"-lws2_32", "-ldbghelp"}
} else when ODIN_OS == .Linux { } else when ODIN_OS == .Linux {
TRACY_NAME_SHARED :: "tracy.so" TRACY_NAME_SHARED :: "tracy.so"
TRACY_NAME_STATIC :: "tracy.a" TRACY_NAME_STATIC :: "tracy.a"
TRACY_FLAGS :: []string{}
} else when ODIN_OS == .Darwin { } else when ODIN_OS == .Darwin {
TRACY_NAME_SHARED :: "tracy.dynlib" TRACY_NAME_SHARED :: "tracy.dynlib"
TRACY_NAME_STATIC :: "tracy.a" TRACY_NAME_STATIC :: "tracy.a"
TRACY_FLAGS :: []string{}
} }
file_path := temp_path_join("./libs/tracy", shared ? TRACY_NAME_SHARED : TRACY_NAME_STATIC) file_path := temp_path_join("./libs/tracy", shared ? TRACY_NAME_SHARED : TRACY_NAME_STATIC)
@ -156,21 +159,17 @@ build_deps :: proc(opts: Options) -> []string {
if !is_built || force { if !is_built || force {
run_cmd( run_cmd(
slice.concatenate( temp_concat(
[][]string { {
{ "zig",
"zig", "c++",
"c++", "-std=c++11",
"-std=c++11", "-DTRACY_ENABLE",
"-DTRACY_ENABLE", "-O2",
"-O2", "vendor/tracy/public/TracyClient.cpp",
"vendor/tracy/public/TracyClient.cpp",
"-lws2_32",
"-ldbghelp",
},
shared ? {"-shared", "-o", TRACY_NAME_SHARED} : {"-c", "-o", "tracy.o"},
}, },
context.temp_allocator, TRACY_FLAGS,
shared ? {"-shared", "-o", TRACY_NAME_SHARED} : {"-c", "-o", "tracy.o"},
), ),
cwd, cwd,
) )
@ -285,6 +284,7 @@ main :: proc() {
"game", "game",
"-define:RAYLIB_SHARED=true", "-define:RAYLIB_SHARED=true",
"-define:PHYSFS_SHARED=true", "-define:PHYSFS_SHARED=true",
"-define:DEV=true",
"-build-mode:dll", "-build-mode:dll",
"-out:./bin/hotreload/game_tmp" + DLL_EXT, "-out:./bin/hotreload/game_tmp" + DLL_EXT,
}, },

4
game/game.odin
View File

@ -1283,6 +1283,8 @@ game_init_window :: proc(args: []string) {
rl.SetTargetFPS(120) rl.SetTargetFPS(120)
} }
DEV_BUILD :: #config(DEV, false)
@(export) @(export)
game_init :: proc() { game_init :: proc() {
g_mem = new(Game_Memory) g_mem = new(Game_Memory)
@ -1293,7 +1295,7 @@ game_init :: proc() {
assets.assetman_init(&g_mem.assetman) assets.assetman_init(&g_mem.assetman)
editor_state_init(&g_mem.es, 100) editor_state_init(&g_mem.es, 100)
runtime_world_init(&g_mem.runtime_world, 100) runtime_world_init(&g_mem.runtime_world, DEV_BUILD ? 100 : 2)
g_mem.default_font = rl.GetFontDefault() g_mem.default_font = rl.GetFontDefault()
ui.init(&g_mem.ui_context) ui.init(&g_mem.ui_context)