From 0b504bf48256ac441e329b585849fc42c35bfa62 Mon Sep 17 00:00:00 2001 From: westonCoder Date: Sat, 6 May 2023 18:37:00 -0500 Subject: [PATCH] Romfix and Makefile Info - Added info on how to fix a rom if having hardware issues - made the readme a little prettier with specific types of code blocks - fixed the makefile to add build dependencies to game_menu - added a make option "fix" that fixes a rom that is already made --- Makefile | 5 +++++ README.md | 28 ++++++++++++++++++++-------- 2 files changed, 25 insertions(+), 8 deletions(-) diff --git a/Makefile b/Makefile index daac6f7..ad2f05d 100644 --- a/Makefile +++ b/Makefile @@ -241,6 +241,8 @@ build/src/scene/ball_catcher.o: build/assets/models/props/combine_ball_catcher.h build/src/scene/door.o: build/assets/models/props/door_01.h build/assets/models/props/door_02.h +build/src/menu/game_menu.o: build/src/audio/clips.h build/assets/materials/ui.h build/assets/materials/images.h build/assets/test_chambers/test_chamber_00/test_chamber_00.h + build/src/menu/main_menu.o: build/src/audio/clips.h build/assets/materials/ui.h build/assets/materials/images.h build/assets/test_chambers/test_chamber_00/test_chamber_00.h build/src/menu/new_game_menu.o: build/src/audio/clips.h build/assets/materials/ui.h build/assets/materials/images.h build/assets/test_chambers/test_chamber_00/test_chamber_00.h @@ -420,4 +422,7 @@ $(BASE_TARGET_NAME)_debug.z64: $(CODESEGMENT)_debug.o $(OBJECTS) $(DATA_OBJECTS) clean: rm -rf build +fix: + wine tools/romfix64.exe build/portal.z64 + .SECONDARY: diff --git a/README.md b/README.md index f3bc455..8fa2e07 100644 --- a/README.md +++ b/README.md @@ -9,26 +9,26 @@ First, you will need to setup [Modern SDK](https://crashoveride95.github.io/n64h After installing modern sdk you will want to also install -``` +```sh sudo apt install libnustd ``` Next, you will need to download Blender 3.0 or higher. Then set the environment variable `BLENDER_3_0` to be the absolute path where the Blender executable is located on your system. -``` +```sh sudo apt install blender ``` e.g. add this to your ~/.bashrc -``` +```bash export BLENDER_3_0="/usr/bin/blender" ```
You will need to install Python `vpk`. -``` +```sh pip install vpk ``` @@ -46,7 +46,7 @@ sudo apt install vtf2png sfz2n64 mpg123 sox imagemagick Install lua5.4 (remove other perhaps installed versions first, skelatool64 needs to be build with luac 5.4!) -``` +```sh sudo apt install lua5.4 liblua5.4-dev liblua5.4-0 ``` @@ -54,7 +54,7 @@ sudo apt install lua5.4 liblua5.4-dev liblua5.4-0 Setup and build skelatool64 (the version included in this portal64 repo!) -``` +```sh cd skelatool64 ./setup_dependencies.sh make @@ -64,7 +64,7 @@ make You will need to install nodejs. You can use apt for this -``` +```sh sudo apt install nodejs ``` @@ -87,6 +87,18 @@ hl2/hl2_sound_misc_dir.vpk ``` Finally, run `make` to build the project. +```sh +# Clean out any previous build files +make clean + +# Build +make + +# In case you have any trouble with ROM running on hardware try +# wine install required to run properly +sudo apt install wine +make fix +```
@@ -95,7 +107,7 @@ Finally, run `make` to build the project. Build the Docker image. -``` +```sh docker build . -t portal64 ```