Develop

.github/workflows/macos.yml

@@ -25,16 +25,17 @@ jobs:
     - name: Install Qt
       uses: jurplel/install-qt-action@v3
       with:
-        version: '5.14.2'
+        version: '6.5.*'
+        modules: qtwebsockets 
         target: 'desktop'
         arch: ${{ matrix.qt_version }}
         install-deps: 'true'
 
     - name: Install Third Party
       run: |
         brew install openal-soft 
-        brew install qt5
-        export Qt5_DIR=$(brew --prefix)/opt/qt5
+        brew install qt6
+        export Qt6_DIR=$(brew --prefix)/opt/qt6
 
 
     - name: Checkout submodules

.github/workflows/ubuntu.yml

@@ -26,8 +26,8 @@ jobs:
     - name: Prepare Environement
       run: |
         sudo apt-get update
-        sudo apt install qtbase5-dev --fix-missing
-        sudo apt-get install libqt5websockets5-dev --fix-missing
+        sudo apt install qt6-base-dev --fix-missing
+        sudo apt-get install libqt6websockets6-dev --fix-missing
         sudo apt-get install udev build-essential libpthread-stubs0-dev libgl1-mesa-dev libx11-dev libxrandr-dev libfreetype6-dev libglew-dev libjpeg-dev libxi-dev --fix-missing
         sudo apt-get install libxinerama-dev libxcursor-dev --fix-missing
         sudo apt-get install libudev-dev libglu1-mesa-dev libsecret-1-dev libnotify-dev --fix-missing

.github/workflows/windows.yml

@@ -29,10 +29,11 @@ jobs:
     - name: Install Qt
       uses: jurplel/install-qt-action@v3
       with:
-        version: '5.14.2'
+        version: '6.5.*'
         target: 'desktop'
-        arch: win32_msvc2017
+        arch: win64_msvc2019_64
         install-deps: 'true'
+        modules: qtwebsockets 
 
     - name: Install udev
       run: ${{ matrix.other_installer }}
@@ -43,7 +44,7 @@ jobs:
     - name: Configure CMake
       run: |
         echo 'Version : '  ${{ inputs.version }}
-        cmake -B ${{github.workspace}}\build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DCMAKE_INSTALL_PREFIX=${{github.workspace}}\install -AWin32 -DSUGARBOX_VERSION='${{ inputs.version }}'
+        cmake -B ${{github.workspace}}\build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DCMAKE_INSTALL_PREFIX=${{github.workspace}}\install -DSUGARBOX_VERSION='${{ inputs.version }}'
 
     - name: Build
       # Build your program with the given configuration
@@ -61,7 +62,7 @@ jobs:
     - name: Archive zip
       uses: actions/upload-artifact@v3
       with:
-          name: SugarboxV2Win32
+          name: SugarboxV2
           path: ${{github.workspace}}\build\*.7z
 
 

README.md

@@ -1,7 +1,7 @@
 
 ![Sugarbox V2](https://raw.githubusercontent.com/Tom1975/SugarboxV2/master/SplashScreen.bmp) 
 
-[![Windows](https://github.com/Tom1975/SugarboxV2/actions/workflows/cmake.yml/badge.svg)](https://github.com/Tom1975/SugarboxV2/actions/workflows/cmake.yml)
+[![Windows](https://github.com/Tom1975/SugarboxV2/actions/workflows/windows.yml/badge.svg)](https://github.com/Tom1975/SugarboxV2/actions/workflows/windows.yml)
 [![Ubuntu](https://github.com/Tom1975/SugarboxV2/actions/workflows/ubuntu.yml/badge.svg)](https://github.com/Tom1975/SugarboxV2/actions/workflows/ubuntu.yml)
 [![MacOS](https://github.com/Tom1975/SugarboxV2/actions/workflows/macos.yml/badge.svg)](https://github.com/Tom1975/SugarboxV2/actions/workflows/macos.yml)
 

Sugarbox/CMakeLists.txt

@@ -16,7 +16,7 @@ set(CMAKE_AUTOMOC ON)
 set(CMAKE_AUTORCC ON)
 set(CMAKE_AUTOUIC ON)
 
-set (SUGARBOX_VERSION "2.0.1" CACHE STRING "Version to build" FORCE)
+set (SUGARBOX_VERSION "2.0.2" CACHE STRING "Version to build" FORCE)
 
 MESSAGE (STATUS "Version :" ${SUGARBOX_VERSION})
 
@@ -32,31 +32,31 @@ set(CompilerFlags
 
         )
 
-find_package(Qt5 COMPONENTS Widgets WebSockets REQUIRED)
-qt5_add_resources(QRCS resources.qrc)
+find_package(Qt6 COMPONENTS Widgets WebSockets OpenGLWidgets OpenGL REQUIRED)
+qt6_add_resources(QRCS resources.qrc)
 
-if(Qt5_FOUND AND WIN32 AND TARGET Qt5::qmake AND NOT TARGET Qt5::windeployqt)
-    get_target_property(_qt5_qmake_location Qt5::qmake IMPORTED_LOCATION)
+if(Qt6_FOUND AND WIN32 AND TARGET Qt6::qmake AND NOT TARGET Qt6::windeployqt)
+    get_target_property(_qt6_qmake_location Qt6::qmake IMPORTED_LOCATION)
 
     execute_process(
-        COMMAND "${_qt5_qmake_location}" -query QT_INSTALL_PREFIX
+        COMMAND "${_qt6_qmake_location}" -query QT_INSTALL_PREFIX
         RESULT_VARIABLE return_code
-        OUTPUT_VARIABLE qt5_install_prefix
+        OUTPUT_VARIABLE qt6_install_prefix
         OUTPUT_STRIP_TRAILING_WHITESPACE
     )
 
-    set(imported_location "${qt5_install_prefix}/bin/windeployqt.exe")
+    set(imported_location "${qt6_install_prefix}/bin/windeployqt.exe")
 
     if(EXISTS ${imported_location})
-        add_executable(Qt5::windeployqt IMPORTED)
+        add_executable(Qt6::windeployqt IMPORTED)
 
-        set_target_properties(Qt5::windeployqt PROPERTIES
+        set_target_properties(Qt6::windeployqt PROPERTIES
             IMPORTED_LOCATION ${imported_location}
         )
     endif()
 endif()
 
-get_target_property(_qmake_executable Qt5::qmake IMPORTED_LOCATION)
+get_target_property(_qmake_executable Qt6::qmake IMPORTED_LOCATION)
 get_filename_component(_qt_bin_dir "${_qmake_executable}" DIRECTORY)
 find_program(WINDEPLOYQT_EXECUTABLE windeployqt HINTS "${_qt_bin_dir}")
 
@@ -146,8 +146,10 @@ set ( CMAKE_RUNTIME_OUTPUT_DIRECTORY_DEBUG ${CMAKE_INSTALL_BINDIR})
 set ( SUGARBOX_OUTPUT_DEBUG ${CMAKE_RUNTIME_OUTPUT_DIRECTORY_DEBUG})
 
 # Link test executable against gtest & gtest_main
-target_link_libraries(Sugarbox CPCCoreEmu zlibstatic OpenAL Qt5::Core Qt5::Widgets Qt5::WebSockets  ${LIB_EXT})
+target_link_libraries(Sugarbox CPCCoreEmu zlibstatic OpenAL Qt6::Core Qt6::Widgets Qt6::WebSockets Qt6::OpenGLWidgets  ${LIB_EXT})
+
 set_property(TARGET Sugarbox PROPERTY VS_DEBUGGER_WORKING_DIRECTORY "${CMAKE_INSTALL_BINDIR}")
+MESSAGE ( CMAKE_INSTALL_BINDIR = ${CMAKE_INSTALL_BINDIR})
 
 if (APPLE)
   target_link_libraries(Sugarbox "-framework OpenGL")
@@ -161,6 +163,7 @@ install ( DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/CART" DESTINATION .)
 install ( DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/CONF" DESTINATION .) 
 install ( DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/Resources" DESTINATION .) 
 
+set_property(TARGET Sugarbox PROPERTY VS_DEBUGGER_WORKING_DIRECTORY "${CMAKE_INSTALL_PREFIX}")
 
 # MSVC CPACK Qt dlls
 IF(MSVC)