Skip to content

Add Apple Silicon support #1

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.

Sign up for GitHub

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

Open
mbradley612 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Add Apple Silicon support #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 2 additions & 0 deletions pkg/Info.plist
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,5 +18,7 @@
<string>org.speedcrunch</string>
<key>CFBundleShortVersionString</key>
<string>0.12</string>
<key>LSMinimumSystemVersion</key>
<string>10.14</string>
</dict>
</plist>
9 changes: 9 additions & 0 deletions src/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,15 @@ add_compile_options(-Wall -pedantic)

if(APPLE)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -stdlib=libc++")

option(UNIVERSAL_SPEEDCRUNCH "Build universal binary for both Intel and Apple Silicon" OFF)
if(UNIVERSAL_SPEEDCRUNCH)
set(CMAKE_OSX_ARCHITECTURES "x86_64;arm64" CACHE STRING " architectures" FORCE)
endif()

if(NOT CMAKE_OSX_DEPLOYMENT_TARGET)
set(CMAKE_OSX_DEPLOYMENT_TARGET "10.14" CACHE STRING "Minimum macOS version")
endif()
endif()

set(speedcrunch_VERSION "master")
Expand Down
5 changes: 5 additions & 0 deletions src/math/rational.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,4 +66,9 @@ class Rational
double toDouble() const;
};

inline unsigned int qHash(const Rational& r)
{
return qHash(r.numerator()) ^ qHash(r.denominator());
}

#endif // RATIONAL_H
2 changes: 1 addition & 1 deletion src/speedcrunch.pro
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ macx {
ICON = resources/speedcrunch.icns
QMAKE_INFO_PLIST = ../pkg/Info.plist
TARGET = SpeedCrunch
QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.8
QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.14
QMAKE_CXXFLAGS += -std=c++17
}

Expand Down