From 3c7f297b8d2e0b273ed2d56d138ff0ae026a4032 Mon Sep 17 00:00:00 2001 From: John Fultz Date: Wed, 10 Dec 2014 02:22:51 -0600 Subject: Move data/ to MacOS/Resources/ in Mac bundle. This fixes the various issues with needing to code-sign data files. And simplifies the process of building and preparing to code sign considerably. --- quacker/quacker.pro | 33 +++++++++++++-------------------- 1 file changed, 13 insertions(+), 20 deletions(-) (limited to 'quacker/quacker.pro') diff --git a/quacker/quacker.pro b/quacker/quacker.pro index 2ee8cc2..246a261 100644 --- a/quacker/quacker.pro +++ b/quacker/quacker.pro @@ -1,18 +1,9 @@ TEMPLATE = app -VERSION = 0.98 +VERSION = 0.99 TARGET = Quackle DEPENDPATH += .. ../quackleio INCLUDEPATH += . .. -APP_ALPHABETS_FILES.files = $$files(../data/alphabets/*) -APP_LEXICA_FILES.files = $$files(../data/lexica/*) -APP_STRATEGY_FILEScswapr07.files = $$files(../data/strategy/cswapr07/*) -APP_STRATEGY_FILEScsw12.files = $$files(../data/strategy/csw12/*) -APP_STRATEGY_FILESods5.files = $$files(../data/strategy/ods5/*) -APP_STRATEGY_FILEStwl06.files = $$files(../data/strategy/twl06/*) -APP_STRATEGY_FILEStwl98.files = $$files(../data/strategy/twl98/*) -APP_THEME_FILES.files = $$files(../data/themes/*) - MOC_DIR = moc # enable/disable debug symbols @@ -31,6 +22,7 @@ QMAKE_LFLAGS_RELEASE += -L../lib/release -L../quackleio/lib/release QMAKE_LFLAGS_DEBUG += -L../lib/debug -L../quackleio/lib/debug LIBS += -lquackleio -lquackle +macx:LIBS += -framework CoreFoundation # Input HEADERS += *.h @@ -55,16 +47,17 @@ macx { QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.8 # copy data/ directory into app bundle - APP_ALPHABETS_FILES.path = Contents/MacOS/data/alphabets - APP_LEXICA_FILES.path = Contents/MacOS/data/lexica - APP_STRATEGY_FILEScswapr07.path = Contents/MacOS/data/strategy/cswapr07 - APP_STRATEGY_FILEScsw12.path = Contents/MacOS/data/strategy/csw12 - APP_STRATEGY_FILESods5.path = Contents/MacOS/data/strategy/ods5 - APP_STRATEGY_FILEStwl06.path = Contents/MacOS/data/strategy/twl06 - APP_STRATEGY_FILEStwl98.path = Contents/MacOS/data/strategy/twl98 - APP_THEME_FILES.path = Contents/MacOS/data/themes - - QMAKE_BUNDLE_DATA += APP_ALPHABETS_FILES APP_LEXICA_FILES APP_STRATEGY_FILEScswapr07 APP_STRATEGY_FILEScsw12 APP_STRATEGY_FILESods5 APP_STRATEGY_FILEStwl06 APP_STRATEGY_FILEStwl98 APP_THEME_FILES + APP_ALPHABETS_FILES.files = ../data/alphabets + APP_LEXICA_FILES.files = ../data/lexica + APP_STRATEGY_FILES.files = ../data/strategy + APP_THEME_FILES.files = ../data/themes + + APP_ALPHABETS_FILES.path = Contents/Resources/data + APP_LEXICA_FILES.path = Contents/Resources/data + APP_STRATEGY_FILES.path = Contents/Resources/data + APP_THEME_FILES.path = Contents/Resources/data + + QMAKE_BUNDLE_DATA += APP_ALPHABETS_FILES APP_LEXICA_FILES APP_STRATEGY_FILES APP_THEME_FILES # plist gymnastics QMAKE_POST_LINK += ;cp -n $$PWD/quacker.plist $${OUT_PWD}/$${TARGET}.app/Contents -- cgit v1.2.3