build scripts

diff --git a/.gitignore b/.gitignore
index 22c8eae7672295da98e20c8287c64d132b21dfd8..0ef963dff51d3a8439aa696f4af38efecc999a7b 100755 (executable)
--- 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 009f67fcfea850ad81b16d3683e8e642ce7368da..89aeac9e8e56dd47c82ca3a29b6fab7e615e2694 100644 (file)
--- 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 (executable)
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 (executable)
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 35416db7d207a1d1e498541505fd3ebdab2b4f32..ddb4f9c6ee286c78159d5af6ece2366c9d25f1cc 100644 (file)
--- 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 (file)
index 0000000..bcc7434
--- /dev/null
+++ b/steam_build_script.vdf
@@ -0,0 +1,30 @@
+"AppBuild"\r
+{\r
+       "AppID" "1218140"\r
+       "Desc" "MC Multi-build"\r
+\r
+       "ContentRoot" "/home/harry/Documents/fishladder/dist/"\r
+       "BuildOutput" "dist/steam_cache"\r
+\r
+       "Depots"\r
+       {\r
+               "1218142" // Linux Binary\r
+               {\r
+                       "FileMapping"\r
+                       {\r
+                               "LocalPath" "bin/marblecomp-linux-x86_64-zig-cc/*"\r
+                               "DepotPath" "."\r
+                               "recursive" "1"\r
+                       }\r
+               }\r
+               "1218141" // Windows Binary\r
+               {\r
+                       "FileMapping"\r
+                       {\r
+                               "LocalPath" "bin/marblecomp-windows-x86_64-zig-cc/*"\r
+                               "DepotPath" "."\r
+                               "recursive" "1"\r
+                       }\r
+               }\r
+       }\r
+}\r

diff --git a/upload_to_steam.sh b/upload_to_steam.sh
new file mode 100755 (executable)
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