More fixes, add DEV define to enable some dev features only for hot reload build
This commit is contained in:
parent
729fc277cb
commit
328dac0617
@ -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,8 +159,7 @@ build_deps :: proc(opts: Options) -> []string {
|
||||
|
||||
if !is_built || force {
|
||||
run_cmd(
|
||||
slice.concatenate(
|
||||
[][]string {
|
||||
temp_concat(
|
||||
{
|
||||
"zig",
|
||||
"c++",
|
||||
@ -165,12 +167,9 @@ build_deps :: proc(opts: Options) -> []string {
|
||||
"-DTRACY_ENABLE",
|
||||
"-O2",
|
||||
"vendor/tracy/public/TracyClient.cpp",
|
||||
"-lws2_32",
|
||||
"-ldbghelp",
|
||||
},
|
||||
TRACY_FLAGS,
|
||||
shared ? {"-shared", "-o", TRACY_NAME_SHARED} : {"-c", "-o", "tracy.o"},
|
||||
},
|
||||
context.temp_allocator,
|
||||
),
|
||||
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,
|
||||
},
|
||||
|
@ -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)
|
||||
|
Loading…
x
Reference in New Issue
Block a user