63 lines
2.4 KiB
Diff
63 lines
2.4 KiB
Diff
|
diff --git i/goldendict.pro w/goldendict.pro
|
||
|
|
index 328dc20..5202a07 100644
|
||
|
|
--- i/goldendict.pro
|
||
|
|
+++ w/goldendict.pro
|
||
|
|
@@ -210,21 +210,18 @@ mac {
|
||
|
|
-llzo2
|
||
|
|
!CONFIG( no_ffmpeg_player ) {
|
||
|
|
LIBS += -lao \
|
||
|
|
- -lavutil-gd \
|
||
|
|
- -lavformat-gd \
|
||
|
|
- -lavcodec-gd
|
||
|
|
+ -lavutil \
|
||
|
|
+ -lavformat \
|
||
|
|
+ -lavcodec
|
||
|
|
}
|
||
|
|
- INCLUDEPATH = $${PWD}/maclibs/include
|
||
|
|
- LIBS += -L$${PWD}/maclibs/lib -framework AppKit -framework Carbon
|
||
|
|
+ LIBS += -framework AppKit -framework Carbon
|
||
|
|
OBJECTIVE_SOURCES += lionsupport.mm \
|
||
|
|
machotkeywrapper.mm \
|
||
|
|
macmouseover.mm \
|
||
|
|
speechclient_mac.mm
|
||
|
|
ICON = icons/macicon.icns
|
||
|
|
QMAKE_INFO_PLIST = myInfo.plist
|
||
|
|
- QMAKE_POST_LINK = mkdir -p GoldenDict.app/Contents/Frameworks & \
|
||
|
|
- cp -nR $${PWD}/maclibs/lib/ GoldenDict.app/Contents/Frameworks/ & \
|
||
|
|
- mkdir -p GoldenDict.app/Contents/MacOS/locale & \
|
||
|
|
+ QMAKE_POST_LINK = mkdir -p GoldenDict.app/Contents/MacOS/locale & \
|
||
|
|
cp -R locale/*.qm GoldenDict.app/Contents/MacOS/locale/ & \
|
||
|
|
mkdir -p GoldenDict.app/Contents/MacOS/help & \
|
||
|
|
cp -R $${PWD}/help/*.qch GoldenDict.app/Contents/MacOS/help/
|
||
|
|
@@ -232,15 +229,6 @@ mac {
|
||
|
|
CONFIG += zim_support
|
||
|
|
!CONFIG( no_chinese_conversion_support ) {
|
||
|
|
CONFIG += chinese_conversion_support
|
||
|
|
- CONFIG( x86 ) {
|
||
|
|
- QMAKE_POST_LINK += & mkdir -p GoldenDict.app/Contents/MacOS/opencc & \
|
||
|
|
- cp -R $${PWD}/opencc/*.json GoldenDict.app/Contents/MacOS/opencc/ & \
|
||
|
|
- cp -R $${PWD}/opencc/*.ocd GoldenDict.app/Contents/MacOS/opencc/
|
||
|
|
- } else {
|
||
|
|
- QMAKE_POST_LINK += & mkdir -p GoldenDict.app/Contents/MacOS/opencc & \
|
||
|
|
- cp -R $${PWD}/opencc/x64/*.json GoldenDict.app/Contents/MacOS/opencc/ & \
|
||
|
|
- cp -R $${PWD}/opencc/x64/*.ocd GoldenDict.app/Contents/MacOS/opencc/
|
||
|
|
- }
|
||
|
|
}
|
||
|
|
}
|
||
|
|
DEFINES += PROGRAM_VERSION=\\\"$$VERSION\\\"
|
||
|
|
diff --git i/tiff.cc w/tiff.cc
|
||
|
|
index e3cb8bf..9ff880f 100644
|
||
|
|
--- i/tiff.cc
|
||
|
|
+++ w/tiff.cc
|
||
|
|
@@ -6,8 +6,8 @@
|
||
|
|
#include "tiff.hh"
|
||
|
|
|
||
|
|
#if defined (Q_OS_MAC) || defined (Q_OS_WIN)
|
||
|
|
-#include "tiff/tiff.h"
|
||
|
|
-#include "tiff/tiffio.h"
|
||
|
|
+#include "tiff.h"
|
||
|
|
+#include "tiffio.h"
|
||
|
|
#else
|
||
|
|
#include "tiff.h"
|
||
|
|
#include "tiffio.h"
|