Update for 0.6alpha

This commit is contained in:
Andrew Pamment 2017-03-23 16:26:02 +10:00
parent b3ab841ca2
commit f1c4fb22db
12 changed files with 105 additions and 40 deletions

View File

@ -8,7 +8,7 @@ ODOORS = deps/odoors/libs-`uname -s`/libODoors.a
JSMN = deps/jsmn/libjsmn.a
CDK = deps/cdk-5-20161210/libcdk.a
all: magicka magimail magiedit ticproc mgpost magichat fileapprove
all: magicka magimail magiedit ticproc mgpost magichat fileapprove magiftpd
${LUA}:
cd deps/lua && $(MAKE) -f Makefile freebsd MAKEFLAGS=
@ -54,6 +54,9 @@ mgpost: $(JAMLIB)
fileapprove: $(CDK)
cd utils/fileapprove && $(MAKE)
magiftpd:
cd utils/magiftpd && $(MAKE)
.PHONY: clean
clean:
@ -69,3 +72,4 @@ clean:
cd utils/magichat && $(MAKE) clean
cd deps/cdk-5.0-20161210 && $(MAKE) clean
cd utils/fileapprove && $(MAKE) clean
cd utils/magiftpd && $(MAKE) clean

View File

@ -10,7 +10,7 @@ ODOORS = deps/odoors/libs-`uname -s`/libODoors.a
JSMN = deps/jsmn/libjsmn.a
CDK = deps/cdk-5-20161210/libcdk.a
all: magicka magimail magiedit ticproc mgpost magichat fileapprove
all: magicka magimail magiedit ticproc mgpost magichat fileapprove magiftpd
${LUA}:
cd deps/lua && $(MAKE) -f Makefile freebsd MAKEFLAGS=
@ -59,6 +59,9 @@ magichat: $(JSMN)
fileapprove: $(CDK)
cd utils/fileapprove && $(MAKE)
magiftpd:
cd utils/magiftpd && $(MAKE)
.PHONY: clean
clean:
@ -75,3 +78,4 @@ clean:
cd utils/magichat && $(MAKE) clean
cd deps/cdk-5.0-20161210 && $(MAKE) clean
cd utils/fileapprove && $(MAKE) clean
cd utils/magiftpd && $(MAKE) clean

View File

@ -8,7 +8,7 @@ ODOORS = deps/odoors/libs-`uname -s`/libODoors.a
JSMN = deps/jsmn/libjsmn.a
CDK = deps/cdk-5-20161210/libcdk.a
all: magicka magimail magiedit ticproc mgpost magichat fileapprove
all: magicka magimail magiedit ticproc mgpost magichat fileapprove magiftpd
${LUA}:
cd deps/lua && $(MAKE) -f Makefile linux MAKEFLAGS=
@ -55,6 +55,9 @@ magichat: $(JSMN)
fileapprove: $(CDK)
cd utils/fileapprove && $(MAKE)
magiftpd:
cd utils/magiftpd && $(MAKE)
.PHONY: clean
clean:
@ -70,3 +73,4 @@ clean:
cd utils/magichat && $(MAKE) clean
cd deps/cdk-5.0-20161210 && $(MAKE) clean
cd utils/fileapprove && $(MAKE) clean
cd utils/magiftpd && $(MAKE) clean

View File

@ -10,7 +10,7 @@ ODOORS = deps/odoors/libs-`uname -s`/libODoors.a
JSMN = deps/jsmn/libjsmn.a
CDK = deps/cdk-5-20161210/libcdk.a
all: magicka magimail magiedit ticproc mgpost magichat fileapprove
all: magicka magimail magiedit ticproc mgpost magichat fileapprove magiftpd
${LUA}:
cd deps/lua && $(MAKE) -f Makefile linux MAKEFLAGS=
@ -59,6 +59,9 @@ magichat: $(JSMN)
fileapprove: $(CDK)
cd utils/fileapprove && $(MAKE)
magiftpd:
cd utils/magiftpd && $(MAKE)
.PHONY: clean
clean:
@ -75,3 +78,4 @@ clean:
cd utils/magichat && $(MAKE) clean
cd deps/cdk-5.0-20161210 && $(MAKE) clean
cd utils/fileapprove && $(MAKE) clean
cd utils/magiftpd && $(MAKE) clean

View File

@ -8,7 +8,7 @@ ODOORS = deps/odoors/libs-`uname -s`/libODoors.a
JSMN = deps/jsmn/libjsmn.a
CDK = deps/cdk-5-20161210/libcdk.a
all: magicka magimail magiedit ticproc mgpost magichat fileapprove
all: magicka magimail magiedit ticproc mgpost magichat fileapprove magiftpd
${LUA}:
cd deps/lua && $(MAKE) -f Makefile bsd MAKEFLAGS=
@ -54,6 +54,9 @@ magichat: $(JSMN)
fileapprove: $(CDK)
cd utils/fileapprove && $(MAKE)
magiftpd:
cd utils/magiftpd && $(MAKE)
.PHONY: clean
clean:
@ -69,3 +72,4 @@ clean:
cd utils/magichat && $(MAKE) clean
cd deps/cdk-5.0-20161210 && $(MAKE) clean
cd utils/fileapprove && $(MAKE) clean
cd utils/magiftpd && $(MAKE) clean

View File

@ -10,7 +10,7 @@ ODOORS = deps/odoors/libs-`uname -s`/libODoors.a
JSMN = deps/jsmn/libjsmn.a
CDK = deps/cdk-5-20161210/libcdk.a
all: magicka magimail magiedit ticproc mgpost magichat fileapprove
all: magicka magimail magiedit ticproc mgpost magichat fileapprove magiftpd
${LUA}:
cd deps/lua && $(MAKE) -f Makefile bsd MAKEFLAGS=
@ -59,6 +59,9 @@ magichat: $(JSMN)
fileapprove: $(CDK)
cd utils/fileapprove && $(MAKE)
magiftpd:
cd utils/magiftpd && $(MAKE)
.PHONY: clean
clean:
@ -75,3 +78,4 @@ clean:
cd utils/magichat && $(MAKE) clean
cd deps/cdk-5.0-20161210 && $(MAKE) clean
cd utils/fileapprove && $(MAKE) clean
cd utils/magiftpd && $(MAKE) clean

View File

@ -10,7 +10,7 @@ CDK = deps/cdk-5-20161210/libcdk.a
OBJ = inih/ini.o bbs.o main.o users.o main_menu.o mail_menu.o doors.o bbs_list.o chat_system.o email.o files.o settings.o lua_glue.o strings.o bluewave.o hashmap/hashmap.o
all: magicka magimail magiedit ticproc mgpost magichat fileapprove
all: magicka magimail magiedit ticproc mgpost magichat fileapprove magiftpd
${LUA}:
cd deps/lua && $(MAKE) -f Makefile macosx MAKEFLAGS=
@ -55,6 +55,9 @@ magichat: $(JSMN)
fileapprove: $(CDK)
cd utils/fileapprove && $(MAKE)
magiftpd:
cd utils/magiftpd && $(MAKE)
.PHONY: clean
clean:
@ -70,3 +73,4 @@ clean:
cd utils/magichat && $(MAKE) clean
cd deps/cdk-5.0-20161210 && $(MAKE) clean
cd utils/fileapprove && $(MAKE) clean
cd utils/magiftpd && $(MAKE) clean

View File

@ -10,7 +10,7 @@ ODOORS = deps/odoors/libs-`uname -s`/libODoors.a
JSMN = deps/jsmn/libjsmn.a
CDK = deps/cdk-5-20161210/libcdk.a
all: magicka magimail magiedit ticproc mgpost magichat fileapprove
all: magicka magimail magiedit ticproc mgpost magichat fileapprove magiftpd
${LUA}:
cd deps/lua && $(MAKE) -f Makefile macosx MAKEFLAGS=
@ -59,6 +59,9 @@ magichat: $(JSMN)
fileapprove: $(CDK)
cd utils/fileapprove && $(MAKE)
magiftpd:
cd utils/magiftpd && $(MAKE)
.PHONY: clean
clean:
@ -74,3 +77,4 @@ clean:
cd utils/magichat && $(MAKE) clean
cd deps/cdk-5.0-20161210 && $(MAKE) clean
cd utils/fileapprove && $(MAKE) clean
cd utils/magiftpd && $(MAKE) clean

Binary file not shown.

2
bbs.h
View File

@ -12,7 +12,7 @@
#include "jamlib/jam.h"
#define VERSION_MAJOR 0
#define VERSION_MINOR 5
#define VERSION_MINOR 6
#define VERSION_STR "alpha"
#define NETWORK_FIDO 1

View File

@ -1,11 +1,9 @@
. . . .__ .__ __.
|\/| _. _ * _.;_/ _. [__)[__)(__
| |(_](_]|(_.| \(_] [__)[__).__) v0.5a
| |(_](_]|(_.| \(_] [__)[__).__) v0.6a
-------._|----------------------------------
Magicka BBS is a Free BBS System for Linux
and FreeBSD. While Still in the early stages
of development, we have most of the features
you find in modern BBS software.
Magicka BBS is a Free BBS System for Linux,
macOS, FreeBSD and NetBSD.
* FTN Network Support
* Zmodem & Long filename Support
@ -13,12 +11,9 @@ you find in modern BBS software.
* External Editor Support
* Compiles and runs on Raspberry Pi
* LUA Scripting Support
* Optional WWW server.
* Optional WWW & FTP server.
* Bluewave Support
* TIC file processor
WWIVnet Support is known not to work, and
will be removed. Don't use it!
THIS IS ALPHA SOFTWARE! Use at your own
risk!

38
utils/magiftpd/Makefile Normal file
View File

@ -0,0 +1,38 @@
OS := $(shell uname -s)
ifeq ($(OS), FreeBSD)
CC=cc
CFLAGS=-I/usr/local/include
LDFLAGS=-L/usr/local/lib
endif
ifeq ($(OS), NetBSD)
CC=cc
CFLAGS=-I/usr/pkg/include
LDFLAGS=-L/usr/pkg/lib
endif
ifeq ($(OS), Linux)
CC=gcc
CFLAGS=
LDFLAGS=
endif
ifeq ($(OS), Darwin)
CC=cc
CFLAGS=-I/opt/local/include
LDFLAGS=-L/opt/local/lib
endif
DEPS = magiftpd.c
OBJ = magiftpd.o ../../inih/ini.o
%.o: %.c $(DEPS)
$(CC) -c -o $@ $< $(CFLAGS)
ticproc: $(OBJ)
$(CC) -o magiftpd -o $@ $^ $(CFLAGS) $(LDFLAGS) -lsqlite3 -lcrypto
.PHONY: clean
clean:
rm -f $(OBJ) magiftpd