diff --git a/tools/install/macosx/makefpcsnapshot.sh b/tools/install/macosx/makefpcsnapshot.sh index 7d6c873e73..9f5534ec7a 100755 --- a/tools/install/macosx/makefpcsnapshot.sh +++ b/tools/install/macosx/makefpcsnapshot.sh @@ -100,10 +100,14 @@ fi mkdir -p $INSTALLDIR make install PP=$COMPILER INSTALL_PREFIX=$INSTALLDIR -if [ CREATECROSSPPC=1 ]; then +if [ $CREATECROSSPPC==1 ]; then make all PP=$COMPILER CPU_TARGET=powerpc - CROSSCOMPILER=$FPCBUILDDIR/fpcsrc/compiler/ppcppc - make packages_install CPU_TARGET=powerpc PP=$CROSSCOMPILER CROSSINSTALL=1 INSTALL_PREFIX=$INSTALLDIR + #cp fpcsrc/compiler/ppcrossppc fpcsrc/compiler/ppcppc + CROSSCOMPILER=$FPCBUILDDIR/fpcsrc/compiler/ppcrossppc + make install CPU_TARGET=powerpc FPC=$CROSSCOMPILER CROSSINSTALL=1 INSTALL_PREFIX=$INSTALLDIR + # install for use by lazarus + make install CPU_TARGET=powerpc FPC=$CROSSCOMPILER CROSSINSTALL=1 INSTALL_PREFIX=$INSTALLFPCDIR + make -C fpcsrc/compiler CPU_TARGET=powerpc installsymlink FPC=$CROSSCOMPILER INSTALL_PREFIX=$INSTALLFPCDIR fi # create symlink using relative paths, make symlinkinstall uses absolute path, diff --git a/tools/install/macosx/makelazsnapshot.sh b/tools/install/macosx/makelazsnapshot.sh index 65012f00e2..67ebdc659c 100755 --- a/tools/install/macosx/makelazsnapshot.sh +++ b/tools/install/macosx/makelazsnapshot.sh @@ -36,6 +36,7 @@ fi LAZSOURCEDIR=~/src/lazsource COMPILER=~/fpc/bin/$PPCARCH +CROSSCOMPILER=~/fpc/bin/ppcppc FPCVERSION=`$COMPILER -iV` BUILDDIR=~/tmp/buildlaz LAZBUILDDIR=$BUILDDIR/lazarus @@ -76,8 +77,21 @@ export FPCDIR=~/fpc/lib/fpc/$FPCVERSION make bigide PP=$COMPILER USESVN2REVISIONINC=0 make lazbuilder PP=$COMPILER + +# make non-default LCL platforms make lcl LCL_PLATFORM=carbon PP=$COMPILER make lcl LCL_PLATFORM=gtk2 OPT="-dUseX" PP=$COMPILER + +# cross compilation units? +#if [ "$ARCH"=="i386NotYet" ] +#then +# make lcl CPU_TARGET=powerpc PP=$CROSSCOMPILER +# make lcl CPU_TARGET=powerpc LCL_PLATFORM=carbon PP=$CROSSCOMPILER +# make lcl CPU_TARGET=powerpc LCL_PLATFORM=gtk2 OPT="-dUseX" PP=$CROSSCOMPILER +# make -C components/synedit CPU_TARGET=powerpc PP=$CROSSCOMPILER +# make -C packager/registration CPU_TARGET=powerpc PP=$CROSSCOMPILER +#fi + strip lazarus strip startlazarus strip lazbuild