diff --git a/skel/make.sh b/skel/make.sh index 75642a2..2aa6af1 100755 --- a/skel/make.sh +++ b/skel/make.sh @@ -8,25 +8,9 @@ # This file is the script used to build @P@. There are some -# options that can be edited; these are set below (or you can pass them -# in as variables). -[ -z "${CC}" ] && CC="gcc" -[ -z "${CXX}" ] && CXX="g++" -[ -z "${CFLAGS}" ] && CFLAGS="-g -O2 -W -Wall" -[ -z "${PREFIX}" ] && PREFIX="/usr/local" -[ -z "${LIBDIR}" ] && LIBDIR="${PREFIX}/lib" -[ -z "${BINDIR}" ] && BINDIR="${PREFIX}/bin" -[ -z "${INCLUDEDIR}" ] && INCLUDEDIR="${PREFIX}/include" -[ -z "${DOCSDIR}" ] && DOCSDIR="${PREFIX}/share/doc/@P@" - -# for pkg-config -[ -z "${PKGCONFDIR}" ] && PKGCONFDIR="${LIBDIR}/pkgconfig" -[ -z "${FINALLIBDIR}" ] && FINALLIBDIR="${LIBDIR}" -[ -z "${FINALINCLUDEDIR}" ] && FINALINCLUDEDIR="${INCLUDEDIR}" - -# for SDCC-built firmware -[ -z "${HEXDIR}" ] && HEXDIR="${PREFIX}/share/firmware" -[ -z "${SDCC}" ] && SDCC="sdcc" +# options that can be edited; these are set in the file 'config' (or you +# can pass them in as environment variables). +source config || exit 1 diff --git a/skel/scripts/.gitignore b/skel/scripts/.gitignore index 68fc41c..8e5e559 100644 --- a/skel/scripts/.gitignore +++ b/skel/scripts/.gitignore @@ -1,12 +1,12 @@ build.app.c build.app.c++ +build.app.c++-qt build.docs.doxygen build.files.none build.firmware.gpasm build.firmware.sdcc build.lib.c build.lib.c++ -build.qtapp.c++ build.tests.c build.tests.c++ module-create.sh