Archive/Portal64
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Merge pull request #557 from hackgrid/fix-make-7

Browse source 
fixup skelatool64 build and clean
This commit is contained in:
lambertjamesd 2023-12-13 08:53:50 -07:00 committed by GitHub
parent 2fd1c8efbf f536179e59
commit 37769b2916
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
Makefile
View file

@ -69,11 +69,12 @@ LDFLAGS = -L/usr/lib/n64 $(N64LIB) -L$(N64_LIBGCCDIR) -lgcc
default: english_audio
english_audio: build/src/audio/subtitles.h portal_pak_dir
english_audio: build/src/audio/subtitles.h portal_pak_dir $(SKELATOOL64)
@$(MAKE) -C skelatool64
@$(MAKE) buildgame
all_languages: build/src/audio/subtitles.h portal_pak_dir german_audio french_audio russian_audio spanish_audio
all_languages: build/src/audio/subtitles.h portal_pak_dir german_audio french_audio russian_audio spanish_audio $(SKELATOOL64)
@$(MAKE) -C skelatool64
@$(MAKE) buildgame
german_audio: vpk/portal_sound_vo_german_dir.vpk vpk/portal_sound_vo_german_000.vpk portal_pak_dir

5
skelatool64/makefile
View file

@ -34,7 +34,10 @@ skeletool64: $(OBJ_FILES) $(LUA_OBJ_FILES)
clean:
rm -rf build/
rm -f skeletool64
rm -f CImg_*
rm -f *.zip*
rm -rf CImg-*
rm -rf cimg
@$(MAKE) -C yaml-cpp clean
init:

5
skelatool64/setup_dependencies.sh
View file

@ -9,8 +9,9 @@ git clone https://github.com/jbeder/yaml-cpp.git
cmake -S yaml-cpp -B yaml-cpp
make -C yaml-cpp
wget http://cimg.eu/files/CImg_3.1.3.zip
unzip CImg_3.1.3.zip
wget -O CImg_3.1.3.zip http://cimg.eu/files/CImg_3.1.3.zip
unzip -o CImg_3.1.3.zip
rm -rf cimg
mv CImg-3.1.3 cimg
popd