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

Merge pull request #552 from hackgrid/docker-3

Browse source 
Update Makefile.docker from recent Makefile changes
This commit is contained in:
lambertjamesd 2023-12-12 09:09:12 -07:00 committed by GitHub
parent a9fdba3859 6444b3bef2
commit c966395429
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
Makefile
View file

@ -570,12 +570,11 @@ $(BASE_TARGET_NAME)_debug.z64: $(CODESEGMENT)_debug.o $(OBJECTS) $(DATA_OBJECTS)
makemask $(BASE_TARGET_NAME)_debug.z64 makemask $(BASE_TARGET_NAME)_debug.z64
clean: clean:
rm -rf skelatool64/build
rm -rf build rm -rf build
rm -rf portal_pak_dir rm -rf portal_pak_dir
rm -rf portal_pak_modified rm -rf portal_pak_modified
rm -rf assets/locales rm -rf assets/locales
rm -f skelatool64/skeletool64 @$(MAKE) -C skelatool64 clean
clean-src: clean-src:
rm -rf build/src rm -rf build/src

23
Makefile.docker
View file

@ -1,35 +1,32 @@
all: all:
docker run -v $$PWD:/usr/src/app -it portal64 make docker run --rm -v $$PWD:/usr/src/app -it portal64 make
image: image:
docker build -t portal64 . docker build -t portal64 .
convert_all_png: convert_all_png:
docker run -v $$PWD:/usr/src/app -it portal64 make convert_all_png docker run --rm -v $$PWD:/usr/src/app -it portal64 make convert_all_png
bash: bash:
docker run -v $$PWD:/usr/src/app -it portal64 bash docker run --rm -v $$PWD:/usr/src/app -it portal64 bash
clean: clean:
sudo rm -rf build sudo make clean
sudo rm -rf portal_pak_dir
sudo rm -rf portal_pak_modified
sudo rm -rf assets/locales/
english_audio: english_audio:
docker run -v $$PWD:/usr/src/app -it portal64 make english_audio docker run --rm -v $$PWD:/usr/src/app -it portal64 make english_audio
all_languages: all_languages:
docker run -v $$PWD:/usr/src/app -it portal64 make all_languages docker run --rm -v $$PWD:/usr/src/app -it portal64 make all_languages
german_audio: german_audio:
docker run -v $$PWD:/usr/src/app -it portal64 make german_audio docker run --rm -v $$PWD:/usr/src/app -it portal64 make german_audio
french_audio: french_audio:
docker run -v $$PWD:/usr/src/app -it portal64 make french_audio docker run --rm -v $$PWD:/usr/src/app -it portal64 make french_audio
russian_audio: russian_audio:
docker run -v $$PWD:/usr/src/app -it portal64 make russian_audio docker run --rm -v $$PWD:/usr/src/app -it portal64 make russian_audio
spanish_audio: spanish_audio:
docker run -v $$PWD:/usr/src/app -it portal64 make spanish_audio docker run --rm -v $$PWD:/usr/src/app -it portal64 make spanish_audio