diff --git a/.github/workflows/macos-homebrew.yml b/.github/workflows/macos-homebrew.yml index 22829dc8..a5081f6b 100644 --- a/.github/workflows/macos-homebrew.yml +++ b/.github/workflows/macos-homebrew.yml @@ -74,7 +74,11 @@ jobs: brew install libtiff brew install libvorbis brew install hunspell - + wget ftp://ftp.sra.co.jp/pub/misc/eb/eb-4.4.3.tar.bz2 + tar xvjf eb-4.4.3.tar.bz2 + cd eb-4.4.3 && ./configure && make -j 8 && sudo make install && cd .. + #brew install qt # or use official offline installer + brew install xz lzo brew install pkg-config brew install create-dmg - name: compile diff --git a/.github/workflows/macos-m1-PR-check.yml b/.github/workflows/macos-m1-PR-check.yml index 0c087a46..ebbc16b7 100644 --- a/.github/workflows/macos-m1-PR-check.yml +++ b/.github/workflows/macos-m1-PR-check.yml @@ -67,7 +67,11 @@ jobs: brew install libtiff brew install libvorbis --force brew install hunspell - + wget ftp://ftp.sra.co.jp/pub/misc/eb/eb-4.4.3.tar.bz2 + tar xvjf eb-4.4.3.tar.bz2 + cd eb-4.4.3 && ./configure && make -j 8 && sudo make install && cd .. + #brew install qt # or use official offline installer + brew install xz lzo brew install pkg-config - name: compile diff --git a/.github/workflows/macos-m1.yml b/.github/workflows/macos-m1.yml index 7c6ecd21..7e2d85ac 100644 --- a/.github/workflows/macos-m1.yml +++ b/.github/workflows/macos-m1.yml @@ -72,13 +72,17 @@ jobs: brew install libtiff brew install libvorbis --force brew install hunspell - + wget ftp://ftp.sra.co.jp/pub/misc/eb/eb-4.4.3.tar.bz2 + tar xvjf eb-4.4.3.tar.bz2 + cd eb-4.4.3 && ./configure && make -j 8 && sudo make install && cd .. + #brew install qt # or use official offline installer + brew install xz lzo brew install pkg-config brew install create-dmg - name: compile run: | qmake CONFIG+=release CONFIG+=no_macos_universal CONFIG+=zim_support CONFIG+=no_extra_tiff_handler #CONFIG+=no_epwing_support # CONFIG+=no_ffmpeg_player #CONFIG+=no_qtmultimedia_player - make + make -j 8 # # 打包 # - name: package # run: | diff --git a/btreeidx.cc b/btreeidx.cc index 62f7ad8f..cb1ed783 100644 --- a/btreeidx.cc +++ b/btreeidx.cc @@ -23,12 +23,7 @@ // speed improvements. #ifdef __BTREE_USE_LZO - -#ifndef INCLUDE_LIBRARY_PATH -#include -#else #include -#endif namespace { struct __LzoInit diff --git a/goldendict.pro b/goldendict.pro index 8e12b723..7b253c59 100644 --- a/goldendict.pro +++ b/goldendict.pro @@ -64,10 +64,6 @@ DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0x050F00 DEFINES += MAKE_FFMPEG_PLAYER } -!CONFIG( no_macos_universal ) { - DEFINES += INCLUDE_LIBRARY_PATH -} - CONFIG += exceptions \ rtti \ stl \ @@ -202,13 +198,11 @@ mac { # You will need to use Xcode 3 and Qt Carbon SDK # if you want the support for PowerPC and/or Mac OS X 10.4 # CONFIG += x86 x86_64 ppc -!CONFIG( no_macos_universal ) { LIBS = -lz \ -lbz2 \ -lvorbisfile \ -lvorbis \ -logg \ - -lhunspell \ -llzo2 !CONFIG( no_ffmpeg_player ) { @@ -218,31 +212,20 @@ mac { -lavformat \ -lavcodec } - QT_CONFIG -= no-pkg-config + QT_CONFIG -= no-pkg-config CONFIG += link_pkgconfig + +!CONFIG( no_macos_universal ) { + DEFINES += INCLUDE_LIBRARY_PATH + LIBS+= -lhunspell INCLUDEPATH = $${PWD}/maclibs/include LIBS += -L$${PWD}/maclibs/lib -framework AppKit -framework Carbon } else{ - QT_CONFIG -= no-pkg-config - CONFIG += link_pkgconfig - PKGCONFIG += vorbisfile \ - vorbis \ - ogg \ - lzo2 hunspell - !CONFIG( no_ffmpeg_player ) { - PKGCONFIG += ao \ - libavutil \ - libavformat \ - libavcodec \ - libswresample \ - } - + PKGCONFIG += hunspell INCLUDEPATH = /opt/homebrew/include /usr/local/include - INCLUDEPATH += $${PWD}/maclibs/include/ LIBS += -L/opt/homebrew/lib -L/usr/local/lib -framework AppKit -framework Carbon - LIBS += -L$${PWD}/maclibs/lib/ } OBJECTIVE_SOURCES += lionsupport.mm \ diff --git a/mdictparser.cc b/mdictparser.cc index 14926b4b..952d3735 100644 --- a/mdictparser.cc +++ b/mdictparser.cc @@ -22,11 +22,8 @@ #include #include -#ifdef INCLUDE_LIBRARY_PATH #include -#else -#include -#endif + #include #include #include