netbsd fixes

5 files changed, 17 insertions, 7 deletions

diff --git a/README.md b/README.md
index 91717b6..a40f63b 100644
--- a/README.md
+++ b/README.md
@@ -133,10 +133,11 @@ After that, follow the Compilation instructions below.
 
 ### Building for Linux/BSD
 
-First, make sure that you have git installed (git-core in debian). Once 
-you've cloned this git repository, download and install the dependency 
-packages listed above using your system's package manager. A convenience 
-script is provided that can help with this process:
+First, make sure that you have git installed (often packaged as 'git-core' 
+or 'scmgit'). Once you've cloned this git repository, download and install 
+the dependency packages listed above using your system's package 
+manager. A convenience script is provided that can help with this 
+process:
 
     ./scripts/uni-get-dependencies.sh
 
diff --git a/eigen.pri b/eigen.pri
index b7fe366..5dd3279 100644
--- a/eigen.pri
+++ b/eigen.pri
@@ -69,4 +69,8 @@ isEmpty(EIGEN_INCLUDEPATH) {
 # EIGEN being under 'include/eigen[2-3]' needs special prepending
 QMAKE_INCDIR_QT = $$EIGEN_INCLUDEPATH $$QMAKE_INCDIR_QT
 
+netbsd* {
+  QMAKE_CXXFLAGS = -I$$EIGEN_INCLUDEPATH $$QMAKE_CXXFLAGS
+}
+
 } # eigen
diff --git a/openscad.pro b/openscad.pro
index 91bd735..49b764f 100644
--- a/openscad.pro
+++ b/openscad.pro
@@ -90,11 +90,14 @@ unix:!macx {
 }
 
 netbsd* {
-   LIBS += -L/usr/X11R7/lib
+   QMAKE_LFLAGS += -L/usr/X11R7/lib
    QMAKE_LFLAGS += -Wl,-R/usr/X11R7/lib
    QMAKE_LFLAGS += -Wl,-R/usr/pkg/lib
    !isEmpty(OPENSCAD_LIBDIR) {
-     QMAKE_LFLAGS += -Wl,-R$$OPENSCAD_LIBDIR/lib
+     QMAKE_CFLAGS = -I$$OPENSCAD_LIBDIR/include $$QMAKE_CFLAGS
+     QMAKE_CXXFLAGS = -I$$OPENSCAD_LIBDIR/include $$QMAKE_CXXFLAGS
+     QMAKE_LFLAGS = -L$$OPENSCAD_LIBDIR/lib $$QMAKE_LFLAGS
+     QMAKE_LFLAGS = -Wl,-R$$OPENSCAD_LIBDIR/lib $$QMAKE_LFLAGS
    }
 }
 
diff --git a/scripts/setenv-unibuild.sh b/scripts/setenv-unibuild.sh
index e734df7..456c7cd 100644
--- a/scripts/setenv-unibuild.sh
+++ b/scripts/setenv-unibuild.sh
@@ -58,7 +58,7 @@ setenv_netbsd()
  QMAKESPEC=netbsd-g++
  QTDIR=/usr/pkg/qt4
  PATH=/usr/pkg/qt4/bin:$PATH
- LD_LIBRARY_PATH=/usr/pkg/qt4/lib:$LD_LIBRARY_PATH
+ LD_LIBRARY_PATH=/usr/pkg/qt4/lib:/usr/X11R7/lib:$LD_LIBRARY_PATH
 
  export QMAKESPEC
  export QTDIR
diff --git a/scripts/uni-get-dependencies.sh b/scripts/uni-get-dependencies.sh
index cb03563..c530be9 100755
--- a/scripts/uni-get-dependencies.sh
+++ b/scripts/uni-get-dependencies.sh
@@ -20,6 +20,8 @@ get_freebsd_deps()
 
 get_netbsd_deps()
 {
+ echo Netbsd: You must install the X sets before running..
+ sleep 2
  sudo pkgin install bison boost cmake git bash eigen flex gmake gmp mpfr \
   qt4 glew cgal opencsg modular-xorg
 }