diff --git a/README.md b/README.md index 2a6e7c7..97c9024 100644 --- a/README.md +++ b/README.md @@ -33,14 +33,14 @@ To clone the ishape demo application in your locale repository, do ## Building Cyclone DDS iShapes -From now one, we assume Cylone DDS or Vortex Opensplice and QT5 are installed +From now one, we assume Cylone DDS or Vortex Opensplice and QT6 are installed ### Building on Linux/MacOS with cmake -To build the iShapes demo you need to have installed a QT5 development environment. The following QT5 environment variables has to be set in order to build and run ishapes: +To build the iShapes demo you need to have installed a QT6 development environment. The following QT6 environment variables has to be set in order to build and run ishapes: - $ export LD_LIBRARY_PATH=$LD_LIBRARY_PATH: + $ export LD_LIBRARY_PATH=$LD_LIBRARY_PATH: - Where is the installation directory of your QT5 installation , e.g (/usr/lib/x86_64_linux-gnu/qt5) + Where is the installation directory of your QT6 installation , e.g (/usr/lib/x86_64_linux-gnu/qt6) If Cyclone DDS is not installed on the linux default locations ( i.e /usr/lib , /usr/bin ...) you need to update further the LD_LIBRARY_PATH and the PATH env variables. This is described below: @@ -64,13 +64,13 @@ To start the real build process go to your iShape-demo root directory and follow ### Building on Windows with cmake -To build the demo you need to have installed a QT5 development environment. The following QT5 environment variables has to be set in order to build and run ishapes: +To build the demo you need to have installed a QT6 development environment. The following QT6 environment variables has to be set in order to build and run ishapes: - C:\> set QTDIR= - C:\> set QT_PLUGIN_PATH=\plugins - C:\> set PATH=\bin;%PATH% + C:\> set QTDIR= + C:\> set QT_PLUGIN_PATH=\plugins + C:\> set PATH=\bin;%PATH% - Where is the installation directory of your QT5 installation , e.g ( ) + Where is the installation directory of your QT6 installation , e.g ( ) then you need to simply do the following from the iShape demo root directory: @@ -87,11 +87,11 @@ Note: please use '--config Debug' if you are using Cyclone DDS debug build to bu ### Building on Linux/MacOS with cmake -To build the iShapes demo you need to have installed a QT5 development environment. The following QT5 environment variables has to be set in order to build and run ishapes: +To build the iShapes demo you need to have installed a QT6 development environment. The following QT6 environment variables has to be set in order to build and run ishapes: - $ export LD_LIBRARY_PATH=$LD_LIBRARY_PATH: + $ export LD_LIBRARY_PATH=$LD_LIBRARY_PATH: - Where is the installation directory of your QT5 installation , e.g (/usr/lib/x86_64_linux-gnu/qt5) + Where is the installation directory of your QT6 installation , e.g (/usr/lib/x86_64_linux-gnu/qt6) then you need to simply do the following from the iShape demo root directory: @@ -106,14 +106,14 @@ then you need to simply do the following from the iShape demo root directory: Note: please use '--config Debug' if you are using Opensplice DDS debug build to build this iShape application. ### Building on Windows with cmake -To build the demo you need to have installed a QT5 development environment. The following QT5 environment variables has to be set in order to build and run ishapes: +To build the demo you need to have installed a QT6 development environment. The following QT6 environment variables has to be set in order to build and run ishapes: - C:\> set QTDIR= - C:\> set QT_PLUGIN_PATH=\plugins - C:\> set PATH=\bin;%PATH% + C:\> set QTDIR= + C:\> set QT_PLUGIN_PATH=\plugins + C:\> set PATH=\bin;%PATH% C:\> ""\release.bat - Where is the installation directory of your QT5 installation , e.g ( ) + Where is the installation directory of your QT6 installation , e.g ( ) then you need to simply do the following from the iShape demo root directory: diff --git a/config.hpp b/config.hpp index 80b30d8..b3e0d2d 100644 --- a/config.hpp +++ b/config.hpp @@ -23,11 +23,12 @@ # define IS_HEIGHT 361 # define BRAND_LOGO_X 125 # define BRAND_LOGO_Y 10 -# define ISOCPP_LOGO_X 200 #ifdef Ospl + #define ISOCPP_LOGO_X 200 #define ISOCPP_LOGO_Y 305 #elif Cyclone - # define ISOCPP_LOGO_Y 285 + #define ISOCPP_LOGO_X 390 + #define ISOCPP_LOGO_Y 250 #endif #else # define IS_WIDTH 321 diff --git a/images/cyclone-dds-br.png b/images/cyclone-dds-br.png index f6b8bad..27aefb2 100644 Binary files a/images/cyclone-dds-br.png and b/images/cyclone-dds-br.png differ