shithub: ft²

Info  •  Files  •  Log  •  Branches

Fix macOS compiler error

--- a/make-macos.sh

+++ b/make-macos.sh

@@ -36,7 +36,7 @@

 #

 function compile() {

     rm $1 &> /dev/null

-    clang $VERBOSE $CFLAGS -F /Library/Frameworks -g0 -DNDEBUG -DHAS_MIDI -D__MACOSX_CORE__ -DHAS_LIBFLAC -stdlib=libc++ src/rtmidi/*.cpp src/gfxdata/*.c src/mixer/*.c src/scopes/*.c src/modloaders/*.c src/smploaders/*.c src/libflac/*.c src/*.c -Winit-self -Wno-deprecated -Wextra -Wunused -mno-ms-bitfields -Wno-missing-field-initializers -Wswitch-default $LDFLAGS -L /Library/Frameworks -framework SDL2 -framework CoreMidi -framework CoreAudio -framework Cocoa -liconv -lpthread -lm -lstdc++ -o $1

+    clang $VERBOSE $CFLAGS -F /Library/Frameworks -g0 -DNDEBUG -DHAS_MIDI -D__MACOSX_CORE__ -DHAS_LIBFLAC -stdlib=libc++ src/rtmidi/*.cpp src/gfxdata/*.c src/mixer/*.c src/scopes/*.c src/modloaders/*.c src/smploaders/*.c src/libflac/*.c src/*.c -Winit-self -Wno-deprecated -Wextra -Wunused -mno-ms-bitfields -Wno-missing-field-initializers $LDFLAGS -L /Library/Frameworks -framework SDL2 -framework CoreMidi -framework CoreAudio -framework Cocoa -liconv -lpthread -lm -lstdc++ -o $1

     return $?

 }

--- a/src/rtmidi/RtMidi.cpp

+++ b/src/rtmidi/RtMidi.cpp

@@ -40,6 +40,8 @@

 #include "RtMidi.h"

 #include <sstream>

+// 8bb: removed as it bugs out compilation on macOS Sequoia 15.5

+/*

 #if defined(__MACOSX_CORE__)

   #if defined(TARGET_OS_IPHONE)

     #define AudioGetCurrentHostTime CAHostTimeBase::GetCurrentTime

@@ -46,6 +48,7 @@

     #define AudioConvertHostTimeToNanos CAHostTimeBase::ConvertToNanos

   #endif

 #endif

+*/

 // Default for Windows is to add an identifier to the port names; this

 // flag can be defined (e.g. in your project file) to disable this behaviour.

-- 

⑨