marko10_000
/
openclonk
forked from Mirrors/openclonk
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

c4group -t: remove destination before packing group

Günther Brammer 2011-11-02 21:33:38 +01:00
parent d709de7e73
commit cb3ae45c2f
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Makefile.am
View File

@ -705,11 +705,11 @@ CLEANFILES += $(c4groups)
pkgdata_DATA = $(c4groups)
AM_CXXFLAGS += -DOC_SYSTEM_DATA_DIR=\"${pkgdatadir}\"
%.ocg: planet/%.ocg c4group$(EXEEXT)
%.ocg: $(srcdir)/planet/%.ocg c4group$(EXEEXT)
./c4group$(EXEEXT) $< -t $@ || c4group $< -t $@
%.ocd: planet/%.ocd c4group$(EXEEXT)
%.ocd: $(srcdir)/planet/%.ocd c4group$(EXEEXT)
./c4group$(EXEEXT) $< -t $@ || c4group $< -t $@
%.ocf: planet/%.ocf c4group$(EXEEXT)
%.ocf: $(srcdir)/planet/%.ocf c4group$(EXEEXT)
./c4group$(EXEEXT) $< -t $@ || c4group $< -t $@
## windows setup.exe

5
src/c4group/c4group_ng.cpp
View File

@ -169,6 +169,11 @@ bool ProcessGroup(const char *FilenamePar)
{
fprintf(stderr, "Closing failed: %s\n", hGroup.GetError());
}
else if (!EraseItem(argv[iArg]))
{
fprintf(stderr, "Destination Clear failed\n");
break;
}
// Pack
else if (!C4Group_PackDirectoryTo(szFilename, argv[iArg]))
{