diff --git a/patches/OpenCSG-1.4.0-MacOSX-port.patch b/patches/OpenCSG-1.4.0-MacOSX-port.patch index c26d6470..8b0a5d70 100644 --- a/patches/OpenCSG-1.4.0-MacOSX-port.patch +++ b/patches/OpenCSG-1.4.0-MacOSX-port.patch @@ -1,4 +1,5 @@ diff --git a/opencsg.pro b/opencsg.pro +index b56e622..5cf2d6d 100644 --- a/opencsg.pro +++ b/opencsg.pro @@ -1,2 +1,2 @@ @@ -6,17 +7,25 @@ diff --git a/opencsg.pro b/opencsg.pro -SUBDIRS = src example +SUBDIRS = src diff --git a/src/src.pro b/src/src.pro ---- OpenCSG-1.4.0/src/src.pro 2014-09-15 16:25:33.000000000 -0400 -+++ OpenCSG-1.4.0-mac/src/src.pro 2014-09-15 18:17:09.000000000 -0400 -@@ -8,10 +8,9 @@ +index 9091251..598112a 100644 +--- a/src/src.pro ++++ b/src/src.pro +@@ -3,15 +3,14 @@ TARGET = opencsg + VERSION = 1.4.0 + + CONFIG += opengl warn_on release ++CONFIG += absolute_library_soname + INCLUDEPATH += ../include ../ + CONFIG -= qt LIBS += -lGLEW - DESTDIR = ../lib +-DESTDIR = ../lib -INSTALLDIR = /usr/local headers.files = ../include/opencsg.h - headers.path = $$INSTALLDIR/include +-headers.path = $$INSTALLDIR/include -target.path = /usr/local/lib -+target.path = $$INSTALLDIR/lib ++headers.path = $$DESTDIR/include ++target.path = $$DESTDIR/lib INSTALLS += target headers HEADERS = ../include/opencsg.h \ diff --git a/scripts/macosx-build-dependencies.sh b/scripts/macosx-build-dependencies.sh index 8359de50..52441051 100755 --- a/scripts/macosx-build-dependencies.sh +++ b/scripts/macosx-build-dependencies.sh @@ -427,7 +427,7 @@ build_opencsg() OPENCSG_EXTRA_FLAGS="x86" fi qmake -r QMAKE_CXXFLAGS+="-I$DEPLOYDIR/include" QMAKE_LFLAGS+="-L$DEPLOYDIR/lib" CONFIG+="x86_64 $OPENCSG_EXTRA_FLAGS" - INSTALL_ROOT=$DEPLOYDIR make install + make install } build_eigen()