vitalif
/
openscad
mirror of https://github.com/vitalif/openscad
1
0
Fork 0
Code Issues Releases Wiki Activity

Updated OpenCSG build to correctly set the install name

master
Marius Kintel 2014-09-30 15:27:24 -04:00
parent f98d565714
commit e00292b445
2 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
patches/OpenCSG-1.4.0-MacOSX-port.patch
View File

@ -1,4 +1,5 @@
diff --git a/opencsg.pro b/opencsg.pro diff --git a/opencsg.pro b/opencsg.pro
index b56e622..5cf2d6d 100644
--- a/opencsg.pro --- a/opencsg.pro
+++ b/opencsg.pro +++ b/opencsg.pro
@@ -1,2 +1,2 @@ @@ -1,2 +1,2 @@
@ -6,17 +7,25 @@ diff --git a/opencsg.pro b/opencsg.pro
-SUBDIRS = src example -SUBDIRS = src example
+SUBDIRS = src +SUBDIRS = src
diff --git a/src/src.pro b/src/src.pro 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 index 9091251..598112a 100644
+++ OpenCSG-1.4.0-mac/src/src.pro 2014-09-15 18:17:09.000000000 -0400 --- a/src/src.pro
@@ -8,10 +8,9 @@ +++ 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 LIBS += -lGLEW
DESTDIR = ../lib -DESTDIR = ../lib
-INSTALLDIR = /usr/local -INSTALLDIR = /usr/local
headers.files = ../include/opencsg.h headers.files = ../include/opencsg.h
headers.path = $$INSTALLDIR/include -headers.path = $$INSTALLDIR/include
-target.path = /usr/local/lib -target.path = /usr/local/lib
+target.path = $$INSTALLDIR/lib +headers.path = $$DESTDIR/include
+target.path = $$DESTDIR/lib
INSTALLS += target headers INSTALLS += target headers
HEADERS = ../include/opencsg.h \ HEADERS = ../include/opencsg.h \

2
scripts/macosx-build-dependencies.sh
View File

@ -427,7 +427,7 @@ build_opencsg()
OPENCSG_EXTRA_FLAGS="x86" OPENCSG_EXTRA_FLAGS="x86"
fi fi
qmake -r QMAKE_CXXFLAGS+="-I$DEPLOYDIR/include" QMAKE_LFLAGS+="-L$DEPLOYDIR/lib" CONFIG+="x86_64 $OPENCSG_EXTRA_FLAGS" 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() build_eigen()