Merge branch 'master' of https://github.com/MagickaBBS/MagickaBBS
This commit is contained in:
commit
1a2048f41b
3
Makefile
3
Makefile
@ -1,5 +1,8 @@
|
|||||||
OS := $(shell uname -s)
|
OS := $(shell uname -s)
|
||||||
|
|
||||||
|
ifeq ($(OS), DragonFly)
|
||||||
|
MAKEFILE=Makefile.freebsd
|
||||||
|
endif
|
||||||
ifeq ($(OS), FreeBSD)
|
ifeq ($(OS), FreeBSD)
|
||||||
MAKEFILE=Makefile.freebsd
|
MAKEFILE=Makefile.freebsd
|
||||||
endif
|
endif
|
||||||
|
@ -8,7 +8,7 @@
|
|||||||
#include <b64/cdecode.h>
|
#include <b64/cdecode.h>
|
||||||
#include <sys/socket.h>
|
#include <sys/socket.h>
|
||||||
#include <arpa/inet.h>
|
#include <arpa/inet.h>
|
||||||
#ifdef __FreeBSD__
|
#if defined(__FreeBSD__) || defined(__DragonFly__)
|
||||||
#include <netinet/in.h>
|
#include <netinet/in.h>
|
||||||
#endif
|
#endif
|
||||||
#include "bbs.h"
|
#include "bbs.h"
|
||||||
|
@ -5,6 +5,11 @@ ifeq ($(OS), FreeBSD)
|
|||||||
CFLAGS=-I/usr/local/include
|
CFLAGS=-I/usr/local/include
|
||||||
LDFLAGS=-L/usr/local/lib
|
LDFLAGS=-L/usr/local/lib
|
||||||
endif
|
endif
|
||||||
|
ifeq ($(OS), DragonFly)
|
||||||
|
CC=cc
|
||||||
|
CFLAGS=-I/usr/local/include -I/usr/local/include/ncurses
|
||||||
|
LDFLAGS=-L/usr/local/lib
|
||||||
|
endif
|
||||||
ifeq ($(OS), NetBSD)
|
ifeq ($(OS), NetBSD)
|
||||||
CC=cc
|
CC=cc
|
||||||
CFLAGS=-I/usr/pkg/include
|
CFLAGS=-I/usr/pkg/include
|
||||||
@ -23,7 +28,6 @@ endif
|
|||||||
|
|
||||||
|
|
||||||
CC=cc
|
CC=cc
|
||||||
CFLAGS=-I/usr/local/include
|
|
||||||
DEPS = fileapprove.c
|
DEPS = fileapprove.c
|
||||||
|
|
||||||
OBJ = fileapprove.o
|
OBJ = fileapprove.o
|
||||||
|
@ -5,6 +5,11 @@ ifeq ($(OS), FreeBSD)
|
|||||||
CFLAGS=-I/usr/local/include
|
CFLAGS=-I/usr/local/include
|
||||||
LDFLAGS=-L/usr/local/lib
|
LDFLAGS=-L/usr/local/lib
|
||||||
endif
|
endif
|
||||||
|
ifeq ($(OS), DragonFly)
|
||||||
|
CC=cc
|
||||||
|
CFLAGS=-I/usr/local/include
|
||||||
|
LDFLAGS=-L/usr/local/lib
|
||||||
|
endif
|
||||||
ifeq ($(OS), NetBSD)
|
ifeq ($(OS), NetBSD)
|
||||||
CC=cc
|
CC=cc
|
||||||
CFLAGS=-I/usr/pkg/include
|
CFLAGS=-I/usr/pkg/include
|
||||||
|
@ -40,7 +40,7 @@ MBOBJS = $(MBOBJS_MSG) $(MBOBJS_JAM) $(MBOBJS_SQ3)
|
|||||||
DEFS = $(PLATFORMDEF) $(MBDEFS) $(NLDEFS)
|
DEFS = $(PLATFORMDEF) $(MBDEFS) $(NLDEFS)
|
||||||
|
|
||||||
# Commands
|
# Commands
|
||||||
ifeq ($(OS), FreeBSD)
|
ifeq ($(OS), $(filter $(OS), FreeBSD DragonFly))
|
||||||
CC = cc $(CPPFLAGS) $(CFLAGS) $(DEFS) $(LDFLAGS) -L/usr/local/lib -I $(INCDIR) -I ../../../deps/ -I/usr/local/include -Wall
|
CC = cc $(CPPFLAGS) $(CFLAGS) $(DEFS) $(LDFLAGS) -L/usr/local/lib -I $(INCDIR) -I ../../../deps/ -I/usr/local/include -Wall
|
||||||
else
|
else
|
||||||
CC = gcc $(CPPFLAGS) $(CFLAGS) $(DEFS) $(LDFLAGS) -I $(INCDIR) -I ../../../deps/ -Wall
|
CC = gcc $(CPPFLAGS) $(CFLAGS) $(DEFS) $(LDFLAGS) -I $(INCDIR) -I ../../../deps/ -Wall
|
||||||
|
@ -1,38 +1,43 @@
|
|||||||
OS := $(shell uname -s)
|
OS := $(shell uname -s)
|
||||||
|
|
||||||
ifeq ($(OS), FreeBSD)
|
ifeq ($(OS), FreeBSD)
|
||||||
CC=cc
|
CC=cc
|
||||||
CFLAGS=-I/usr/local/include
|
CFLAGS=-I/usr/local/include
|
||||||
LDFLAGS=-L/usr/local/lib
|
LDFLAGS=-L/usr/local/lib
|
||||||
endif
|
endif
|
||||||
ifeq ($(OS), NetBSD)
|
ifeq ($(OS), DragonFly)
|
||||||
CC=cc
|
CC=cc
|
||||||
CFLAGS=-I/usr/pkg/include
|
CFLAGS=-I/usr/local/include
|
||||||
LDFLAGS=-R/usr/pkg/lib -L/usr/pkg/lib
|
LDFLAGS=-L/usr/local/lib
|
||||||
endif
|
endif
|
||||||
ifeq ($(OS), Linux)
|
ifeq ($(OS), NetBSD)
|
||||||
CC=gcc
|
CC=cc
|
||||||
CFLAGS=
|
CFLAGS=-I/usr/pkg/include
|
||||||
LDFLAGS=
|
LDFLAGS=-R/usr/pkg/lib -L/usr/pkg/lib
|
||||||
endif
|
endif
|
||||||
ifeq ($(OS), Darwin)
|
ifeq ($(OS), Linux)
|
||||||
CC=cc
|
CC=gcc
|
||||||
CFLAGS=
|
CFLAGS=
|
||||||
LDFLAGS=
|
LDFLAGS=
|
||||||
endif
|
endif
|
||||||
|
ifeq ($(OS), Darwin)
|
||||||
|
CC=cc
|
||||||
DEPS = ticproc.c
|
CFLAGS=
|
||||||
|
LDFLAGS=
|
||||||
OBJ = ticproc.o ../../src/inih/ini.o crc32.o
|
endif
|
||||||
%.o: %.c $(DEPS)
|
|
||||||
$(CC) -c -o $@ $< $(CFLAGS)
|
|
||||||
|
DEPS = ticproc.c
|
||||||
|
|
||||||
ticproc: $(OBJ)
|
OBJ = ticproc.o ../../src/inih/ini.o crc32.o
|
||||||
$(CC) -o ticproc $^ $(CFLAGS) $(LDFLAGS) -lsqlite3
|
%.o: %.c $(DEPS)
|
||||||
|
$(CC) -c -o $@ $< $(CFLAGS)
|
||||||
.PHONY: clean
|
|
||||||
|
|
||||||
clean:
|
ticproc: $(OBJ)
|
||||||
rm -f $(OBJ) ticproc
|
$(CC) -o ticproc $^ $(CFLAGS) $(LDFLAGS) -lsqlite3
|
||||||
|
|
||||||
|
.PHONY: clean
|
||||||
|
|
||||||
|
clean:
|
||||||
|
rm -f $(OBJ) ticproc
|
||||||
|
Reference in New Issue
Block a user