Haiku Support

Hope I didn't break things!

utils/dosbox_shim/Makefile

@@ -35,6 +35,11 @@ ifeq ($(OS), SunOS)
   CFLAGS=
   LDFLAGS=-lsocket
 endif
+ifeq ($(OS), Haiku)
+  CC=gcc
+  CFLAGS=
+  LDFLAGS=-lnetwork
+endif
 
 DEPS = main.c
 

utils/dosbox_shim/main.c

@@ -6,7 +6,7 @@
 #include <netinet/in.h>
 #include <arpa/inet.h>
 #include <sys/types.h>
-#if defined(__OpenBSD__)
+#if defined(__OpenBSD__) || defined(__HAIKU__)
 #  include <sys/select.h>
 #endif
 
@@ -119,4 +119,4 @@ int main(int argc, char **argv) {
             }
         }
     }
-}
+}

utils/filecenter/Makefile

@@ -39,7 +39,11 @@ ifeq ($(OS), SunOS)
   CFLAGS=
   LDFLAGS=-lsqlite3 -lcurses
 endif
-
+ifeq ($(OS), Haiku)
+  CC=gcc
+  CFLAGS=
+  LDFLAGS=-lsqlite3 -lncurses
+endif
 DEPS = main.c
 
 OBJ = main.o

utils/magichat/GNUmakefile

@@ -8,6 +8,10 @@ OS = $(shell uname -s)
 ifeq ($(OS), SunOS)
 	EXTRA_LIBS = -lsocket
 endif
+
+ifeq ($(OS), Haiku)
+	EXTRA_LIBS = -lnetwork
+endif
 %.o: %.c $(DEPS)
 	$(CC) -c -o $@ $< $(CFLAGS)
 

utils/magichat/main.c

@@ -7,7 +7,7 @@
 #include <netinet/in.h>
 #include <arpa/inet.h>
 #include <netdb.h>
-#if defined(__OpenBSD__)
+#if defined(__OpenBSD__) || defined(__HAIKU__)
 #  include <sys/select.h>
 #endif
 #include "../../deps/jsmn/jsmn.h"

utils/magiedit/GNUmakefile

@@ -8,6 +8,10 @@ ifeq ($(OS), SunOS)
 	EXTRA_LIBS = -lsocket
 endif
 
+ifeq ($(OS), Haiku)
+	EXTRA_LIBS = -lnetwork
+endif
+
 OBJ = main.o
 
 all: magiedit

utils/magiftpd/Makefile

@@ -35,6 +35,12 @@ ifeq ($(OS), SunOS)
   CFLAGS=
   LDFLAGS=-lsqlite3 -lcrypto -lsocket -lnsl
 endif
+ifeq ($(OS), Haiku)
+  CC=gcc
+  CFLAGS=
+  LDFLAGS=-lsqlite3 -lcrypto -lnetwork
+endif
+
 
 DEPS = magiftpd.c
 

utils/magimail/src/Makefile.linux

@@ -30,19 +30,20 @@ MBOBJS_MSG = obj/mb_msg.o
 MBDEFS_JAM = -DMSGBASE_JAM
 MBOBJS_JAM = $(OBJDIR)/mb_jam.o $(JAMLIB)
 
-MBDEFS_SQ3 = -DMSGBASE_SQ3
-MBOBJS_SQ3 = $(OBJDIR)/mb_sq3.o
-
 # Sum them up. Only include the messagebases you want to use
-MBDEFS = $(MBDEFS_MSG) $(MBDEFS_JAM) $(MBDEFS_SQ3)
-MBOBJS = $(MBOBJS_MSG) $(MBOBJS_JAM) $(MBOBJS_SQ3)
+MBDEFS = $(MBDEFS_MSG) $(MBDEFS_JAM) 
+MBOBJS = $(MBOBJS_MSG) $(MBOBJS_JAM) 
 
 DEFS = $(PLATFORMDEF) $(MBDEFS) $(NLDEFS)
 
 ifeq ($(OS), SunOS)
   SLIBS = -lsocket -lnsl
 else
-  SLIBS =
+	ifeq ($(OS), Haiku)
+		SLIBS = -lnetwork
+	else
+		SLIBS =
+	endif
 endif
 
 # Commands
@@ -94,7 +95,7 @@ files :  $(BINDIR)/magimail$(EXESUFFIX) \
 			$(BINDIR)/magilistout$(EXESUFFIX)
 
 $(BINDIR)/magimail$(EXESUFFIX) : $(CMOBJS) $(SHOBJS) $(NLOBJS) $(MBOBJS) $(OSLIB)
-	$(CC) -o $(BINDIR)/magimail$(EXESUFFIX) $(CMOBJS) $(SHOBJS) $(NLOBJS) $(MBOBJS) $(OSLIB) -lsqlite3 $(SLIBS)
+	$(CC) -o $(BINDIR)/magimail$(EXESUFFIX) $(CMOBJS) $(SHOBJS) $(NLOBJS) $(MBOBJS) $(OSLIB) $(SLIBS)
 	$(STRIP) $(BINDIR)/magimail$(EXESUFFIX)
 
 $(BINDIR)/magistats$(EXESUFFIX) : tools/magistats.c $(SHOBJS) $(OSLIB)

utils/ticproc/Makefile

@@ -3,34 +3,38 @@ OS := $(shell uname -s)
 ifeq ($(OS), FreeBSD)
   CC=cc
   CFLAGS=-I/usr/local/include
-  LDFLAGS=-L/usr/local/lib
+  LDFLAGS=-L/usr/local/lib -lsqlite3
 endif
 ifeq ($(OS), DragonFly)
   CC=cc
   CFLAGS=-I/usr/local/include
-  LDFLAGS=-L/usr/local/lib
+  LDFLAGS=-L/usr/local/lib -lsqlite3
 endif
 ifeq ($(OS), NetBSD)
   CC=cc
   CFLAGS=-I/usr/pkg/include
-  LDFLAGS=-R/usr/pkg/lib -L/usr/pkg/lib
+  LDFLAGS=-R/usr/pkg/lib -L/usr/pkg/lib -lsqlite3
 endif
 ifeq ($(OS), OpenBSD)
   CC=cc
   CFLAGS=-I/usr/local/include
-  LDFLAGS=-L/usr/local/lib
+  LDFLAGS=-L/usr/local/lib -lsqlite3
 endif
 ifeq ($(OS), Linux)
   CC=gcc
   CFLAGS=
-  LDFLAGS=
+  LDFLAGS=-lsqlite3
 endif
 ifeq ($(OS), Darwin)
   CC=cc
   CFLAGS=
-  LDFLAGS=
+  LDFLAGS=-lsqlite3
+endif
+ifeq ($(OS), Haiku)
+  CC=gcc
+  CFLAGS=
+  LDFLAGS=-lsqlite3
 endif
-
 
 DEPS = ticproc.c
 
@@ -40,7 +44,7 @@ OBJ = ticproc.o ../../src/inih/ini.o crc32.o
 
 
 ticproc: $(OBJ)
-	$(CC) -o ticproc $^ $(CFLAGS) $(LDFLAGS) -lsqlite3
+	$(CC) -o ticproc $^ $(CFLAGS) $(LDFLAGS) 
 
 .PHONY: clean