mirror of
https://github.com/autc04/Retro68.git
synced 2024-09-28 03:55:14 +00:00
make interfaces-and-libraries.sh handle PEFBinaryFormat.h
This commit is contained in:
parent
54201b2733
commit
78bc08814d
@ -319,7 +319,7 @@ fi # SKIP_THIRDPARTY
|
|||||||
echo "Building host-based tools..."
|
echo "Building host-based tools..."
|
||||||
|
|
||||||
# Copy PEFBinaryFormat.h from Universal Interfaces, needed by MakePEF & MakeImport
|
# Copy PEFBinaryFormat.h from Universal Interfaces, needed by MakePEF & MakeImport
|
||||||
(export LC_ALL=C; sed 's/\r$//' < "$CINCLUDES/PEFBinaryFormat.h" | tr '\r' '\n' > "$PREFIX/include/PEFBinaryFormat.h")
|
setupPEFBinaryFormat
|
||||||
|
|
||||||
mkdir -p build-host
|
mkdir -p build-host
|
||||||
cd build-host
|
cd build-host
|
||||||
|
@ -150,6 +150,11 @@ function linkheaders()
|
|||||||
(cd "$1" && find "../../CIncludes/" -name '*.h' -exec ln -s {} . \;)
|
(cd "$1" && find "../../CIncludes/" -name '*.h' -exec ln -s {} . \;)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function setupPEFBinaryFormat()
|
||||||
|
{
|
||||||
|
(export LC_ALL=C; sed 's/\r$//' < "$CINCLUDES/PEFBinaryFormat.h" | tr '\r' '\n' > "$PREFIX/include/PEFBinaryFormat.h")
|
||||||
|
}
|
||||||
|
|
||||||
function setUpInterfacesAndLibraries()
|
function setUpInterfacesAndLibraries()
|
||||||
{
|
{
|
||||||
echo "Preparing CIncludes..."
|
echo "Preparing CIncludes..."
|
||||||
@ -162,21 +167,21 @@ function setUpInterfacesAndLibraries()
|
|||||||
mkdir "$PREFIX/RIncludes"
|
mkdir "$PREFIX/RIncludes"
|
||||||
sh "$SRC/prepare-rincludes.sh" "$RINCLUDES" "$PREFIX/RIncludes"
|
sh "$SRC/prepare-rincludes.sh" "$RINCLUDES" "$PREFIX/RIncludes"
|
||||||
|
|
||||||
echo "Creating Symlinks for CIncludes and RIncludes..."
|
echo "Creating Symlinks for CIncludes and RIncludes..."
|
||||||
|
|
||||||
if [ $BUILD_68K != false ]; then
|
if [ $BUILD_68K != false ]; then
|
||||||
ln -sf ../RIncludes $PREFIX/m68k-apple-macos/RIncludes
|
ln -sf ../RIncludes $PREFIX/m68k-apple-macos/RIncludes
|
||||||
linkheaders $PREFIX/m68k-apple-macos/include
|
linkheaders $PREFIX/m68k-apple-macos/include
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [ $BUILD_PPC != false ]; then
|
if [ $BUILD_PPC != false ]; then
|
||||||
ln -sf ../RIncludes $PREFIX/powerpc-apple-macos/RIncludes
|
ln -sf ../RIncludes $PREFIX/powerpc-apple-macos/RIncludes
|
||||||
linkheaders $PREFIX/powerpc-apple-macos/include
|
linkheaders $PREFIX/powerpc-apple-macos/include
|
||||||
fi
|
fi
|
||||||
|
|
||||||
FILE_LIST="$PREFIX/apple-libraries.txt"
|
FILE_LIST="$PREFIX/apple-libraries.txt"
|
||||||
rm -f "$FILE_LIST"
|
rm -f "$FILE_LIST"
|
||||||
touch "$FILE_LIST"
|
touch "$FILE_LIST"
|
||||||
|
|
||||||
if [ $BUILD_68K != false ]; then
|
if [ $BUILD_68K != false ]; then
|
||||||
echo "Converting 68K static libraries..."
|
echo "Converting 68K static libraries..."
|
||||||
@ -189,11 +194,11 @@ function setUpInterfacesAndLibraries()
|
|||||||
lib="$PREFIX/m68k-apple-macos/lib/lib${libname}.a"
|
lib="$PREFIX/m68k-apple-macos/lib/lib${libname}.a"
|
||||||
rm -f $lib
|
rm -f $lib
|
||||||
|
|
||||||
set -o pipefail
|
set -o pipefail
|
||||||
((ConvertObj "$macobj" | m68k-apple-macos-as - -o "$obj") || (rm "$obj" && false) ) \
|
((ConvertObj "$macobj" | m68k-apple-macos-as - -o "$obj") || (rm "$obj" && false) ) \
|
||||||
&& m68k-apple-macos-ar cqs "$lib" "$obj" \
|
&& m68k-apple-macos-ar cqs "$lib" "$obj" \
|
||||||
&& echo "m68k-apple-macos/lib/$libname.o" >> "$FILE_LIST" \
|
&& echo "m68k-apple-macos/lib/$libname.o" >> "$FILE_LIST" \
|
||||||
&& echo "m68k-apple-macos/lib/lib${libname}.a" >> "$FILE_LIST"
|
&& echo "m68k-apple-macos/lib/lib${libname}.a" >> "$FILE_LIST"
|
||||||
fi
|
fi
|
||||||
done
|
done
|
||||||
fi
|
fi
|
||||||
@ -213,7 +218,7 @@ function setUpInterfacesAndLibraries()
|
|||||||
implib=lib${libname}.a
|
implib=lib${libname}.a
|
||||||
printf " %30s => %-30s\n" ${libname} ${implib}
|
printf " %30s => %-30s\n" ${libname} ${implib}
|
||||||
MakeImport "$shlib" "$PREFIX/powerpc-apple-macos/lib/$implib" \
|
MakeImport "$shlib" "$PREFIX/powerpc-apple-macos/lib/$implib" \
|
||||||
&& echo "powerpc-apple-macos/lib/$implib" >> "$FILE_LIST"
|
&& echo "powerpc-apple-macos/lib/$implib" >> "$FILE_LIST"
|
||||||
done
|
done
|
||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
@ -224,13 +229,13 @@ function setUpInterfacesAndLibraries()
|
|||||||
if [ -r "$obj" ]; then
|
if [ -r "$obj" ]; then
|
||||||
# copy the library:
|
# copy the library:
|
||||||
cp "$obj" "$PREFIX/powerpc-apple-macos/lib/"
|
cp "$obj" "$PREFIX/powerpc-apple-macos/lib/"
|
||||||
basename=`basename "${obj%.o}"`
|
basename=`basename "${obj%.o}"`
|
||||||
# and wrap it in a .a archive for convenience
|
# and wrap it in a .a archive for convenience
|
||||||
lib="$PREFIX"/powerpc-apple-macos/lib/lib$basename.a
|
lib="$PREFIX"/powerpc-apple-macos/lib/lib$basename.a
|
||||||
rm -f "$lib"
|
rm -f "$lib"
|
||||||
powerpc-apple-macos-ar cqs "$lib" "$obj"
|
powerpc-apple-macos-ar cqs "$lib" "$obj"
|
||||||
echo "powerpc-apple-macos/lib/$basename.o" >> "$FILE_LIST"
|
echo "powerpc-apple-macos/lib/$basename.o" >> "$FILE_LIST"
|
||||||
echo "powerpc-apple-macos/lib/lib$basename.a" >> "$FILE_LIST"
|
echo "powerpc-apple-macos/lib/lib$basename.a" >> "$FILE_LIST"
|
||||||
fi
|
fi
|
||||||
done
|
done
|
||||||
fi
|
fi
|
||||||
@ -239,20 +244,21 @@ function setUpInterfacesAndLibraries()
|
|||||||
|
|
||||||
function removeInterfacesAndLibraries()
|
function removeInterfacesAndLibraries()
|
||||||
{
|
{
|
||||||
FILE_LIST="$PREFIX/apple-libraries.txt"
|
FILE_LIST="$PREFIX/apple-libraries.txt"
|
||||||
if [ -r "$FILE_LIST" ]; then
|
if [ -r "$FILE_LIST" ]; then
|
||||||
echo "Removing currently installed Apple Interfaces and Libraries..."
|
echo "Removing currently installed Apple Interfaces and Libraries..."
|
||||||
for file in `cat "$FILE_LIST"`; do
|
for file in `cat "$FILE_LIST"`; do
|
||||||
rm "$PREFIX/$file"
|
rm "$PREFIX/$file"
|
||||||
done
|
done
|
||||||
find "$PREFIX/m68k-apple-macos/include" -lname "../../CIncludes/*" -delete || true
|
find "$PREFIX/m68k-apple-macos/include" -lname "../../CIncludes/*" -delete || true
|
||||||
find "$PREFIX/powerpc-apple-macos/include" -lname "../../CIncludes/*" -delete || true
|
find "$PREFIX/powerpc-apple-macos/include" -lname "../../CIncludes/*" -delete || true
|
||||||
rm "$PREFIX/m68k-apple-macos/RIncludes"
|
rm "$PREFIX/m68k-apple-macos/RIncludes"
|
||||||
rm "$PREFIX/powerpc-apple-macos/RIncludes"
|
rm "$PREFIX/powerpc-apple-macos/RIncludes"
|
||||||
rm -rf "$PREFIX/CIncludes"
|
rm -rf "$PREFIX/CIncludes"
|
||||||
rm -rf "$PREFIX/RIncludes"
|
rm -rf "$PREFIX/RIncludes"
|
||||||
rm "$FILE_LIST"
|
rm "$FILE_LIST"
|
||||||
fi
|
rm "$PREFIX/include/PEFBinaryFormat.h"
|
||||||
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
if [ "$0" = "$BASH_SOURCE" ]; then
|
if [ "$0" = "$BASH_SOURCE" ]; then
|
||||||
@ -270,13 +276,14 @@ if [ "$0" = "$BASH_SOURCE" ]; then
|
|||||||
BUILD_PPC=${4:-true}
|
BUILD_PPC=${4:-true}
|
||||||
BUILD_CARBON=${5:-true}
|
BUILD_CARBON=${5:-true}
|
||||||
SRC=$(cd `dirname $0` && pwd -P)
|
SRC=$(cd `dirname $0` && pwd -P)
|
||||||
export PATH="$PREFIX/bin:$PATH"
|
export PATH="$PREFIX/bin:$PATH"
|
||||||
|
|
||||||
if [ "${INTERFACES_DIR}" = "--remove" ]; then
|
if [ "${INTERFACES_DIR}" = "--remove" ]; then
|
||||||
removeInterfacesAndLibraries
|
removeInterfacesAndLibraries
|
||||||
else
|
else
|
||||||
locateAndCheckInterfacesAndLibraries
|
locateAndCheckInterfacesAndLibraries
|
||||||
removeInterfacesAndLibraries
|
removeInterfacesAndLibraries
|
||||||
setUpInterfacesAndLibraries
|
setupPEFBinaryFormat
|
||||||
fi
|
setUpInterfacesAndLibraries
|
||||||
|
fi
|
||||||
fi
|
fi
|
||||||
|
Loading…
Reference in New Issue
Block a user