Fix steam plugin loading

ScreenPlay/app.cpp

@@ -209,11 +209,8 @@ void App::init()
     }
 
     qmlRegisterSingletonInstance("ScreenPlay", 1, 0, "ScreenPlay", this);
+    QGuiApplication::instance()->addLibraryPath(QGuiApplication::instance()->applicationDirPath());
 
-#ifdef Q_OS_MACOS
-    // Needed for macos .app files
-    m_mainWindowEngine->addPluginPath(QGuiApplication::instance()->applicationDirPath());
-#endif
     m_mainWindowEngine->load(QUrl(QStringLiteral("qrc:/ScreenPlay/main.qml")));
 
     // Must be called last to display a error message on startup by the qml engine

ScreenPlay/app.h

@@ -64,7 +64,6 @@
 #include <memory>
 #include <sentry.h>
 
-class ScreenPlayWorkshopPlugin;
 
 namespace ScreenPlay {
 
@@ -217,7 +216,6 @@ public slots:
     }
 
 private:
-    QPluginLoader m_workshopPlugin;
     QNetworkAccessManager m_networkAccessManager;
     QElapsedTimer m_continuousIntegrationMetricsTimer;
     std::unique_ptr<QQmlApplicationEngine> m_mainWindowEngine;

ScreenPlayWallpaper/CMakeLists.txt

@@ -71,6 +71,7 @@ target_link_libraries(
 if(APPLE)
     set_target_properties(${PROJECT_NAME} PROPERTIES MACOSX_BUNDLE TRUE MACOSX_BUNDLE_INFO_PLIST ${CMAKE_CURRENT_SOURCE_DIR}/Info.plist)
     target_link_libraries(${PROJECT_NAME} PRIVATE "-framework Cocoa")
+    file(MAKE_DIRECTORY ${CMAKE_BINARY_DIR}/bin/${PROJECT_NAME}.app/Contents/MacOS/)
     add_custom_command(
         TARGET ${PROJECT_NAME}
         POST_BUILD

ScreenPlayWorkshop/CMakeLists.txt

@@ -42,6 +42,7 @@ if(WIN32)
     set(STEAM_BIN "${STEAM_LIB_PATH}/win64/steam_api64.dll")
 elseif(APPLE)
     set(WORKSHOP_PLUGIN_DIR ${CMAKE_BINARY_DIR}/bin/ScreenPlay.app/Contents/MacOS/Workshop)
+    set(MACOS_FRAMEWORKS_DIR ${CMAKE_BINARY_DIR}/bin/ScreenPlay.app/Contents/Frameworks/)
     set(STEAM_LIB "${STEAM_LIB_PATH}/osx/libsteam_api.dylib")
     set(STEAM_BIN ${STEAM_LIB})
 elseif(UNIX)
@@ -50,38 +51,35 @@ elseif(UNIX)
     set(STEAM_BIN ${STEAM_LIB})
 endif()
 
+add_library(${PROJECT_NAME} SHARED ${SOURCES} ${HEADER})
+target_link_libraries(${PROJECT_NAME} PRIVATE Qt6::Core Qt6::Quick ${STEAM_LIB} ScreenPlayUtil SteamSDK)
+
 qt_add_qml_module(
     ${PROJECT_NAME}
-    OUTPUT_DIRECTORY ${WORKSHOP_PLUGIN_DIR}
+    OUTPUT_DIRECTORY
+    ${WORKSHOP_PLUGIN_DIR}
     URI "Workshop"
     SOURCES  ${SOURCES} ${HEADER}
     VERSION
     1.0)
 
-if(APPLE)
-    if(${SCREENPLAY_STEAM})
-        add_custom_command(
-            TARGET ${PROJECT_NAME}
-            POST_BUILD
-            COMMENT "Copying steam_appid.txt into ScreenPlay.app bundle. This is for development only!"
-            COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/steam_appid.txt
-                    ${CMAKE_BINARY_DIR}/bin/ScreenPlay.app/Contents/MacOS/)
 
-        add_custom_command(
+if(${SCREENPLAY_STEAM})
-            TARGET ${PROJECT_NAME}
+    if(APPLE)
-            POST_BUILD
+            file(MAKE_DIRECTORY ${WORKSHOP_PLUGIN_DIR})
-            COMMENT "Copying libsteam_api.dylib into ScreenPlay.app bundle."
+            file(MAKE_DIRECTORY ${MACOS_FRAMEWORKS_DIR})
-            COMMAND ${CMAKE_COMMAND} -E copy ${STEAM_LIB}
+
-                    ${WORKSHOP_PLUGIN_DIR})
+            configure_file(${CMAKE_CURRENT_SOURCE_DIR}/steam_appid.txt ${CMAKE_BINARY_DIR}/bin/ScreenPlay.app/Contents/MacOS/ COPYONLY)
-    endif()
+            configure_file(${STEAM_BIN} ${WORKSHOP_PLUGIN_DIR} COPYONLY)
-else()
+
-    if(${SCREENPLAY_STEAM})
+            set_target_properties(${PROJECT_NAME} PROPERTIES
-        configure_file(${CMAKE_CURRENT_SOURCE_DIR}/steam_appid.txt ${CMAKE_BINARY_DIR}/bin/steam_appid.txt COPYONLY)
+                     LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin/ScreenPlay.app/Contents/MacOS/Workshop)
-        configure_file(${STEAM_BIN} ${CMAKE_BINARY_DIR}/bin/ COPYONLY)
+    else()
+            configure_file(${CMAKE_CURRENT_SOURCE_DIR}/steam_appid.txt ${CMAKE_BINARY_DIR}/bin/steam_appid.txt COPYONLY)
+            configure_file(${STEAM_BIN} ${CMAKE_BINARY_DIR}/bin/ COPYONLY)
     endif()
 endif()
 
-
 # Needed by the automatic generated target missing includes
 # https://github.com/qt/qtdeclarative/blob/7a7064e14f094e843e1ee832cc927e86f887621a/src/qml/Qt6QmlMacros.cmake#L2042
 target_include_directories(${PROJECT_NAME} PUBLIC src/)

Tools/build.py

@@ -49,8 +49,7 @@ if not args.build_type:
 qt_version = "6.2.1"
 steam_build = "OFF"
 if args.steam_build:
-    if args.steam_build:
+    steam_build = "ON"
-        steam_build = "ON"
 
 print("Starting build with type %s. Qt Version: %s" %
       (args.build_type, qt_version))
@@ -142,9 +141,6 @@ execute(deploy_command.format(
     executable_file_ending=executable_file_ending))
 
 if platform == "darwin" and args.sign_build:
-    print("Remove workshop build folder (macos only).")
-    shutil.rmtree(build_folder + "/bin/workshop")
-
     execute("codesign --deep -f -s \"Developer ID Application: Elias Steurer (V887LHYKRH)\" --timestamp --options \"runtime\" -f --entitlements \"../../ScreenPlay/entitlements.plist\"  --deep \"ScreenPlay.app/\"")
     execute("codesign --deep -f -s \"Developer ID Application: Elias Steurer (V887LHYKRH)\" --timestamp --options \"runtime\" -f --deep \"ScreenPlayWallpaper.app/\"")
     execute("codesign --deep -f -s \"Developer ID Application: Elias Steurer (V887LHYKRH)\" --timestamp --options \"runtime\" -f --deep \"ScreenPlayWidget.app/\"")