Merge pull request #18 from Blackflexxy/master

darealshinji · web-flow · commit 53b2068eeff9 · 2024-05-07T23:36:04.000+02:00
Better fix for building on mac
diff --git a/delaycut.pro b/delaycut.pro
@@ -44,6 +44,9 @@ win32-msvc* {
 
 macx {
   ICON = src/icon.icns
+  #If you are using qt from brew, remove line below
+  QMAKE_APPLE_DEVICE_ARCHS = x86_64 arm64
+  QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.15
 }
 
 QMAKE_CLEAN += qrc_icon_ico.cpp \
diff --git a/src/dc_types.h b/src/dc_types.h
@@ -17,13 +17,6 @@
     along with DelayCut.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-/*fix apple sillicon build*/
-
-#ifdef __APPLE__
-#define stat64 stat
-#define fstat64 fstat
-#endif
-
 #ifndef DC_TYPES_H
 #define DC_TYPES_H
 
diff --git a/src/delayac3.cpp b/src/delayac3.cpp
@@ -30,6 +30,15 @@
 #include <QFileInfo>
 #include <QThread>
 
+/* Probably better fix for building on mac */
+#if defined(__APPLE__)
+#include <sys/cdefs.h>
+#endif
+#if defined(__APPLE__) && defined(_DARWIN_FEATURE_ONLY_64_BIT_INODE)
+#define stat64 stat
+#define fstat64 fstat
+#endif
+
 #define NUMREAD 8
 #define MAXBYTES_PER_FRAME 2*1280
 #define MAXLOGERRORS 100

Original file line number	Diff line number	Diff line change
`@@ -44,6 +44,9 @@ win32-msvc* {`
`44`	`44`
`45`	`45`	`macx {`
`46`	`46`	`ICON = src/icon.icns`
	`47`	`+ #If you are using qt from brew, remove line below`
	`48`	`+ QMAKE_APPLE_DEVICE_ARCHS = x86_64 arm64`
	`49`	`+ QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.15`
`47`	`50`	`}`
`48`	`51`
`49`	`52`	`QMAKE_CLEAN += qrc_icon_ico.cpp \`