Merge pull request #557 from hackgrid/fix-make-7
fixup skelatool64 build and clean
This commit is contained in:
commit
37769b2916
5
Makefile
5
Makefile
|
@ -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
|
||||
|
|
|
@ -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:
|
||||
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Reference in a new issue