Skip to content

Commit

Permalink
Merge pull request #23 from bmwiedemann/nopak
Browse files Browse the repository at this point in the history
Allow to install data files without .pak
  • Loading branch information
riksweeney committed Aug 9, 2017
2 parents 21f7d6c + fc18fbc commit 27f2d2c
Showing 1 changed file with 3 additions and 5 deletions.
8 changes: 3 additions & 5 deletions makefile
Original file line number Diff line number Diff line change
Expand Up @@ -147,11 +147,7 @@ install: all
ifeq ($(DEV),1)
echo Cannot install if DEV is set to 1!
else
ifndef NO_PAK
./$(PAK_PROG) data gfx music sound font $(PAK_FILE)
./$(PAK_PROG) -test $(PAK_FILE)
endif

$(MAKE) buildpak
mkdir -p $(BIN_DIR)
mkdir -p $(DATA_DIR)
mkdir -p $(DOC_DIR)
Expand All @@ -166,6 +162,8 @@ endif
cp $(PROG) $(BIN_DIR)$(PROG)
ifndef NO_PAK
cp $(PAK_FILE) $(DATA_DIR)$(PAK_FILE)
else
cp -a data gfx music sound font $(DATA_DIR)
endif
cp $(DOCS) $(DOC_DIR)
cp $(ICONS)16x16.png $(ICON_DIR)16x16/apps/$(PROG).png
Expand Down

0 comments on commit 27f2d2c

Please sign in to comment.