Merge branch 'update-upstream'

Conflicts: error.c
kusma · Aug 4, 2015 · 0321013 · 0321013
2 parents 44a6b07 + fb807bf
commit 0321013
Show file tree

Hide file tree

Showing 131 changed files with 18,251 additions and 5,513 deletions.
diff --git a/Makefile b/Makefile
@@ -3,7 +3,6 @@
 TARGET =
 TARGETEXTENSION = 
 
-CC = gcc
 CCOUT = -o 
 COPTS = -c -O2 
 

diff --git a/Makefile.Haiku b/Makefile.Haiku
@@ -0,0 +1,16 @@
+# Unix
+
+TARGET =
+TARGETEXTENSION = 
+
+CC = gcc
+CCOUT = -o 
+COPTS = -c -O2 
+
+LD = $(CC)
+LDOUT = $(CCOUT)
+LDFLAGS =
+
+RM = rm -f
+
+include make.rules
diff --git a/Makefile.MiNT b/Makefile.MiNT
@@ -0,0 +1,16 @@
+# Atari TOS/MiNT
+
+TARGET = _MiNT
+TARGETEXTENSION =
+
+CC = vc +mint
+CCOUT = -o 
+COPTS = -c -c99 -cpu=68020 -O1
+
+LD = $(CC)
+LDOUT = $(CCOUT)
+LDFLAGS = -lm
+
+RM = rm -f
+
+include make.rules
diff --git a/Makefile.TOS b/Makefile.TOS
@@ -0,0 +1,16 @@
+# Atari TOS
+
+TARGET = _TOS
+TARGETEXTENSION = .ttp
+
+CC = vc +tos
+CCOUT = -o 
+COPTS = -c -c99 -O1 -DATARI
+
+LD = $(CC)
+LDOUT = $(CCOUT)
+LDFLAGS = -lm
+
+RM = rm -f
+
+include make.rules
diff --git a/Makefile.Win32FromLinux b/Makefile.Win32FromLinux
@@ -0,0 +1,20 @@
+# Windows compiled on a Linux machine with mingw
+
+TARGET = _win32
+TARGETEXTENSION = .exe
+
+
+
+CC = /usr/bin/i586-mingw32msvc-gcc
+CCOUT = -o 
+COPTS = -c -O2
+
+LD = $(CC)
+LDOUT = $(CCOUT)
+LDFLAGS = -lm
+
+RM = rm -f
+
+
+
+include make.rules