Mac: Build universal binary (#124)

tableau · Jul 28, 2022 · a843732 · a843732
1 parent 6597803
commit a843732
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/INSTALL.md b/INSTALL.md
@@ -37,7 +37,7 @@ export PATH="~/Qt/6.4.0/macos/bin":$PATH
 mkdir build-release && cd build-release
 
 # Build
-qmake -spec macx-clang CONFIG+=x86_64 -Wall ../src/tableau-log-viewer.pro
+qmake -spec macx-clang -Wall ../src/tableau-log-viewer.pro
 make
 
 # Make a self-contained app
@@ -99,7 +99,7 @@ git clone https://github.com/tableau/tableau-log-viewer.git
 # Make build directory and run QMake
 mkdir build-release
 cd build-release
-C:\Qt\6.4.0\msvc2019_64\bin\qmake -spec win32-msvc CONFIG+=x86_64 -Wall ../src/tableau-log-viewer.pro
+C:\Qt\6.4.0\msvc2019_64\bin\qmake -spec win32-msvc -Wall ../src/tableau-log-viewer.pro
 
 # Build it
 nmake

diff --git a/appveyor.yml b/appveyor.yml
@@ -7,5 +7,5 @@ build_script:
 - '"C:\Program Files\Microsoft Visual Studio\2022\Community\VC\Auxiliary\Build\vcvarsall.bat" x86_amd64'
 - mkdir %BUILDDIR%
 - cd /d %BUILDDIR%
-- C:\Qt\6.3.0\msvc2019_64\bin\qmake -spec win32-msvc CONFIG+=x86_64 -Wall ..\src\tableau-log-viewer.pro
+- C:\Qt\6.3.0\msvc2019_64\bin\qmake -spec win32-msvc -Wall ..\src\tableau-log-viewer.pro
 - nmake
diff --git a/src/tableau-log-viewer.pro b/src/tableau-log-viewer.pro
@@ -73,6 +73,9 @@ win32:RC_ICONS += ../resources/images/tlv.ico
 ICON = ../resources/images/tlv.icns
 
 CONFIG += c++17
+CONFIG += x86_64 
+
+QMAKE_APPLE_DEVICE_ARCHS = x86_64 arm64
 
 VERSION = 1.2.2.0
 DEFINES += APP_VERSION=\\\"$$VERSION\\\"