diff options
| -rw-r--r-- | contrib/scad-mode.el | 19 | ||||
| -rwxr-xr-x | scripts/macosx-build-dependencies.sh | 7 | ||||
| -rw-r--r-- | setenv_mjau.sh | 1 |
3 files changed, 19 insertions, 8 deletions
diff --git a/contrib/scad-mode.el b/contrib/scad-mode.el index e3eee0d..5961b08 100644 --- a/contrib/scad-mode.el +++ b/contrib/scad-mode.el @@ -4,8 +4,9 @@ ;; Maintainer: Len Trigg <lenbok@gmail.com> ;; Created: March 2010 ;; Modified: 06 July 2012 +;; Keywords: languages ;; URL: https://raw.github.com/openscad/openscad/master/contrib/scad-mode.el -;; Version: $Revision: 89 $ +;; Version: 90.0 ;; This program is free software; you can redistribute it and/or modify ;; it under the terms of the GNU General Public License as published by @@ -24,19 +25,27 @@ ;;; Commentary: ;; -;; This is a separate mode to implement the SCAD constructs and -;; font-locking. +;; This is a major-mode to implement the SCAD constructs and +;; font-locking for openscad ;; -;; To use, insert the following into your emacs startup: +;; If installing manually, insert the following into your emacs startup: ;; ;; (autoload 'scad-mode "scad-mode" "Major mode for editing SCAD code." t) ;; (add-to-list 'auto-mode-alist '("\\.scad$" . scad-mode)) +;; +;; or +;; +;; install from marmalade: http://marmalade-repo.org/ +;; M-x install-package <ENTER> scad-mode <ENTER> + ;;; To Do: ;; - Support for background/debug/root/disable modifiers ;; - Font lock of non-built-in function calls -;;; Autoload mode trigger +;;; Code: + +;;;###autoload (add-to-list 'auto-mode-alist '("\\.scad$" . scad-mode)) (defcustom scad-command diff --git a/scripts/macosx-build-dependencies.sh b/scripts/macosx-build-dependencies.sh index 405f7aa..3e352e1 100755 --- a/scripts/macosx-build-dependencies.sh +++ b/scripts/macosx-build-dependencies.sh @@ -10,7 +10,7 @@ # -6 Build only 64-bit binaries # # Prerequisites: -# - MacPorts: curl +# - MacPorts: curl, cmake # - Qt4 # # FIXME: @@ -24,6 +24,7 @@ SRCDIR=$BASEDIR/src DEPLOYDIR=$BASEDIR/install MAC_OSX_VERSION_MIN=10.5 OPTION_32BIT=true +export QMAKESPEC=macx-g++ printUsage() { @@ -129,11 +130,11 @@ build_mpfr() cd $BASEDIR/src rm -rf mpfr-$version if [ ! -f mpfr-$version.tar.bz2 ]; then - curl -O http://www.mpfr.org/mpfr-current/mpfr-$version.tar.bz2 + curl -O http://www.mpfr.org/mpfr-$version/mpfr-$version.tar.bz2 fi tar xjf mpfr-$version.tar.bz2 cd mpfr-$version - curl -O http://www.mpfr.org/mpfr-current/allpatches + curl -O http://www.mpfr.org/mpfr-$version/allpatches patch -N -Z -p1 < allpatches if $OPTION_32BIT; then mkdir build-i386 diff --git a/setenv_mjau.sh b/setenv_mjau.sh index 3b9fd92..851cf0e 100644 --- a/setenv_mjau.sh +++ b/setenv_mjau.sh @@ -1,5 +1,6 @@ export OPENSCAD_LIBRARIES=$PWD/../libraries/install export DYLD_LIBRARY_PATH=$OPENSCAD_LIBRARIES/lib +export QMAKESPEC=macx-g++ #export OPENCSGDIR=$PWD/../OpenCSG-1.3.0 #export CGALDIR=$PWD/../install/CGAL-3.6 |