Fix for building on Mac OS X.

--HG--
branch : release
This commit is contained in:
Roman Telezhynskyi 2015-04-29 15:10:26 +03:00
parent e0bd213cee
commit a233d37317

View File

@ -242,9 +242,10 @@ unix{
# Path to resources in app bundle # Path to resources in app bundle
RESOURCES_DIR = "Contents/Resources" RESOURCES_DIR = "Contents/Resources"
FRAMEWORKS_DIR = "Contents/Frameworks" FRAMEWORKS_DIR = "Contents/Frameworks"
MACOS_DIR = "Contents/MacOS"
# On macx we will use app bundle. Bundle doesn't need bin directory inside. # On macx we will use app bundle. Bundle doesn't need bin directory inside.
# See issue #166: Creating OSX Homebrew (Mac OS X package manager) formula. # See issue #166: Creating OSX Homebrew (Mac OS X package manager) formula.
target.path = $$PREFIX/ target.path = $$MACOS_DIR
# Copy in bundle translation files. # Copy in bundle translation files.
exists($${TRANSLATIONS_PATH}/valentina_ru_RU.qm){ exists($${TRANSLATIONS_PATH}/valentina_ru_RU.qm){
@ -342,8 +343,8 @@ unix{
libraries.files += $${OUT_PWD}/../libs/vpropertyexplorer/$${DESTDIR}/libvpropertyexplorer.1.dylib libraries.files += $${OUT_PWD}/../libs/vpropertyexplorer/$${DESTDIR}/libvpropertyexplorer.1.dylib
# Utility pdftops need for saving a layout image to PS and EPS formates. # Utility pdftops need for saving a layout image to PS and EPS formates.
xpdf.path = $$PREFIX/ xpdf.path = $$MACOS_DIR
xpdf.files += $${PWD}../../dist/macx/bin64/pdftops xpdf.files += $${PWD}/../../dist/macx/bin64/pdftops
# logo on macx. # logo on macx.
ICON = ../../dist/Valentina.icns ICON = ../../dist/Valentina.icns