diff options
author | Marius Kintel <marius@kintel.net> | 2012-01-14 00:18:09 (GMT) |
---|---|---|
committer | Marius Kintel <marius@kintel.net> | 2012-01-14 00:18:09 (GMT) |
commit | 81f2d0a6104428a5fa59a47e6e5c8d662960579e (patch) | |
tree | 5ef094f9ff0bbe0ff0d64c59fe20509a8a0282b5 | |
parent | 1cec18d9c06a3e3f86da2353865038b0aec39928 (diff) |
Updated patch to reflect recent changes in build system
-rw-r--r-- | patches/OpenCSG-1.3.2-MacOSX-port.patch | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/patches/OpenCSG-1.3.2-MacOSX-port.patch b/patches/OpenCSG-1.3.2-MacOSX-port.patch index 3d81dc4..ba4bcc4 100644 --- a/patches/OpenCSG-1.3.2-MacOSX-port.patch +++ b/patches/OpenCSG-1.3.2-MacOSX-port.patch @@ -45,14 +45,14 @@ index 4843a12..04d3f4d 100644 +INCLUDEPATH += ../include ../ + +# Optionally specify deployment location using the -+# MACOSX_DEPLOY_DIR env. variable -+DEPLOYDIR = $$(MACOSX_DEPLOY_DIR) ++# OPENSCAD_LIBRARIES env. variable ++OPENSCAD_LIBDIR = $$(OPENSCAD_LIBRARIES) + -+!isEmpty(DEPLOYDIR) { ++!isEmpty(OPENSCAD_LIBDIR) { + message("Deploy") -+ INSTALLDIR = $$(MACOSX_DEPLOY_DIR) -+ INCLUDEPATH += $$(MACOSX_DEPLOY_DIR)/include -+ LIBS += -L$$(MACOSX_DEPLOY_DIR)/lib -lGLEW ++ INSTALLDIR = $$OPENSCAD_LIBDIR ++ INCLUDEPATH += $$OPENSCAD_LIBDIR/include ++ LIBS += -L$$OPENSCAD_LIBDIR/lib -lGLEW + CONFIG += absolute_library_soname + headers.files = ../include/opencsg.h + headers.path = $$INSTALLDIR/include |