Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Allow to install data files without .pak #23

Merged
merged 2 commits into from Aug 9, 2017
Merged

Allow to install data files without .pak #23

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
66c5ce5
Allow to install data files without .pak
bmwiedemann Jul 21, 2017
fc18fbc
makefile: cleanup duplication
bmwiedemann Jul 21, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
8 changes: 3 additions & 5 deletions makefile
View file
Open in desktop
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