mirror of
https://github.com/Interlisp/maiko.git
synced 2026-03-15 22:37:22 +00:00
Compare commits
11 Commits
nhb-rewrit
...
fgh_libbsd
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
dadbef47bf | ||
|
|
41cad3e499 | ||
|
|
fcbcb2c6b8 | ||
|
|
f4021ef268 | ||
|
|
e130b0fcb7 | ||
|
|
97b84d4117 | ||
|
|
c821a73ed4 | ||
|
|
d791b1d332 | ||
|
|
853d133cda | ||
|
|
0370354432 | ||
|
|
f85f6ce004 |
4
.github/workflows/Dockerfile_builder
vendored
4
.github/workflows/Dockerfile_builder
vendored
@@ -12,7 +12,9 @@ FROM ubuntu:22.04
|
||||
SHELL ["/bin/bash", "-c"]
|
||||
USER root:root
|
||||
# Install build tools
|
||||
RUN apt-get update && apt-get install -y make clang libx11-dev gcc
|
||||
RUN apt-get update \
|
||||
&& apt-get install -y build-essential gcc pkgconf make clang cmake \
|
||||
&& apt-get install -y libx11-dev libbsd-dev libpcap-dev
|
||||
USER root
|
||||
WORKDIR /root
|
||||
ENTRYPOINT /bin/bash
|
||||
|
||||
@@ -1,6 +1,5 @@
|
||||
CMAKE_MINIMUM_REQUIRED(VERSION 3.15)
|
||||
PROJECT(maiko C)
|
||||
|
||||
SET(CMAKE_EXPORT_COMPILE_COMMANDS ON)
|
||||
|
||||
SET(CMAKE_C_STANDARD 99)
|
||||
@@ -37,6 +36,12 @@ IF(NEED_LIB_M)
|
||||
SET(MAIKO_LIBRARIES m)
|
||||
ENDIF()
|
||||
|
||||
IF (CMAKE_SYSTEM_NAME STREQUAL "Linux")
|
||||
find_package(PkgConfig REQUIRED)
|
||||
pkg_check_modules(LIBBSD-OVERLAY REQUIRED IMPORTED_TARGET "libbsd-overlay")
|
||||
SET(MAIKO_LIBRARIES ${MAIKO_LIBRARIES} PkgConfig::LIBBSD-OVERLAY)
|
||||
ENDIF()
|
||||
|
||||
SET (MAIKO_RELEASE 351 CACHE STRING "Release version to build. Release: 115, 200, 201, 210, 300, 350, 351")
|
||||
SET_PROPERTY(CACHE MAIKO_RELEASE PROPERTY STRINGS 115 200 201 210 300 350 351)
|
||||
|
||||
@@ -448,6 +453,7 @@ ADD_CUSTOM_COMMAND(OUTPUT vdate.c
|
||||
ADD_EXECUTABLE(lde src/ldeboot.c src/unixfork.c)
|
||||
TARGET_COMPILE_DEFINITIONS(lde PRIVATE ${MAIKO_DEFINITIONS})
|
||||
TARGET_INCLUDE_DIRECTORIES(lde PRIVATE inc)
|
||||
TARGET_LINK_LIBRARIES(lde ${MAIKO_LIBRARIES})
|
||||
IF(MAIKO_DISPLAY_X11)
|
||||
# Tell it that the X11 launcher is available.
|
||||
TARGET_COMPILE_DEFINITIONS(lde PRIVATE ${MAIKO_DISPLAY_X11_DEFINITIONS})
|
||||
@@ -528,3 +534,21 @@ TARGET_INCLUDE_DIRECTORIES(setsout PRIVATE inc)
|
||||
ADD_EXECUTABLE(tstsout src/tstsout.c src/byteswap.c)
|
||||
TARGET_COMPILE_DEFINITIONS(tstsout PRIVATE ${MAIKO_DEFINITIONS})
|
||||
TARGET_INCLUDE_DIRECTORIES(tstsout PRIVATE inc)
|
||||
|
||||
# Installation Targets
|
||||
IF(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
|
||||
set(CMAKE_INSTALL_PREFIX "${CMAKE_BINARY_DIR}/../" CACHE PATH "Installation prefix" FORCE)
|
||||
ENDIF()
|
||||
execute_process(
|
||||
COMMAND sh -c "echo $(../bin/osversion).$(../bin/machinetype)"
|
||||
OUTPUT_VARIABLE release_dir
|
||||
WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
|
||||
OUTPUT_STRIP_TRAILING_WHITESPACE
|
||||
)
|
||||
INSTALL(TARGETS lde DESTINATION ${release_dir})
|
||||
IF(MAIKO_DISPLAY_X11)
|
||||
INSTALL(TARGETS ldex ldeinit DESTINATION ${release_dir})
|
||||
ENDIF()
|
||||
IF(MAIKO_DISPLAY_SDL)
|
||||
INSTALL(TARGETS ldesdl DESTINATION ${release_dir})
|
||||
ENDIF()
|
||||
|
||||
@@ -37,6 +37,7 @@ $ ./makeright x
|
||||
|
||||
* The build will (attempt to) detect the OS-type and cpu-type. It will build binaries `lde` and `ldex` in `../`_`ostype.cputype`_ (with .o files in `../`_`ostype.cputype-x`_. For example, Linux on a 64-bit x86 will use `linux.x86_64`, while macOS 11 on a (new M1) Mac will use `darwin.aarch64`.
|
||||
* If you prefer `gcc` over `clang`, you will need to edit the makefile fragment for your configuration (`makefile-ostype.cputype-x`) and comment out the line (with a #) that defines `CC` as `clang` and uncomment the line (delete the #) for the line that defines `CC` as `gcc`.
|
||||
* If you want to do your own loadups to construct sysout files (see [the Medley repository](https://github.com/Interlisp/medley) for details), you also need the `ldeinit` binary, which you can build using `./makeright init`.
|
||||
|
||||
### Building with CMake
|
||||
We provide a `CMakeLists.txt` which provides mostly matching build capabilities to the `make` setup.
|
||||
|
||||
15
bin/linux-common.mk
Normal file
15
bin/linux-common.mk
Normal file
@@ -0,0 +1,15 @@
|
||||
# Common Options for All Linuxes
|
||||
|
||||
CC = gcc $(GCC_CFLAGS)
|
||||
# CC = clang $(CLANG_CFLAGS)
|
||||
|
||||
include linux-libbsd.mk
|
||||
|
||||
# OPTFLAGS is normally -O2.
|
||||
OPTFLAGS = -O2 -g3
|
||||
DFLAGS = $(XFLAGS) -DRELEASE=$(RELEASE) $(BSD_CFLAGS) $(ADDITIONAL_DFLAGS)
|
||||
|
||||
LDFLAGS = $(XLDFLAGS) -lc -lm $(BSD_LDFLAGS)
|
||||
LDELDFLAGS = $(XLDFLAGS) -lc -lm $(BSD_LDFLAGS)
|
||||
|
||||
OBJECTDIR = ../$(RELEASENAME)/
|
||||
24
bin/linux-libbsd.mk
Normal file
24
bin/linux-libbsd.mk
Normal file
@@ -0,0 +1,24 @@
|
||||
# Check that pkg-config is available and that the libbsd-dev package is installed
|
||||
# If one of these is missing, error out
|
||||
# FGH 2026-03-08
|
||||
ifneq ($(MAKECMDGOALS),clean)
|
||||
ifneq ($(MAKECMDGOALS),cleanup)
|
||||
|
||||
CHK_PKG_CONFIG := $(shell command -v pkg-config)
|
||||
ifeq ($(CHK_PKG_CONFIG),)
|
||||
# pkg-config not found, print an error
|
||||
$(error "pkg-config not found. Please install it to build this project.")
|
||||
endif
|
||||
|
||||
CHK_LIBBSD_DEV := $(shell pkg-config --exists libbsd-overlay && echo true)
|
||||
ifneq ($(CHK_LIBBSD_DEV),true)
|
||||
$(error "libbsd-dev (or libbsd-devel) package not found. Please install it to build this project.")
|
||||
endif
|
||||
endif
|
||||
endif
|
||||
|
||||
BSD_CFLAGS = $(shell pkg-config --cflags libbsd-overlay)
|
||||
|
||||
BSD_LDFLAGS = $(shell pkg-config --libs libbsd-overlay)
|
||||
|
||||
|
||||
14
bin/linux-sdl.mk
Normal file
14
bin/linux-sdl.mk
Normal file
@@ -0,0 +1,14 @@
|
||||
# Common Options for Linux using SDL instead of X Windows
|
||||
|
||||
XFILES = $(OBJECTDIR)sdl.o
|
||||
|
||||
#
|
||||
# For SDL version 2
|
||||
# -DSDL=2 in XFLAGS and -lSDL2 in LDFLAGS
|
||||
# For SDL version 3
|
||||
# -DSDL=3 in XFLAGS and -lSDL3 in LDFLAGS
|
||||
#
|
||||
XFLAGS = -DSDL=2
|
||||
|
||||
XLDFLAGS = -lSDL2
|
||||
|
||||
17
bin/linux-x.mk
Normal file
17
bin/linux-x.mk
Normal file
@@ -0,0 +1,17 @@
|
||||
# Common Options for Linux with X Windows
|
||||
|
||||
XFILES = $(OBJECTDIR)xmkicon.o \
|
||||
$(OBJECTDIR)xbbt.o \
|
||||
$(OBJECTDIR)dspif.o \
|
||||
$(OBJECTDIR)xinit.o \
|
||||
$(OBJECTDIR)xscroll.o \
|
||||
$(OBJECTDIR)xcursor.o \
|
||||
$(OBJECTDIR)xlspwin.o \
|
||||
$(OBJECTDIR)xrdopt.o \
|
||||
$(OBJECTDIR)xwinman.o
|
||||
|
||||
|
||||
XFLAGS = -DXWINDOW
|
||||
|
||||
XLDFLAGS = -L/usr/X11/lib -lX11
|
||||
|
||||
@@ -1,29 +1,12 @@
|
||||
# Options for Linux, aarch64 processor, X windows, for INIT processing
|
||||
|
||||
CC = gcc $(GCC_CFLAGS)
|
||||
#CC = clang $(CLANG_CFLAGS)
|
||||
include linux-x.mk
|
||||
|
||||
XFILES = $(OBJECTDIR)xmkicon.o \
|
||||
$(OBJECTDIR)xbbt.o \
|
||||
$(OBJECTDIR)dspif.o \
|
||||
$(OBJECTDIR)xinit.o \
|
||||
$(OBJECTDIR)xscroll.o \
|
||||
$(OBJECTDIR)xcursor.o \
|
||||
$(OBJECTDIR)xlspwin.o \
|
||||
$(OBJECTDIR)xrdopt.o \
|
||||
$(OBJECTDIR)xwinman.o
|
||||
|
||||
|
||||
XFLAGS = -DXWINDOW
|
||||
|
||||
# OPTFLAGS is normally -O2, for INIT we want unoptimized in case we need to debug it
|
||||
OPTFLAGS = -O0 -g
|
||||
DEBUGFLAGS =
|
||||
DFLAGS = $(DEBUGFLAGS) $(XFLAGS) -DRELEASE=$(RELEASE) -DNOVERSION -DINIT
|
||||
ADDITIONAL_DFLAGS = $(DEBUGFLAGS) -DNOVERSION -DINIT
|
||||
|
||||
LDFLAGS = -L/usr/X11/lib -lX11 -lc -lm
|
||||
LDELDFLAGS = -L/usr/X11/lib -lX11 -lc -lm
|
||||
include linux-common.mk
|
||||
|
||||
OBJECTDIR = ../$(RELEASENAME)/
|
||||
OPTFLAGS = -O0 -g
|
||||
|
||||
default : ../$(OSARCHNAME)/ldeinit
|
||||
|
||||
@@ -1,29 +1,12 @@
|
||||
# Options for Linux, x86 processor, X windows, for INIT processing
|
||||
|
||||
CC = gcc $(GCC_CFLAGS)
|
||||
#CC = clang $(CLANG_CFLAGS)
|
||||
include linux-x.mk
|
||||
|
||||
XFILES = $(OBJECTDIR)xmkicon.o \
|
||||
$(OBJECTDIR)xbbt.o \
|
||||
$(OBJECTDIR)dspif.o \
|
||||
$(OBJECTDIR)xinit.o \
|
||||
$(OBJECTDIR)xscroll.o \
|
||||
$(OBJECTDIR)xcursor.o \
|
||||
$(OBJECTDIR)xlspwin.o \
|
||||
$(OBJECTDIR)xrdopt.o \
|
||||
$(OBJECTDIR)xwinman.o
|
||||
|
||||
|
||||
XFLAGS = -DXWINDOW
|
||||
|
||||
# OPTFLAGS is normally -O2, for INIT we want unoptimized in case we need to debug it
|
||||
OPTFLAGS = -O0 -g
|
||||
DEBUGFLAGS =
|
||||
DFLAGS = $(DEBUGFLAGS) $(XFLAGS) -DRELEASE=$(RELEASE) -DNOVERSION -DINIT
|
||||
ADDITIONAL_DFLAGS = $(DEBUGFLAGS) -DNOVERSION -DINIT
|
||||
|
||||
LDFLAGS = -L/usr/X11/lib -lX11 -lc -lm
|
||||
LDELDFLAGS = -L/usr/X11/lib -lX11 -lc -lm
|
||||
include linux-common.mk
|
||||
|
||||
OBJECTDIR = ../$(RELEASENAME)/
|
||||
OPTFLAGS = -O0 -g
|
||||
|
||||
default : ../$(OSARCHNAME)/ldeinit
|
||||
|
||||
@@ -21,8 +21,8 @@ OPTFLAGS = -O0 -g
|
||||
DEBUGFLAGS =
|
||||
DFLAGS = $(DEBUGFLAGS) $(XFLAGS) -DRELEASE=$(RELEASE) -DNOVERSION -DINIT -D__wsl1__
|
||||
|
||||
LDFLAGS = -L/usr/X11/lib -lX11 -lc -lm
|
||||
LDELDFLAGS = -L/usr/X11/lib -lX11 -lc -lm
|
||||
LDFLAGS = -L/usr/X11/lib -lX11 -lc -lm -lbsd
|
||||
LDELDFLAGS = -L/usr/X11/lib -lX11 -lc -lm -lbsd
|
||||
|
||||
OBJECTDIR = ../$(RELEASENAME)/
|
||||
|
||||
|
||||
@@ -21,8 +21,8 @@ OPTFLAGS = -O0 -g
|
||||
DEBUGFLAGS =
|
||||
DFLAGS = $(DEBUGFLAGS) $(XFLAGS) -DRELEASE=$(RELEASE) -DNOVERSION -DINIT -D__wsl1__
|
||||
|
||||
LDFLAGS = -L/usr/X11/lib -lX11 -lc -lm
|
||||
LDELDFLAGS = -L/usr/X11/lib -lX11 -lc -lm
|
||||
LDFLAGS = -L/usr/X11/lib -lX11 -lc -lm -lbsd
|
||||
LDELDFLAGS = -L/usr/X11/lib -lX11 -lc -lm -lbsd
|
||||
|
||||
OBJECTDIR = ../$(RELEASENAME)/
|
||||
|
||||
|
||||
@@ -1,25 +1,10 @@
|
||||
# Options for Linux, Intel 386/486 and SDL
|
||||
|
||||
CC = gcc -m32 $(GCC_CFLAGS)
|
||||
# CC = clang $(CLANG_CFLAGS)
|
||||
GCC_CFLAGS := -m64 $(GCC_CFLAGS)
|
||||
CLANG_CFLAGS := -m64 $(CLANG_CFLAGS)
|
||||
|
||||
XFILES = $(OBJECTDIR)sdl.o
|
||||
include linux-sdl.mk
|
||||
|
||||
#
|
||||
# For SDL version 2
|
||||
# -DSDL=2 in XFLAGS and -lSDL2 in LDFLAGS
|
||||
# For SDL version 3
|
||||
# -DSDL=3 in XFLAGS and -lSDL3 in LDFLAGS
|
||||
#
|
||||
XFLAGS = -DSDL=2
|
||||
|
||||
# OPTFLAGS is normally -O2.
|
||||
OPTFLAGS = -O2 -g3
|
||||
DFLAGS = $(XFLAGS) -DRELEASE=$(RELEASE)
|
||||
|
||||
LDFLAGS = -lm -lSDL2
|
||||
LDELDFLAGS =
|
||||
|
||||
OBJECTDIR = ../$(RELEASENAME)/
|
||||
include linux-common.mk
|
||||
|
||||
default : ../$(OSARCHNAME)/lde ../$(OSARCHNAME)/ldesdl
|
||||
|
||||
@@ -1,27 +1,10 @@
|
||||
# Options for Linux, Intel 386/486 and X-Window
|
||||
|
||||
CC = gcc -m32 $(GCC_CFLAGS)
|
||||
# CC = clang -m32 $(CLANG_CFLAGS)
|
||||
GCC_CFLAGS := -m32 $(GCC_CFLAGS)
|
||||
CLANG_CFLAGS := -m32 $(CLANG_CFLAGS)
|
||||
|
||||
XFILES = $(OBJECTDIR)xmkicon.o \
|
||||
$(OBJECTDIR)xbbt.o \
|
||||
$(OBJECTDIR)dspif.o \
|
||||
$(OBJECTDIR)xinit.o \
|
||||
$(OBJECTDIR)xscroll.o \
|
||||
$(OBJECTDIR)xcursor.o \
|
||||
$(OBJECTDIR)xlspwin.o \
|
||||
$(OBJECTDIR)xrdopt.o \
|
||||
$(OBJECTDIR)xwinman.o
|
||||
include linux-x.mk
|
||||
|
||||
XFLAGS = -DXWINDOW
|
||||
|
||||
# OPTFLAGS is normally -O2.
|
||||
OPTFLAGS = -O2 -g3
|
||||
DFLAGS = $(XFLAGS) -DRELEASE=$(RELEASE)
|
||||
|
||||
LDFLAGS = -L/usr/X11/lib -lX11 -lc -lm
|
||||
LDELDFLAGS = -L/usr/X11/lib -lX11 -lc -lm
|
||||
|
||||
OBJECTDIR = ../$(RELEASENAME)/
|
||||
include linux-common.mk
|
||||
|
||||
default : ../$(OSARCHNAME)/lde ../$(OSARCHNAME)/ldex
|
||||
|
||||
@@ -1,25 +1,7 @@
|
||||
# Options for Linux, ARM64 and SDL
|
||||
|
||||
CC = gcc $(GCC_CFLAGS)
|
||||
#CC = clang $(CLANG_CFLAGS)
|
||||
include linux-sdl.mk
|
||||
|
||||
XFILES = $(OBJECTDIR)sdl.o
|
||||
|
||||
#
|
||||
# For SDL version 2
|
||||
# -DSDL=2 in SDLFLAGS and -lSDL2 in LDFLAGS
|
||||
# For SDL version 3
|
||||
# -DSDL=3 in SDLFLAGS and -lSDL3 in LDFLAGS
|
||||
#
|
||||
SDLFLAGS = -DSDL=2
|
||||
|
||||
# OPTFLAGS is normally -O2.
|
||||
OPTFLAGS = -O2 -g3
|
||||
DFLAGS = $(SDLFLAGS) -DRELEASE=$(RELEASE)
|
||||
|
||||
LDFLAGS = -lSDL2 -lm
|
||||
LDELDFLAGS =
|
||||
|
||||
OBJECTDIR = ../$(RELEASENAME)/
|
||||
include linux-common.mk
|
||||
|
||||
default : ../$(OSARCHNAME)/lde ../$(OSARCHNAME)/ldesdl
|
||||
|
||||
@@ -1,27 +1,7 @@
|
||||
# Options for Linux, aarch64 and X-Window
|
||||
|
||||
CC = gcc $(GCC_CFLAGS)
|
||||
#CC = clang $(CLANG_CFLAGS)
|
||||
include linux-x.mk
|
||||
|
||||
XFILES = $(OBJECTDIR)xmkicon.o \
|
||||
$(OBJECTDIR)xbbt.o \
|
||||
$(OBJECTDIR)dspif.o \
|
||||
$(OBJECTDIR)xinit.o \
|
||||
$(OBJECTDIR)xscroll.o \
|
||||
$(OBJECTDIR)xcursor.o \
|
||||
$(OBJECTDIR)xlspwin.o \
|
||||
$(OBJECTDIR)xrdopt.o \
|
||||
$(OBJECTDIR)xwinman.o
|
||||
|
||||
XFLAGS = -DXWINDOW
|
||||
|
||||
# OPTFLAGS is normally -O2.
|
||||
OPTFLAGS = -O2 -g3
|
||||
DFLAGS = $(XFLAGS) -DRELEASE=$(RELEASE)
|
||||
|
||||
LDFLAGS = -L/usr/X11/lib -lX11 -lc -lm
|
||||
LDELDFLAGS = -L/usr/X11/lib -lX11 -lc -lm
|
||||
|
||||
OBJECTDIR = ../$(RELEASENAME)/
|
||||
include linux-common.mk
|
||||
|
||||
default : ../$(OSARCHNAME)/lde ../$(OSARCHNAME)/ldex
|
||||
|
||||
@@ -1,25 +1,7 @@
|
||||
# Options for Linux, ARMv7 and SDL
|
||||
|
||||
CC = gcc $(GCC_CFLAGS)
|
||||
#CC = clang $(CLANG_CFLAGS)
|
||||
include linux-sdl.mk
|
||||
|
||||
XFILES = $(OBJECTDIR)sdl.o
|
||||
|
||||
#
|
||||
# For SDL version 2
|
||||
# -DSDL=2 in XFLAGS and -lSDL2 in LDFLAGS
|
||||
# For SDL version 3
|
||||
# -DSDL=3 in XFLAGS and -lSDL3 in LDFLAGS
|
||||
#
|
||||
XFLAGS = -DSDL=2
|
||||
|
||||
# OPTFLAGS is normally -O2.
|
||||
OPTFLAGS = -O2 -g3
|
||||
DFLAGS = $(XFLAGS) -DRELEASE=$(RELEASE)
|
||||
|
||||
LDFLAGS = -lm -lSDL2
|
||||
LDELDFLAGS =
|
||||
|
||||
OBJECTDIR = ../$(RELEASENAME)/
|
||||
include linux-common.mk
|
||||
|
||||
default : ../$(OSARCHNAME)/lde ../$(OSARCHNAME)/ldesdl
|
||||
|
||||
@@ -1,27 +1,7 @@
|
||||
# Options for Linux, ARMv7 and X-Window
|
||||
|
||||
CC = gcc $(GCC_CFLAGS)
|
||||
#CC = clang $(CLANG_CFLAGS)
|
||||
include linux-x.mk
|
||||
|
||||
XFILES = $(OBJECTDIR)xmkicon.o \
|
||||
$(OBJECTDIR)xbbt.o \
|
||||
$(OBJECTDIR)dspif.o \
|
||||
$(OBJECTDIR)xinit.o \
|
||||
$(OBJECTDIR)xscroll.o \
|
||||
$(OBJECTDIR)xcursor.o \
|
||||
$(OBJECTDIR)xlspwin.o \
|
||||
$(OBJECTDIR)xrdopt.o \
|
||||
$(OBJECTDIR)xwinman.o
|
||||
|
||||
XFLAGS = -DXWINDOW
|
||||
|
||||
# OPTFLAGS is normally -O2.
|
||||
OPTFLAGS = -O2 -g3
|
||||
DFLAGS = $(XFLAGS) -DRELEASE=$(RELEASE)
|
||||
|
||||
LDFLAGS = -L/usr/X11/lib -lX11 -lc -lm
|
||||
LDELDFLAGS = -L/usr/X11/lib -lX11 -lc -lm
|
||||
|
||||
OBJECTDIR = ../$(RELEASENAME)/
|
||||
include linux-common.mk
|
||||
|
||||
default : ../$(OSARCHNAME)/lde ../$(OSARCHNAME)/ldex
|
||||
|
||||
@@ -1,25 +1,10 @@
|
||||
# Options for Linux, Intel x86_64 and SDL
|
||||
|
||||
CC = gcc -m64 $(GCC_CFLAGS)
|
||||
# CC = clang -m64 $(CLANG_CFLAGS)
|
||||
GCC_CFLAGS := -m64 $(GCC_CFLAGS)
|
||||
CLANG_CFLAGS := -m64 $(CLANG_CFLAGS)
|
||||
|
||||
XFILES = $(OBJECTDIR)sdl.o
|
||||
include linux-sdl.mk
|
||||
|
||||
#
|
||||
# For SDL version 2
|
||||
# -DSDL=2 in XFLAGS and -lSDL2 in LDFLAGS
|
||||
# For SDL version 3
|
||||
# -DSDL=3 in XFLAGS and -lSDL3 in LDFLAGS
|
||||
#
|
||||
XFLAGS = -DSDL=2
|
||||
|
||||
# OPTFLAGS is normally -O2.
|
||||
OPTFLAGS = -O2 -g3
|
||||
DFLAGS = $(XFLAGS) -DRELEASE=$(RELEASE)
|
||||
|
||||
LDFLAGS = -lm -lSDL2
|
||||
LDELDFLAGS =
|
||||
|
||||
OBJECTDIR = ../$(RELEASENAME)/
|
||||
include linux-common.mk
|
||||
|
||||
default : ../$(OSARCHNAME)/lde ../$(OSARCHNAME)/ldesdl
|
||||
|
||||
@@ -1,28 +1,10 @@
|
||||
# Options for Linux, Intel x86_64 and X-Window
|
||||
|
||||
CC = gcc -m64 $(GCC_CFLAGS)
|
||||
# CC = clang -m64 $(CLANG_CFLAGS)
|
||||
GCC_CFLAGS := -m64 $(GCC_CFLAGS)
|
||||
CLANG_CFLAGS := -m64 $(CLANG_CFLAGS)
|
||||
|
||||
XFILES = $(OBJECTDIR)xmkicon.o \
|
||||
$(OBJECTDIR)xbbt.o \
|
||||
$(OBJECTDIR)dspif.o \
|
||||
$(OBJECTDIR)xinit.o \
|
||||
$(OBJECTDIR)xscroll.o \
|
||||
$(OBJECTDIR)xcursor.o \
|
||||
$(OBJECTDIR)xlspwin.o \
|
||||
$(OBJECTDIR)xrdopt.o \
|
||||
$(OBJECTDIR)xwinman.o
|
||||
include linux-x.mk
|
||||
|
||||
|
||||
XFLAGS = -DXWINDOW
|
||||
|
||||
# OPTFLAGS is normally -O2.
|
||||
OPTFLAGS = -O2 -g3
|
||||
DFLAGS = $(XFLAGS) -DRELEASE=$(RELEASE)
|
||||
|
||||
LDFLAGS = -L/usr/X11/lib -lX11 -lc -lm
|
||||
LDELDFLAGS = -L/usr/X11/lib -lX11 -lc -lm
|
||||
|
||||
OBJECTDIR = ../$(RELEASENAME)/
|
||||
include linux-common.mk
|
||||
|
||||
default : ../$(OSARCHNAME)/lde ../$(OSARCHNAME)/ldex
|
||||
|
||||
@@ -17,8 +17,8 @@ SDLFLAGS = -DSDL=2
|
||||
OPTFLAGS = -O2 -g3
|
||||
DFLAGS = $(SDLFLAGS) -DRELEASE=$(RELEASE) -D__wsl1__
|
||||
|
||||
LDFLAGS = -lSDL2 -lm
|
||||
LDELDFLAGS =
|
||||
LDFLAGS = -lSDL2 -lm -lbsd
|
||||
LDELDFLAGS = -lbsd
|
||||
|
||||
OBJECTDIR = ../$(RELEASENAME)/
|
||||
|
||||
|
||||
@@ -19,8 +19,8 @@ XFLAGS = -DXWINDOW
|
||||
OPTFLAGS = -O2 -g3
|
||||
DFLAGS = $(XFLAGS) -DRELEASE=$(RELEASE) -D__wsl1__
|
||||
|
||||
LDFLAGS = -L/usr/X11/lib -lX11 -lc -lm
|
||||
LDELDFLAGS = -L/usr/X11/lib -lX11 -lc -lm
|
||||
LDFLAGS = -L/usr/X11/lib -lX11 -lc -lm -lbsd
|
||||
LDELDFLAGS = -L/usr/X11/lib -lX11 -lc -lm -lbsd
|
||||
|
||||
OBJECTDIR = ../$(RELEASENAME)/
|
||||
|
||||
|
||||
@@ -17,8 +17,8 @@ XFLAGS = -DSDL=2
|
||||
OPTFLAGS = -O2 -g3
|
||||
DFLAGS = $(XFLAGS) -DRELEASE=$(RELEASE) -D__wsl1__
|
||||
|
||||
LDFLAGS = -lm -lSDL2
|
||||
LDELDFLAGS =
|
||||
LDFLAGS = -lm -lSDL2 -lbsd
|
||||
LDELDFLAGS = -lbsd
|
||||
|
||||
OBJECTDIR = ../$(RELEASENAME)/
|
||||
|
||||
|
||||
@@ -20,8 +20,8 @@ XFLAGS = -DXWINDOW
|
||||
OPTFLAGS = -O2 -g3
|
||||
DFLAGS = $(XFLAGS) -DRELEASE=$(RELEASE) -D__wsl1__
|
||||
|
||||
LDFLAGS = -L/usr/X11/lib -lX11 -lc -lm
|
||||
LDELDFLAGS = -L/usr/X11/lib -lX11 -lc -lm
|
||||
LDFLAGS = -L/usr/X11/lib -lX11 -lc -lm -lbsd
|
||||
LDELDFLAGS = -L/usr/X11/lib -lX11 -lc -lm -lbsd
|
||||
|
||||
OBJECTDIR = ../$(RELEASENAME)/
|
||||
|
||||
|
||||
Reference in New Issue
Block a user