1
0
mirror of https://github.com/Interlisp/maiko.git synced 2026-03-15 14:27:19 +00:00

Compare commits

...

4 Commits

Author SHA1 Message Date
Frank Halasz
6eb5e8420e Typo in nethub builds for MacOS 2024-05-08 17:31:29 -07:00
Frank Halasz
a89e146d9a Enable nethub builds for MacOS as well 2024-05-08 17:26:05 -07:00
Frank Halasz
f6c09f9f03 Merge branch 'master' into fgh_nethub-build 2024-05-08 17:17:37 -07:00
Frank Halasz
4d589237ee Add ability to compile with -DMAIKO_ENABLE_NETHUB 2023-11-26 18:31:10 -08:00
3 changed files with 27 additions and 7 deletions

View File

@@ -18,7 +18,7 @@ COPY . ${INSTALL_LOCATION}
# Build maiko
RUN cd ${INSTALL_LOCATION}/bin \
&& ./makeright x cleanup \
&& ./makeright x
&& ./makeright x nethub
RUN cd ${INSTALL_LOCATION}/bin \
&& if [ "$(./machinetype)" = "x86_64" ]; then \
./makeright init; \

View File

@@ -339,6 +339,7 @@ jobs:
-DCMAKE_OSX_ARCHITECTURES="x86_64;arm64" \
-DMAIKO_DISPLAY_SDL=ON \
-DMAIKO_DISPLAY_X11=ON \
-DMAIKO_ENABLE_NETHUB=true \
-DCMAKE_BUILD_TYPE=Release
cmake --build . --config Release
for exe in lde ldex ldesdl

View File

@@ -20,7 +20,7 @@
# Nov 20 2001 JDS: Convert to use BASH, not CSH, for open-source...
#
# usage: makeright [display-option] [other-option]
#
#
# example: makeright single ; make lde for mmaped displayFB
# makeright multi ; make lde for cg3,cg6
# makeright x ; make lde for X-windows
@@ -33,27 +33,41 @@
#
# makeright init requires directory "maiko/init.${architecture}
#
# Note: X11R4 environment link shared libraries.
# lde need X library. If lde links shared libraries,
# Note: X11R4 environment link shared libraries.
# lde need X library. If lde links shared libraries,
# X shared libraries are needed at run time.
#
# Hide X shared libraries from link libraries search path.
LD_LIBRARY_PATH=/usr/local/lib
LD_LIBRARY_PATH=/usr/local/lib
export PATH=".:$PATH"
noshift="false"
if test "$1" = ""
then
display="single"
noshift="true"
elif test "$1" = "nethub"
then
display="single"
noshift="true"
else
display="$1"
noshift="false"
fi
if test $# -gt 0
if test "$noshift" = "false"
then
shift
fi
nethub="false"
if test "$1" = "nethub"
then
nethub="true"
shift
fi
architecture=`machinetype`
osversion=`osversion`
echo "making so far for ${osversion} on ${architecture}."
@@ -111,7 +125,12 @@ echo start making lde for ${releasename}.
# then finally do the make, including the right stuff
# With makefile-tail merged, this should only take ONE make command....
cp -p makefile-${releasename} /tmp/makefile-${releasename}-$$
if test "$nethub" = "true"
then
sed -e "/^DFLAGS = /s/$/ -DMAIKO_ENABLE_NETHUB/" -i /tmp/makefile-${releasename}-$$
fi
make RELEASENAME=${releasename} LDENAME=${ldename} \
OSARCHNAME=${osversion}.${architecture} \
-f makefile-header -f makefile-${releasename} \
-f makefile-header -f /tmp/makefile-${releasename}-$$ \
-f makefile-tail $*