Merge branch 'master' of https://github.com/uowuo/abaddon

CMakeLists.txt

@@ -150,6 +150,13 @@ if (ENABLE_VOICE)
     target_link_libraries(abaddon PkgConfig::libsodium)
 
     target_link_libraries(abaddon ${CMAKE_DL_LIBS})
+
+    if(APPLE)
+	    target_link_libraries(abaddon "-framework CoreFoundation")
+	    target_link_libraries(abaddon "-framework CoreAudio")
+	    target_link_libraries(abaddon "-framework AudioToolbox")
+    endif()
+    
 endif ()
 
 if (${ENABLE_NOTIFICATION_SOUNDS})

src/audio/ma_impl.cpp

@@ -1,4 +1,7 @@
 #ifdef WITH_MINIAUDIO
     #define MINIAUDIO_IMPLEMENTATION
+    #ifdef __APPLE__
+        #define MA_NO_RUNTIME_LINKING
+    #endif
     #include <miniaudio.h>
 #endif

src/components/chatinput.cpp

@@ -41,9 +41,15 @@ bool ChatInputText::ProcessKeyPress(GdkEventKey *event) {
         return true;
     }
 
+#ifdef __APPLE__
+    if ((event->state & GDK_MOD2_MASK) && event->keyval == GDK_KEY_v) {
+        return CheckHandleClipboardPaste();
+    }
+#else
     if ((event->state & GDK_CONTROL_MASK) && event->keyval == GDK_KEY_v) {
         return CheckHandleClipboardPaste();
     }
+#endif
 
     if (event->keyval == GDK_KEY_Return) {
         if (event->state & GDK_SHIFT_MASK)