arm64-build

neuromore · Apr 30, 2024 · c236f35 · c236f35
1 parent d3d8a69
commit c236f35
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 2 deletions.
diff --git a/deps/build/make/platforms/detect-host.mk b/deps/build/make/platforms/detect-host.mk
@@ -97,3 +97,5 @@ endif
 
 JAR   = "$(JAVA_HOME)/bin/jar$(DETECTED_EXTBIN)"
 JAVAC = "$(JAVA_HOME)/bin/javac$(DETECTED_EXTBIN)"
+
+DETECTED_ARCH=arm64
diff --git a/deps/src/qt-multimediaplugins/avfoundation/camera/avfcamerautility.mm b/deps/src/qt-multimediaplugins/avfoundation/camera/avfcamerautility.mm
@@ -85,7 +85,7 @@ inline bool qt_area_sane(const QSize &size)
            && std::numeric_limits<int>::max() / size.width() >= size.height();
 }
 
-struct ResolutionPredicate : std::binary_function<AVCaptureDeviceFormat *, AVCaptureDeviceFormat *, bool>
+struct ResolutionPredicate : std::__binary_function<AVCaptureDeviceFormat *, AVCaptureDeviceFormat *, bool>
 {
     bool operator() (AVCaptureDeviceFormat *f1, AVCaptureDeviceFormat *f2)const
     {
@@ -96,7 +96,7 @@ bool operator() (AVCaptureDeviceFormat *f1, AVCaptureDeviceFormat *f2)const
     }
 };
 
-struct FormatHasNoFPSRange : std::unary_function<AVCaptureDeviceFormat *, bool>
+struct FormatHasNoFPSRange : std::__unary_function<AVCaptureDeviceFormat *, bool>
 {
     bool operator() (AVCaptureDeviceFormat *format)
     {

diff --git a/pat-notes.md b/pat-notes.md
@@ -0,0 +1,13 @@
+## building
+
+make MODE=release TARGET_OS=osx TARGET_ARCH=arm64 -j8 clean
+make MODE=release TARGET_OS=osx TARGET_ARCH=arm64 -j8 Dependencies-clean
+make MODE=release TARGET_OS=osx TARGET_ARCH=arm64 -j8 BRANDING=neuromore Dependencies
+make MODE=release TARGET_OS=osx TARGET_ARCH=arm64 -j8 BRANDING=neuromore
+
+
+
+make MODE=debug TARGET_OS=osx TARGET_ARCH=arm64 BRANDING=neuromore Dependencies
+make MODE=debug TARGET_OS=osx TARGET_ARCH=arm64 BRANDING=neuromore
+
+
Original file line number	Diff line number	Diff line change
Expand Up		@@ -97,3 +97,5 @@ endif

		JAR = "$(JAVA_HOME)/bin/jar$(DETECTED_EXTBIN)"
		JAVAC = "$(JAVA_HOME)/bin/javac$(DETECTED_EXTBIN)"

		DETECTED_ARCH=arm64