From bcf0f4a4427e99a7e80a98890381e69aa808a241 Mon Sep 17 00:00:00 2001 From: Cameron M Reikes Date: Tue, 2 May 2023 18:16:42 -0700 Subject: [PATCH] Make much easier for other people to build and work on --- build_and_run_remedy.bat | 5 +++++ build_desktop_debug.bat | 6 ++---- run_codegen.bat | 38 ++++++++++++++++++-------------------- 3 files changed, 25 insertions(+), 24 deletions(-) create mode 100644 build_and_run_remedy.bat diff --git a/build_and_run_remedy.bat b/build_and_run_remedy.bat new file mode 100644 index 0000000..73a550c --- /dev/null +++ b/build_and_run_remedy.bat @@ -0,0 +1,5 @@ +@echo off + +START /B remedybg.exe stop-debugging +call build_desktop_debug.bat +remedybg.exe start-debugging diff --git a/build_desktop_debug.bat b/build_desktop_debug.bat index cd07974..27987cf 100644 --- a/build_desktop_debug.bat +++ b/build_desktop_debug.bat @@ -3,13 +3,11 @@ @REM https://learn.microsoft.com/en-us/cpp/build/reference/compiler-options-listed-by-category?view=msvc-170 -START /B remedybg.exe stop-debugging if "%1" == "codegen" ( call run_codegen.bat || goto :error ) else ( echo NOT RUNNING CODEGEN ) -cl /diagnostics:caret /DDEVTOOLS /Igen /Ithirdparty /W3 /Zi /WX Dbghelp.lib main.c || goto :error -@REM zig cc -DDEVTOOLS -Igen -Ithirdparty -lDbghelp -lGdi32 -lD3D11 -lOle32 -gfull -gcodeview -o main.exe main.c || goto :error +@REM cl /diagnostics:caret /DDEVTOOLS /Igen /Ithirdparty /W3 /Zi /WX Dbghelp.lib main.c || goto :error +zig cc -DDEVTOOLS -Igen -Ithirdparty -lDbghelp -lGdi32 -lD3D11 -lOle32 -gfull -gcodeview -o main.exe main.c || goto :error @REM cl /Igen /Ithirdparty /W3 /Zi /WX main.c || goto :error -remedybg.exe start-debugging goto :EOF :error diff --git a/run_codegen.bat b/run_codegen.bat index d974a15..10ae643 100644 --- a/run_codegen.bat +++ b/run_codegen.bat @@ -2,30 +2,27 @@ echo Running codegen... -echo Asset packs which must be bought and unzipped into root directory before running this script: -echo https://rafaelmatos.itch.io/epic-rpg-world-pack-ancient-ruins -echo https://sventhole.itch.io/undead-pixel-art-characters -echo https://immunitys.itch.io/fm32x32 -echo You must also get access to the rpgpt_private_assets megasync folder from creikey, and put it in this repo under that exact filename. Contact him for access - +echo To build the game right now you must also get access to the rpgpt_private_assets megasync folder from creikey, and put it in this repo under that exact folder name. Use megasync to have it automatically update with the master of the repo. Contact him for access +echo Unfortunately this does mean you're a little boned when you check out to an old build that has different assets. We need to do something about this. rmdir /S /q assets\copyrighted mkdir assets\copyrighted @echo on -copy "EPIC RPG World Pack - Ancient Ruins V 1.7\EPIC RPG World Pack - Ancient Ruins V 1.7\Characters\NPC Merchant-idle.png" "assets\copyrighted\merchant.png" || goto :error -copy "EPIC RPG World Pack - Ancient Ruins V 1.7\EPIC RPG World Pack - Ancient Ruins V 1.7\Tilesets\wall-1 - 3 tiles tall.png" "assets\copyrighted\wall-1 - 3 tiles tall.png" || goto :error -copy "EPIC RPG World Pack - Ancient Ruins V 1.7\EPIC RPG World Pack - Ancient Ruins V 1.7\Tilesets\Tileset-Animated Terrains-16 frames.png" "assets\copyrighted\animated_terrain.png" || goto :error -copy "EPIC RPG World Pack - Ancient Ruins V 1.7\EPIC RPG World Pack - Ancient Ruins V 1.7\TiledMap Editor\Ancient Ruins-Animated Terrains-16 frames.tsx" "assets\copyrighted\ruins_animated.tsx" || goto :error -copy "EPIC RPG World Pack - Ancient Ruins V 1.7\EPIC RPG World Pack - Ancient Ruins V 1.7\TiledMap Editor\Terrain - Ancient Ruins.tsx" "assets\copyrighted\ruins_ancient.tsx" || goto :error -copy "EPIC RPG World Pack - Ancient Ruins V 1.7\EPIC RPG World Pack - Ancient Ruins V 1.7\Tilesets\Tileset-Terrain.png" "assets\copyrighted\ruins_ancient.png" || goto :error -copy "EPIC RPG World Pack - Ancient Ruins V 1.7\EPIC RPG World Pack - Ancient Ruins V 1.7\Props\Atlas-Props.png" "assets\copyrighted\props.png" || goto :error -copy "EPIC RPG World Pack - Ancient Ruins V 1.7\EPIC RPG World Pack - Ancient Ruins V 1.7\Characters\Moose\moose1-all animations-347x192.png" "assets\copyrighted\moose.png" || goto :error -copy "Undead - Pixel Art Characters\Undead - Pixel Art Characters\Sprites\Wraith_Red.png" "assets\copyrighted\wraith.png" || goto :error -copy "Undead - Pixel Art Characters\Undead - Pixel Art Characters\Sprites\Skeleton_Blue.png" "assets\copyrighted\skeleton.png" || goto :error +copy "rpgpt_private_assets\EPIC RPG World Pack - Ancient Ruins V 1.7\EPIC RPG World Pack - Ancient Ruins V 1.7\Characters\NPC Merchant-idle.png" "assets\copyrighted\merchant.png" || goto :error +copy "rpgpt_private_assets\EPIC RPG World Pack - Ancient Ruins V 1.7\EPIC RPG World Pack - Ancient Ruins V 1.7\Tilesets\wall-1 - 3 tiles tall.png" "assets\copyrighted\wall-1 - 3 tiles tall.png" || goto :error +copy "rpgpt_private_assets\EPIC RPG World Pack - Ancient Ruins V 1.7\EPIC RPG World Pack - Ancient Ruins V 1.7\Tilesets\Tileset-Animated Terrains-16 frames.png" "assets\copyrighted\animated_terrain.png" || goto :error +copy "rpgpt_private_assets\EPIC RPG World Pack - Ancient Ruins V 1.7\EPIC RPG World Pack - Ancient Ruins V 1.7\TiledMap Editor\Ancient Ruins-Animated Terrains-16 frames.tsx" "assets\copyrighted\ruins_animated.tsx" || goto :error +copy "rpgpt_private_assets\EPIC RPG World Pack - Ancient Ruins V 1.7\EPIC RPG World Pack - Ancient Ruins V 1.7\TiledMap Editor\Terrain - Ancient Ruins.tsx" "assets\copyrighted\ruins_ancient.tsx" || goto :error +copy "rpgpt_private_assets\EPIC RPG World Pack - Ancient Ruins V 1.7\EPIC RPG World Pack - Ancient Ruins V 1.7\Tilesets\Tileset-Terrain.png" "assets\copyrighted\ruins_ancient.png" || goto :error +copy "rpgpt_private_assets\EPIC RPG World Pack - Ancient Ruins V 1.7\EPIC RPG World Pack - Ancient Ruins V 1.7\Props\Atlas-Props.png" "assets\copyrighted\props.png" || goto :error +copy "rpgpt_private_assets\EPIC RPG World Pack - Ancient Ruins V 1.7\EPIC RPG World Pack - Ancient Ruins V 1.7\Characters\Moose\moose1-all animations-347x192.png" "assets\copyrighted\moose.png" || goto :error +copy "rpgpt_private_assets\Undead - Pixel Art Characters\Undead - Pixel Art Characters\Sprites\Wraith_Red.png" "assets\copyrighted\wraith.png" || goto :error +copy "rpgpt_private_assets\Undead - Pixel Art Characters\Undead - Pixel Art Characters\Sprites\Skeleton_Blue.png" "assets\copyrighted\skeleton.png" || goto :error copy "rpgpt_private_assets\props_modified.png" "assets\copyrighted\Props.png" || goto :error -copy "ForgottenMemories\TileSet.png" "assets\copyrighted\TileSet.png" || goto :error -copy "ForgottenMemories\Trees.png" "assets\copyrighted\Trees.png" || goto :error -copy "ForgottenMemories\WaterTiles-6frames.png" "assets\copyrighted\WaterTiles-6frames.png" || goto :error +copy "rpgpt_private_assets\ForgottenMemories\TileSet.png" "assets\copyrighted\TileSet.png" || goto :error +copy "rpgpt_private_assets\ForgottenMemories\Trees.png" "assets\copyrighted\Trees.png" || goto :error +copy "rpgpt_private_assets\ForgottenMemories\WaterTiles-6frames.png" "assets\copyrighted\WaterTiles-6frames.png" || goto :error + copy "rpgpt_private_assets\knight_idle.png" "assets\copyrighted\knight_idle.png" || goto :error copy "rpgpt_private_assets\knight_attack.png" "assets\copyrighted\knight_attack.png" || goto :error copy "rpgpt_private_assets\knight_run_start.png" "assets\copyrighted\knight_run_start.png" || goto :error @@ -38,7 +35,8 @@ mkdir gen thirdparty\sokol-shdc.exe --input quad.glsl --output gen\quad-sapp.glsl.h --slang glsl100:hlsl5:metal_macos || goto :error @REM metadesk codegen -cl /Ithirdparty /W3 /Zi /WX codegen.c || goto :error +@REM cl /Ithirdparty /W3 /Zi /WX codegen.c || goto :error +zig -Ithirdparty -gfull -gcodeview codegen.c -o codegen.exe || goto error codegen || goto :error @REM cl /Ithirdparty /Igen /W3 /Zi /WX maketraining.c || goto :error