Various fixes bundled together. May fix compilation issues on Linux.
This commit is contained in:
parent
00adaff6c3
commit
8ae32e5364
|
@ -61,10 +61,11 @@ You have to have following packages installed in your system:
|
|||
|
||||
* GNU autoconf
|
||||
* GNU flex 2.5.x
|
||||
* GNU gcc 4.x
|
||||
* GNU gcc 4.x *32-bit version!*
|
||||
* GNU make 3.x
|
||||
* lha
|
||||
* perl 5.10
|
||||
* libncurses5-dev *32-bit version!*
|
||||
|
||||
*For MacOSX users*: you'll likely need to have [MacPorts](http://www.macports.org) or [Homebrew](http://brew.sh) installed in order to build the toolchain.
|
||||
|
||||
|
|
25
bootstrap.sh
25
bootstrap.sh
|
@ -7,7 +7,7 @@ readonly SOURCES="${TOP_DIR}/sources"
|
|||
readonly BUILD_DIR="${TOP_DIR}/build"
|
||||
readonly HOST_DIR="${TOP_DIR}/host"
|
||||
readonly STAMP="${TOP_DIR}/stamps"
|
||||
readonly MAKE="make -j$(getconf NPROCESSORS_CONF)"
|
||||
readonly MAKE="make -j$(getconf _NPROCESSORS_CONF)"
|
||||
|
||||
function prepare_target {
|
||||
mkdir -p "${STAMP}" "${BUILD_DIR}" "${PREFIX}"
|
||||
|
@ -50,15 +50,18 @@ function unpack_clean {
|
|||
while (( "$#" > 1 )); do
|
||||
shift
|
||||
|
||||
if grep "\.tar\.gz$" <<<"$1"; then
|
||||
cmd="tar -xzf"
|
||||
elif grep "\.tar.bz2$" <<<"$1"; then
|
||||
cmd="tar -xjf"
|
||||
elif grep "\.lha$" <<<"$1"; then
|
||||
cmd="lha -xgq"
|
||||
else
|
||||
cmd="false"
|
||||
fi
|
||||
case "$1" in
|
||||
*.tar.gz)
|
||||
cmd="tar -xzf";;
|
||||
*.tar.bz2)
|
||||
cmd="tar -xjf";;
|
||||
*.lha)
|
||||
cmd="lha -xq";;
|
||||
*.zip)
|
||||
cmd="unzip";;
|
||||
*)
|
||||
cmd="false";;
|
||||
esac
|
||||
|
||||
${cmd} "${ARCHIVES}/$1"
|
||||
done
|
||||
|
@ -117,7 +120,7 @@ function unpack_sources {
|
|||
popd
|
||||
|
||||
unpack_clean "${NDK}" "${NDK_SRC}"
|
||||
rm -rf ndk_* *.info
|
||||
rm -f *.info
|
||||
pushd "${NDK}"
|
||||
mkdir Include/include_h/inline
|
||||
copy_non_diff "${NDK}"
|
||||
|
|
|
@ -10,7 +10,7 @@
|
|||
|
||||
long __nocommandline = 1;
|
||||
|
||||
BOOL PrintMMUInfo() {
|
||||
static BOOL PrintMMUInfo() {
|
||||
PutStr("MMU: ");
|
||||
|
||||
switch (GetMMUType()) {
|
||||
|
|
|
@ -18,8 +18,10 @@ $diff -durq "$1.orig" "$1" | while read -a line; do
|
|||
"Only")
|
||||
file="${line[2]%:}/${line[3]}"
|
||||
dir="../patches/${line[2]%:}"
|
||||
if ! [[ "${file}" =~ ~$ ]]; then
|
||||
mkdir -p "${dir}"
|
||||
cp -v "${file}" "${dir}/"
|
||||
fi
|
||||
;;
|
||||
*)
|
||||
;;
|
||||
|
|
|
@ -7,7 +7,6 @@ CGraphX/Autodocs/cybergraphics.doc
|
|||
CGraphX/C/Include/clib/cybergraphics_protos.h
|
||||
CGraphX/C/Include/cybergraphx/cybergraphics.h
|
||||
CGraphX/C/Include/pragmas/cybergraphics_pragmas.h
|
||||
CGraphX/C/Include/proto/cybergraphics.h
|
||||
CGraphX/FD/cybergraphics_lib.fd
|
||||
fd2sfd : CGraphX/FD/cybergraphics_lib.fd CGraphX/C/Include/clib/cybergraphics_protos.h
|
||||
sfdc : cybergraphics_lib.sfd
|
||||
|
|
Loading…
Reference in New Issue