diff --git a/builder/builder.odin b/builder/builder.odin index b02a955..c839edc 100644 --- a/builder/builder.odin +++ b/builder/builder.odin @@ -139,12 +139,15 @@ build_deps :: proc(opts: Options) -> []string { when ODIN_OS == .Windows { TRACY_NAME_SHARED :: "tracy.dll" TRACY_NAME_STATIC :: "tracy.lib" + TRACY_FLAGS :: []string{"-lws2_32", "-ldbghelp"} } else when ODIN_OS == .Linux { TRACY_NAME_SHARED :: "tracy.so" TRACY_NAME_STATIC :: "tracy.a" + TRACY_FLAGS :: []string{} } else when ODIN_OS == .Darwin { TRACY_NAME_SHARED :: "tracy.dynlib" TRACY_NAME_STATIC :: "tracy.a" + TRACY_FLAGS :: []string{} } 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 { run_cmd( - slice.concatenate( - [][]string { - { - "zig", - "c++", - "-std=c++11", - "-DTRACY_ENABLE", - "-O2", - "vendor/tracy/public/TracyClient.cpp", - "-lws2_32", - "-ldbghelp", - }, - shared ? {"-shared", "-o", TRACY_NAME_SHARED} : {"-c", "-o", "tracy.o"}, + temp_concat( + { + "zig", + "c++", + "-std=c++11", + "-DTRACY_ENABLE", + "-O2", + "vendor/tracy/public/TracyClient.cpp", }, - context.temp_allocator, + TRACY_FLAGS, + shared ? {"-shared", "-o", TRACY_NAME_SHARED} : {"-c", "-o", "tracy.o"}, ), cwd, ) @@ -285,6 +284,7 @@ main :: proc() { "game", "-define:RAYLIB_SHARED=true", "-define:PHYSFS_SHARED=true", + "-define:DEV=true", "-build-mode:dll", "-out:./bin/hotreload/game_tmp" + DLL_EXT, }, diff --git a/game/game.odin b/game/game.odin index 23a8d3b..88ecdce 100644 --- a/game/game.odin +++ b/game/game.odin @@ -1283,6 +1283,8 @@ game_init_window :: proc(args: []string) { rl.SetTargetFPS(120) } +DEV_BUILD :: #config(DEV, false) + @(export) game_init :: proc() { g_mem = new(Game_Memory) @@ -1293,7 +1295,7 @@ game_init :: proc() { assets.assetman_init(&g_mem.assetman) 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() ui.init(&g_mem.ui_context)