Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Lower minimal macOS version #770

Merged
merged 1 commit into from
Nov 16, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/MediaConch_Checks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ jobs:
run: |
cd Project/Qt
export PATH=/usr/local/opt/qt@5/bin:$PATH
./prepare INCLUDEPATH+=/usr/local/include CONFIG+=c++11 -after QMAKE_MACOSX_DEPLOYMENT_TARGET=10.9
./prepare INCLUDEPATH+=/usr/local/include CONFIG+=c++11 -after QMAKE_MACOSX_DEPLOYMENT_TARGET=10.9 QMAKE_LFLAGS-=-Wl,-ld_classic
- name: Build GUI
run: |
cd Project/Qt
Expand Down
4 changes: 2 additions & 2 deletions Project/Mac/Info-ns.plist
Original file line number Diff line number Diff line change
Expand Up @@ -31,15 +31,15 @@
<key>DTSDKBuild</key>
<string>10K549</string>
<key>DTSDKName</key>
<string>macosx10.13</string>
<string>macosx10.10</string>
<key>DTXcode</key>
<string>0420</string>
<key>DTXcodeBuild</key>
<string>4C199</string>
<key>LSApplicationCategoryType</key>
<string>public.app-category.utilities</string>
<key>LSMinimumSystemVersion</key>
<string>10.13</string>
<string>10.10</string>
<key>NSHumanReadableCopyright</key>
<string>(c) MediaArea.net</string>
<key>NSMainNibFile</key>
Expand Down
4 changes: 2 additions & 2 deletions Project/Mac/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -31,15 +31,15 @@
<key>DTSDKBuild</key>
<string>10K549</string>
<key>DTSDKName</key>
<string>macosx10.13</string>
<string>macosx10.10</string>
<key>DTXcode</key>
<string>0420</string>
<key>DTXcodeBuild</key>
<string>4C199</string>
<key>LSApplicationCategoryType</key>
<string>public.app-category.utilities</string>
<key>LSMinimumSystemVersion</key>
<string>10.13</string>
<string>10.10</string>
<key>NSHumanReadableCopyright</key>
<string>(c) MediaArea.net</string>
<key>NSMainNibFile</key>
Expand Down
6 changes: 4 additions & 2 deletions Project/Qt/MediaConch.pro
Original file line number Diff line number Diff line change
Expand Up @@ -345,13 +345,15 @@ contains(NO_LIBEVENT, yes|1) {
}

macx:contains(MACSTORE, yes|1) {
QMAKE_LFLAGS+=-Wl,-ld_classic
QMAKE_CFLAGS += -gdwarf-2
QMAKE_CXXFLAGS += -gdwarf-2
QMAKE_INFO_PLIST = ../Mac/Info.plist
QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.13
QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.10
} else:macx {
QMAKE_LFLAGS+=-Wl,-ld_classic
QMAKE_INFO_PLIST = ../Mac/Info-ns.plist
QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.13
QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.10
}

LIBS += -lz
Expand Down
Loading