Merge branch 'main' into lulumumu9999/main

engine/include/oakengine/export.h

@@ -30,7 +30,11 @@
  * is still built with default symbol visibility, so the legacy C++ symbols
  * remain exported alongside the C ABI.
  */
-#if defined(_WIN32) || defined(__CYGWIN__)
+#if defined(OAKENGINE_STATIC)
+  /* Internal consumers link the engine object files directly (oakengine-obj)
+     instead of the shared library; no dllimport/dllexport is wanted. */
+  #define OAKENGINE_API
+#elif defined(_WIN32) || defined(__CYGWIN__)
   #ifdef OAKENGINE_BUILD
     #define OAKENGINE_API __declspec(dllexport)
   #else

engine/include/oakengine/serializer.h

@@ -251,7 +251,6 @@ OAKENGINE_API int oakengine_clipboard_foreach_connection(
 }
 #include <QtCore/qmetatype.h>
 Q_DECLARE_OPAQUE_POINTER(OakEngineClipboard *)
-Q_DECLARE_OPAQUE_POINTER(OakEngineMarker *)
 #endif
 
 #endif /* OAKENGINE_SERIALIZER_H */

engine/include/oakengine/timeline.h

@@ -1316,6 +1316,7 @@ oakengine_clip_get_connected_viewer(const OakEngineBlock *clip);
 Q_DECLARE_OPAQUE_POINTER(OakEngineBlock *)
 Q_DECLARE_OPAQUE_POINTER(OakEngineClip *)
 Q_DECLARE_OPAQUE_POINTER(OakEngineMarkerList *)
+Q_DECLARE_OPAQUE_POINTER(OakEngineMarker *)
 Q_DECLARE_OPAQUE_POINTER(OakEngineWorkarea *)
 Q_DECLARE_OPAQUE_POINTER(OakEngineTrack *)
 Q_DECLARE_OPAQUE_POINTER(OakEngineTrackList *)