(svn r2882) Some fixes for MorphOS (by tokai)

- Don't track dependencies on system headers
- Add an include path
- Silence a warning regarding a bad signal prototype
- Remove executable flag from pictures
- Add proper OTTD icon

5 files changed, 8 insertions, 4 deletions

diff --git a/Makefile b/Makefile
index 731330fd8..9f298c38c 100644
--- a/Makefile
+++ b/Makefile
@@ -332,7 +332,7 @@ ifdef OSX
 BASECFLAGS += -O3 -funroll-loops -fsched-interblock -falign-loops=16 -falign-jumps=16 -falign-functions=16 -falign-jumps-max-skip=15 -falign-loops-max-skip=15 -mdynamic-no-pic -mpowerpc-gpopt -force_cpusubtype_ALL
 else
 ifdef MORPHOS
-BASECFLAGS += -O2 -noixemul -fstrict-aliasing -fexpensive-optimizations
+BASECFLAGS += -I/gg/os-include -O2 -noixemul -fstrict-aliasing -fexpensive-optimizations
 BASECFLAGS += -mcpu=604 -fno-inline -mstring -mmultiple
 else
 BASECFLAGS += -O2
@@ -1002,15 +1002,15 @@ endif
 
 .deps/%.d: %.c $(MAKE_CONFIG) table/strings.h endian_target.h
 	@echo '===> Determining dependencies of $<'
-	$(Q)$(CC) $(CFLAGS) $(CDEFS) -M $< > $@
+	$(Q)$(CC) $(CFLAGS) $(CDEFS) -MM $< > $@
 
 .deps/%.d: %.cpp $(MAKE_CONFIG) table/strings.h endian_target.h
 	@echo '===> Determining dependencies of $<'
-	$(Q)$(CXX) $(CFLAGS) $(CDEFS) -M $< > $@
+	$(Q)$(CXX) $(CFLAGS) $(CDEFS) -MM $< > $@
 
 .deps/%.d: %.m $(MAKE_CONFIG) table/strings.h endian_target.h
 	@echo '===> Determining dependencies of $<'
-	$(Q)$(CC) $(CFLAGS) $(CDEFS) -M $< > $@
+	$(Q)$(CC) $(CFLAGS) $(CDEFS) -MM $< > $@
 
 
 %.o: %.c $(MAKE_CONFIG)
diff --git a/os/morphos/icons/OpenTTD.info b/os/morphos/icons/OpenTTD.info
index fd6cafa49..3a25be683 100755..100644
--- a/os/morphos/icons/OpenTTD.info
+++ b/os/morphos/icons/OpenTTD.info
diff --git a/os/morphos/icons/docs.info b/os/morphos/icons/docs.info
index 6f8ac00f2..6f8ac00f2 100755..100644
--- a/os/morphos/icons/docs.info
+++ b/os/morphos/icons/docs.info
diff --git a/os/morphos/icons/drawer.info b/os/morphos/icons/drawer.info
index 149ef7e10..149ef7e10 100755..100644
--- a/os/morphos/icons/drawer.info
+++ b/os/morphos/icons/drawer.info
diff --git a/unix.c b/unix.c
index ee478fbcc..16c79988d 100644
--- a/unix.c
+++ b/unix.c
@@ -31,6 +31,10 @@
 #ifdef __MORPHOS__
 #include <exec/types.h>
 ULONG __stack = (1024*1024)*2; // maybe not that much is needed actually ;)
+
+// The system supplied definition of SIG_IGN does not match
+#undef SIG_IGN
+#define SIG_IGN (void (*)(int))1
 #endif /* __MORPHOS__ */
 
 #ifdef __AMIGA__