github.com/Interlisp.maiko
1
0
Fork 0
mirror of https://github.com/Interlisp/maiko.git synced 2026-01-22 10:21:30 +00:00
Code Issues Projects Releases Wiki Activity

Remove flags for LINUX, OPENBSD, FREEBSD, MACOSX from build system. (#261)

Browse Source 
We now can handle these via `inc/maiko/platform.h` and the
constants defined there.

This doesn't change `OS5` for Solaris yet as that's a much wider
set of changes.
This commit is contained in:
Bruce Mitchener 2021-01-21 14:38:15 +07:00 committed by GitHub
parent 164b5651b7
commit 979c3ad6be
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
13 changed files with 14 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
CMakeLists.txt
View File

@ -59,22 +59,9 @@ IF(CMAKE_SYSTEM_PROCESSOR MATCHES "arm.*" OR
)
ENDIF()
IF(CMAKE_SYSTEM_NAME STREQUAL "Darwin")
LIST(APPEND MAIKO_DEFINITIONS
"-DMACOSX"
)
ELSEIF(CMAKE_SYSTEM_NAME STREQUAL "FreeBSD")
LIST(APPEND MAIKO_DEFINITIONS
"-DFREEBSD"
)
ELSEIF(CMAKE_SYSTEM_NAME STREQUAL "OpenBSD")
LIST(APPEND MAIKO_DEFINITIONS
"-DOPENBSD"
)
ELSEIF(CMAKE_SYSTEM_NAME STREQUAL "Linux")
IF(CMAKE_SYSTEM_NAME STREQUAL "Linux")
LIST(APPEND MAIKO_DEFINITIONS
"-DAIX" # This is temporary
"-DLINUX"
)
ELSEIF(CMAKE_SYSTEM_NAME STREQUAL "SunOS")
LIST(APPEND MAIKO_DEFINITIONS

2
bin/makefile-darwin.386-x
View File

@ -21,7 +21,7 @@ OPTFLAGS = -O2 -g
DISPOPTFLAGS = -O2 -g
FPFLAGS =
DEBUGFLAGS = # -DDEBUG -DOPTRACE
DFLAGS = $(DEBUGFLAGS) -DMACOSX -DOLD_CURSOR \
DFLAGS = $(DEBUGFLAGS) -DOLD_CURSOR \
-DBYTESWAP -DLOGINT $(XFLAGS) \
-DRELEASE=351 -DSTACKCHECK -DFSBCHECK -DPCTRACE

2
bin/makefile-darwin.aarch64-x
View File

@ -21,7 +21,7 @@ OPTFLAGS = -O1 -g
DISPOPTFLAGS = -O1 -g
FPFLAGS =
DEBUGFLAGS = # -DDEBUG -DOPTRACE
DFLAGS = $(DEBUGFLAGS) -DMACOSX -DOLD_CURSOR \
DFLAGS = $(DEBUGFLAGS) -DOLD_CURSOR \
-DBYTESWAP -DLOGINT $(XFLAGS) \
-DRELEASE=351

2
bin/makefile-darwin.x86_64-x
View File

@ -21,7 +21,7 @@ OPTFLAGS = -O1 -g
DISPOPTFLAGS = -O1 -g
FPFLAGS =
DEBUGFLAGS = # -DDEBUG -DOPTRACE
DFLAGS = $(DEBUGFLAGS) -DMACOSX -DOLD_CURSOR \
DFLAGS = $(DEBUGFLAGS) -DOLD_CURSOR \
-DBYTESWAP -DLOGINT $(XFLAGS) \
-DRELEASE=351

2
bin/makefile-freebsd.386-x
View File

@ -21,7 +21,7 @@ OEXT = .o
OPTFLAGS = -O1 -gdwarf-2
DISPOPTFLAGS = -O1 -gdwarf-2
FPFLAGS =
DFLAGS = -DFREEBSD -DOLD_CURSOR \
DFLAGS = -DOLD_CURSOR \
-DBYTESWAP -DLOGINT $(XFLAGS) \
-DRELEASE=351

2
bin/makefile-init.386
View File

@ -20,7 +20,7 @@ XFLAGS = -I/opt/X11/include -DXWINDOW -DNOPIXRECT
OPTFLAGS = -O0 -g
DISPOPTFLAGS = -O0 -g
FPFLAGS =
DFLAGS = -DMACOSX -DOLD_CURSOR \
DFLAGS = -DOLD_CURSOR \
-DBYTESWAP -DLOGINT $(XFLAGS) \
-DRELEASE=351 -DNOVERSION -DINIT -DTRACE -DOPTRACE

2
bin/makefile-linux.386-x
View File

@ -21,7 +21,7 @@ OEXT = .o
OPTFLAGS = -O2 -g3
DISPOPTFLAGS = -O2 -g3
FPFLAGS =
DFLAGS = -DLINUX -DAIX -DOLD_CURSOR \
DFLAGS = -DAIX -DOLD_CURSOR \
-DBYTESWAP -DLOGINT $(XFLAGS) \
-DRELEASE=351

2
bin/makefile-linux.armv7l-x
View File

@ -21,7 +21,7 @@ OEXT = .o
OPTFLAGS = -O2 -g3
DISPOPTFLAGS = -O2 -g3
FPFLAGS =
DFLAGS = -DLINUX -DAIX -DOLD_CURSOR \
DFLAGS = -DAIX -DOLD_CURSOR \
-DBYTESWAP -DLOGINT $(XFLAGS) \
-DRELEASE=351

2
bin/makefile-linux.x86_64-x
View File

@ -22,7 +22,7 @@ OEXT = .o
OPTFLAGS = -O2 -g3
DISPOPTFLAGS = -O2 -g3
FPFLAGS =
DFLAGS = -DLINUX -DAIX -DOLD_CURSOR \
DFLAGS = -DAIX -DOLD_CURSOR \
-DBYTESWAP -DLOGINT $(XFLAGS) \
-DRELEASE=351

2
bin/makefile-openbsd.x86_64-x
View File

@ -21,7 +21,7 @@ OEXT = .o
OPTFLAGS = -O2 -g3
DISPOPTFLAGS = -O2 -g3
FPFLAGS =
DFLAGS = -DOPENBSD -DAIX -DOLD_CURSOR \
DFLAGS = -DAIX -DOLD_CURSOR \
-DBYTESWAP -DLOGINT $(XFLAGS) \
-DRELEASE=351

2
src/timer.c
View File

@ -250,7 +250,7 @@ static int gettime(int casep)
/* Unfortunately, FreeBSD does not support the timezone external variable, nor */
/* does gettimeofday() seem to produce the correct timezone values. */
tzset();
#if defined(FREEBSD)
#if defined(MAIKO_OS_FREEBSD)
time_t tv = time(NULL);
struct tm *tm = localtime(&tv);
return (tm->tm_gmtoff / -3600);

2
src/uraid.c
View File

@ -54,7 +54,7 @@ extern int Win_security_p;
#include <stropts.h>
#endif /* OS5 */
#if defined(FREEBSD) || defined(MACOSX) || defined(OS5)
#if defined(MAIKO_OS_FREEBSD) || defined(MAIKO_OS_MACOS) || defined(OS5)
/* vfork is deprecated */
#define vfork fork
#endif

4
src/uutils.c
View File

@ -227,7 +227,7 @@ LispPTR unix_getparm(LispPTR *args) {
envvalue = "i386";
#elif defined(DOS)
envvalue = "386";
#elif defined(MACOSX)
#elif defined(MAIKO_OS_MACOS)
envvalue = "i386";
#else
envvalue = "mc68020";
@ -240,7 +240,7 @@ LispPTR unix_getparm(LispPTR *args) {
envvalue = "sun386";
#elif defined(DOS)
envvalue = "dos";
#elif defined(MACOSX)
#elif defined(MAIKO_OS_MACOS)
envvalue = "i386";
#else
envvalue = "sun3";