mirror of
https://github.com/Interlisp/maiko.git
synced 2026-03-22 16:58:03 +00:00
Compare commits
4 Commits
mth38--sup
...
fgh_nethub
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
6eb5e8420e | ||
|
|
a89e146d9a | ||
|
|
f6c09f9f03 | ||
|
|
4d589237ee |
2
.github/workflows/Dockerfile_maiko
vendored
2
.github/workflows/Dockerfile_maiko
vendored
@@ -18,7 +18,7 @@ COPY . ${INSTALL_LOCATION}
|
|||||||
# Build maiko
|
# Build maiko
|
||||||
RUN cd ${INSTALL_LOCATION}/bin \
|
RUN cd ${INSTALL_LOCATION}/bin \
|
||||||
&& ./makeright x cleanup \
|
&& ./makeright x cleanup \
|
||||||
&& ./makeright x
|
&& ./makeright x nethub
|
||||||
RUN cd ${INSTALL_LOCATION}/bin \
|
RUN cd ${INSTALL_LOCATION}/bin \
|
||||||
&& if [ "$(./machinetype)" = "x86_64" ]; then \
|
&& if [ "$(./machinetype)" = "x86_64" ]; then \
|
||||||
./makeright init; \
|
./makeright init; \
|
||||||
|
|||||||
1
.github/workflows/buildRelease.yml
vendored
1
.github/workflows/buildRelease.yml
vendored
@@ -339,6 +339,7 @@ jobs:
|
|||||||
-DCMAKE_OSX_ARCHITECTURES="x86_64;arm64" \
|
-DCMAKE_OSX_ARCHITECTURES="x86_64;arm64" \
|
||||||
-DMAIKO_DISPLAY_SDL=ON \
|
-DMAIKO_DISPLAY_SDL=ON \
|
||||||
-DMAIKO_DISPLAY_X11=ON \
|
-DMAIKO_DISPLAY_X11=ON \
|
||||||
|
-DMAIKO_ENABLE_NETHUB=true \
|
||||||
-DCMAKE_BUILD_TYPE=Release
|
-DCMAKE_BUILD_TYPE=Release
|
||||||
cmake --build . --config Release
|
cmake --build . --config Release
|
||||||
for exe in lde ldex ldesdl
|
for exe in lde ldex ldesdl
|
||||||
|
|||||||
@@ -42,18 +42,32 @@ LD_LIBRARY_PATH=/usr/local/lib
|
|||||||
|
|
||||||
export PATH=".:$PATH"
|
export PATH=".:$PATH"
|
||||||
|
|
||||||
|
noshift="false"
|
||||||
if test "$1" = ""
|
if test "$1" = ""
|
||||||
then
|
then
|
||||||
display="single"
|
display="single"
|
||||||
|
noshift="true"
|
||||||
|
elif test "$1" = "nethub"
|
||||||
|
then
|
||||||
|
display="single"
|
||||||
|
noshift="true"
|
||||||
else
|
else
|
||||||
display="$1"
|
display="$1"
|
||||||
|
noshift="false"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if test $# -gt 0
|
if test "$noshift" = "false"
|
||||||
then
|
then
|
||||||
shift
|
shift
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
nethub="false"
|
||||||
|
if test "$1" = "nethub"
|
||||||
|
then
|
||||||
|
nethub="true"
|
||||||
|
shift
|
||||||
|
fi
|
||||||
|
|
||||||
architecture=`machinetype`
|
architecture=`machinetype`
|
||||||
osversion=`osversion`
|
osversion=`osversion`
|
||||||
echo "making so far for ${osversion} on ${architecture}."
|
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
|
# then finally do the make, including the right stuff
|
||||||
# With makefile-tail merged, this should only take ONE make command....
|
# 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} \
|
make RELEASENAME=${releasename} LDENAME=${ldename} \
|
||||||
OSARCHNAME=${osversion}.${architecture} \
|
OSARCHNAME=${osversion}.${architecture} \
|
||||||
-f makefile-header -f makefile-${releasename} \
|
-f makefile-header -f /tmp/makefile-${releasename}-$$ \
|
||||||
-f makefile-tail $*
|
-f makefile-tail $*
|
||||||
|
|||||||
Reference in New Issue
Block a user