From 0cde4957007d6242b39f5eaf81a31e23900d5b06 Mon Sep 17 00:00:00 2001 From: hgn Date: Thu, 4 Jan 2024 14:51:43 +0000 Subject: [PATCH] build scripts --- .gitignore | 1 + build.c | 10 ++++---- dist/steam_cache/depot_build_1218141.vdf | 9 +++++++ dist/steam_cache/depot_build_1218142.vdf | 9 +++++++ marblecomp.c | 3 ++- steam_build_script.vdf | 30 ++++++++++++++++++++++++ upload_to_steam.sh | 1 + 7 files changed, 58 insertions(+), 5 deletions(-) create mode 100755 dist/steam_cache/depot_build_1218141.vdf create mode 100755 dist/steam_cache/depot_build_1218142.vdf create mode 100644 steam_build_script.vdf create mode 100755 upload_to_steam.sh diff --git a/.gitignore b/.gitignore index 22c8eae..0ef963d 100755 --- a/.gitignore +++ b/.gitignore @@ -36,6 +36,7 @@ restricted/ !*.sh !*.bat !*.conf +!*.vdf # Compiled resources _______________ # MMV proprietary files diff --git a/build.c b/build.c index 009f67f..89aeac9 100644 --- a/build.c +++ b/build.c @@ -59,15 +59,16 @@ void s_release_all(void){ /* binaries for windows and linux */ vg_build.platform = k_platform_windows; - compile_game( 1, 0 ); + compile_game( 1, 1 ); vg_tarball_last_project(); - vg_success( "Completed 1/3\n" ); + vg_success( "Completed 1/2\n" ); vg_build.platform = k_platform_linux; - compile_game( 1, 0 ); + compile_game( 1, 1 ); vg_tarball_last_project(); - vg_success( "Completed 2/3\n" ); + vg_success( "Completed 2/2\n" ); +#if 0 /* content files for any platform */ vg_build.platform = k_platform_anyplatform; vg_build.compiler = k_compiler_blob; @@ -76,6 +77,7 @@ void s_release_all(void){ compile_game( 0, 1 ); vg_tarball_last_project(); vg_success( "Completed 3/3\n" ); +#endif } void s_testing_build(void){ diff --git a/dist/steam_cache/depot_build_1218141.vdf b/dist/steam_cache/depot_build_1218141.vdf new file mode 100755 index 0000000..eef2fff --- /dev/null +++ b/dist/steam_cache/depot_build_1218141.vdf @@ -0,0 +1,9 @@ +"depotbuild" +{ + "appid" "1218140" + "depotid" "1218141" + "flags" "0" + "steamid" "76561198072130043" + "manifest" "5841690690099065898" + "baselinemanifest" "6242687686564087841" +} diff --git a/dist/steam_cache/depot_build_1218142.vdf b/dist/steam_cache/depot_build_1218142.vdf new file mode 100755 index 0000000..6fec429 --- /dev/null +++ b/dist/steam_cache/depot_build_1218142.vdf @@ -0,0 +1,9 @@ +"depotbuild" +{ + "appid" "1218140" + "depotid" "1218142" + "flags" "0" + "steamid" "76561198072130043" + "manifest" "5738002581659433661" + "baselinemanifest" "2883070295580438548" +} diff --git a/marblecomp.c b/marblecomp.c index 35416db..ddb4f9c 100644 --- a/marblecomp.c +++ b/marblecomp.c @@ -28,7 +28,8 @@ struct { i32 colour_set, world_theme, bloom, vignette, music; audio_channel *music_channel; } -static marblecomp = { .op = k_mc_op_clientloading, .bloom = 1, .vignette = 1 }; +static marblecomp = { .op = k_mc_op_clientloading, .bloom = 1, .vignette = 1, + .music = 1 }; #include "input.h" #include "fishladder_vg1.c" diff --git a/steam_build_script.vdf b/steam_build_script.vdf new file mode 100644 index 0000000..bcc7434 --- /dev/null +++ b/steam_build_script.vdf @@ -0,0 +1,30 @@ +"AppBuild" +{ + "AppID" "1218140" + "Desc" "MC Multi-build" + + "ContentRoot" "/home/harry/Documents/fishladder/dist/" + "BuildOutput" "dist/steam_cache" + + "Depots" + { + "1218142" // Linux Binary + { + "FileMapping" + { + "LocalPath" "bin/marblecomp-linux-x86_64-zig-cc/*" + "DepotPath" "." + "recursive" "1" + } + } + "1218141" // Windows Binary + { + "FileMapping" + { + "LocalPath" "bin/marblecomp-windows-x86_64-zig-cc/*" + "DepotPath" "." + "recursive" "1" + } + } + } +} diff --git a/upload_to_steam.sh b/upload_to_steam.sh new file mode 100755 index 0000000..f5fd510 --- /dev/null +++ b/upload_to_steam.sh @@ -0,0 +1 @@ +steamworks_sdk/tools/ContentBuilder/builder_linux/steamcmd.sh +login $1 $2 +run_app_build ~/Documents/fishladder/steam_build_script.vdf -- 2.25.1