From 5671297542ef52187c6b84d620bc4165c64973ae Mon Sep 17 00:00:00 2001 From: Adrien Destugues Date: Mon, 16 Nov 2009 21:59:05 +0000 Subject: [PATCH] -Build "fix" for morphos -Makefile fix for linux. This one should work ok on linux and windows as it did before, but not on amiga. The amiga packing procedure is quite different anyway, so I think that's ok. git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@1207 416bcca6-2ee7-4201-b75f-2eb2f807beb1 --- Makefile | 2 +- filesel.c | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 7d6c4003..b5dea727 100644 --- a/Makefile +++ b/Makefile @@ -338,7 +338,7 @@ release : version $(BIN) # Create a zip archive ready for upload to the website, including binaries and sourcecode ziprelease: version $(BIN) release - echo `sed "s/.*=\"\\\(.*\\\)\";/\1/" pversion.c`.`svnversion` | tr " :" "_-" | sed -e "s/\\\(wip\\\)\\\\./\\1/I" > $(OBJDIR)/versiontag + echo `sed "s/.*=\"\(.*\)\";/\1/" pversion.c`.`svnversion` | tr " :" "_-" | sed -e "s/\(wip\)\\./\1/I" > $(OBJDIR)/versiontag tar cvzf "src-`cat $(OBJDIR)/versiontag`.tgz" --transform 's,^,src/,g' *.c *.h Makefile Makefile.dep gfx2.ico $(ZIP) $(ZIPOPT) "grafx2-`cat $(OBJDIR)/versiontag`$(TTFLABEL)-$(PLATFORM).$(ZIP)" $(BIN) gfx2def.ini scripts/test.lua $(SKIN_FILES) gfx2.gif doc/README.txt doc/COMPILING.txt doc/gpl-2.0.txt fonts/8pxfont.png doc/README-zlib1.txt doc/README-SDL.txt doc/README-SDL_image.txt doc/README-SDL_ttf.txt doc/README-lua.txt fonts/Tuffy.ttf src-`cat $(OBJDIR)/versiontag`.tgz $(PLATFORMFILES) diff --git a/filesel.c b/filesel.c index 1c12bb87..1a7457b8 100644 --- a/filesel.c +++ b/filesel.c @@ -1238,7 +1238,11 @@ byte Button_Load_or_Save(byte load, byte image) temp=(!remove(Main_filename)); else // Si c'est un repertoire // On efface le repertoire (si on peut) +#if defined(__MORPHOS__) + #warning rmdir does not exist ! Please fix this ! +#else temp=(!rmdir(Main_filename)); +#endif if (temp) // temp indique si l'effacement s'est bien passé {