aly/servatrice
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

mac fixes

Browse source
This commit is contained in:
Max-Wilhelm Bruker 2012-04-27 00:39:34 +02:00
parent 61f5cd478d
commit 875610e1b3
4 changed files with 15 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
cockatrice/CMakeLists.txt
View file

@ -156,6 +156,9 @@ endif (UNIX)
if (WIN32) if (WIN32)
set_source_files_properties(src/main.cpp PROPERTIES COMPILE_FLAGS -DTRANSLATION_PATH=\\"translations\\") set_source_files_properties(src/main.cpp PROPERTIES COMPILE_FLAGS -DTRANSLATION_PATH=\\"translations\\")
endif (WIN32) endif (WIN32)
if (APPLE)
set_source_files_properties(src/main.cpp PROPERTIES COMPILE_FLAGS -DTRANSLATION_PATH=\\"../../../translations\\")
endif (APPLE)
set(cockatrice_RESOURCES cockatrice.qrc) set(cockatrice_RESOURCES cockatrice.qrc)
set(cockatrice_TS set(cockatrice_TS
@ -179,9 +182,9 @@ if(WIN32)
endif(WIN32) endif(WIN32)
if(APPLE) if(APPLE)
set(OSX_ICON_FILES ${CMAKE_CURRENT_SOURCE_DIR}/resources/appicon.icns) set(MACOSX_BUNDLE_ICON_FILE appicon.icns)
set_source_files_properties(${OSX_ICON_FILES} PROPERTIES MACOSX_PACKAGE_LOCATION Resources) set_source_files_properties(${CMAKE_CURRENT_SOURCE_DIR}/resources/appicon.icns PROPERTIES MACOSX_PACKAGE_LOCATION Resources)
set( cockatrice_SOURCES ${cockatrice_SOURCES} ${OSX_ICON_FILES} ) set(cockatrice_SOURCES ${cockatrice_SOURCES} ${CMAKE_CURRENT_SOURCE_DIR}/resources/appicon.icns)
ENDIF(APPLE) ENDIF(APPLE)
SET(QT_USE_QTNETWORK TRUE) SET(QT_USE_QTNETWORK TRUE)
SET(QT_USE_QTSCRIPT TRUE) SET(QT_USE_QTSCRIPT TRUE)

7
cockatrice/src/main.cpp
View file

@ -49,9 +49,9 @@ SoundEngine *soundEngine;
const QString translationPrefix = "cockatrice"; const QString translationPrefix = "cockatrice";
#ifdef TRANSLATION_PATH #ifdef TRANSLATION_PATH
const QString translationPath = TRANSLATION_PATH; QString translationPath = TRANSLATION_PATH;
#else #else
const QString translationPath = QString(); QString translationPath = QString();
#endif #endif
void myMessageOutput(QtMsgType /*type*/, const char *msg) void myMessageOutput(QtMsgType /*type*/, const char *msg)
@ -69,7 +69,8 @@ void installNewTranslator()
qtTranslator->load("qt_" + lang, QLibraryInfo::location(QLibraryInfo::TranslationsPath)); qtTranslator->load("qt_" + lang, QLibraryInfo::location(QLibraryInfo::TranslationsPath));
qApp->installTranslator(qtTranslator); qApp->installTranslator(qtTranslator);
if (!translationPath.startsWith("/"))
translationPath.prepend(qApp->applicationDirPath() + "/");
if (!settingsCache->getCustomTranslationFile().isEmpty()) if (!settingsCache->getCustomTranslationFile().isEmpty())
translator->load(settingsCache->getCustomTranslationFile()); translator->load(settingsCache->getCustomTranslationFile());
else else

2
cockatrice/src/main.h
View file

@ -9,7 +9,7 @@ extern CardDatabase *db;
extern QTranslator *translator; extern QTranslator *translator;
extern const QString translationPrefix; extern const QString translationPrefix;
extern const QString translationPath; extern QString translationPath;
void installNewTranslator(); void installNewTranslator();

6
prepareMacRelease.sh
View file

@ -3,8 +3,8 @@
FRAMEWORKS="Core Gui Multimedia Network Svg Xml Script" FRAMEWORKS="Core Gui Multimedia Network Svg Xml Script"
DATE=`date '+%Y%m%d'` DATE=`date '+%Y%m%d'`
#QTDIR="/Users/brukie/QtSDK/Desktop/Qt/474/gcc" #QTDIR="/Users/brukie/QtSDK/Desktop/Qt/474/gcc"
QTLIB="/Users/brukie/qt/lib" QTLIB="/Users/brukie/qt_leopard/lib"
QTPLUGINS="/Users/brukie/qt/plugins" QTPLUGINS="/Users/brukie/qt_leopard/plugins"
PROTOBUF="/Users/brukie/protobuf" PROTOBUF="/Users/brukie/protobuf"
DIR=cockatrice_mac_$DATE DIR=cockatrice_mac_$DATE
if [ -d $DIR ]; then echo "delete old dir first"; exit 1; fi if [ -d $DIR ]; then echo "delete old dir first"; exit 1; fi
@ -15,6 +15,8 @@ cp -R build/cockatrice/cockatrice.app $DIR
cp -R build/oracle/oracle.app $DIR cp -R build/oracle/oracle.app $DIR
mkdir $DIR/Frameworks mkdir $DIR/Frameworks
cp -R sounds zonebg $DIR cp -R sounds zonebg $DIR
mkdir $DIR/translations
cp build/cockatrice/*.qm $DIR/translations
cp -R $QTPLUGINS $DIR/PlugIns cp -R $QTPLUGINS $DIR/PlugIns
for f in $FRAMEWORKS; do for f in $FRAMEWORKS; do
cp -R $QTLIB/Qt"$f".framework $DIR/Frameworks cp -R $QTLIB/Qt"$f".framework $DIR/Frameworks