Merge pull request #4 from tuxecure/sdl2mir-armhf-arm64-amd64

add MIR_BUILD macros , it requires to load QGuiApp on focal to show t…

CMakeLists.txt

@@ -276,10 +276,11 @@ target_link_libraries(supertux2_lib PUBLIC LibPhysfs)
 
 if(NOT EMSCRIPTEN)
   IF(MIR_BUILD)
-  find_package(SDL2 REQUIRED)
-  find_package(SDL2_image REQUIRED)
+    find_package(Qt5Gui REQUIRED)  #LOMIRI doesnt start without starting QGui
+    find_package(Qt5Core REQUIRED)
+    target_compile_definitions(supertux2_lib PUBLIC MIR_BUILD=1)
     target_link_directories(supertux2_lib PUBLIC ${SDL2_LIBDIR})
-
+    target_link_libraries(supertux2_lib PUBLIC Qt5::Gui Qt5::Core)
   endif()
   target_link_libraries(supertux2_lib PUBLIC LibSDL2_ttf)
   target_link_libraries(supertux2_lib PUBLIC LibSDL2 LibSDL2_image)

clickable.yaml

@@ -8,7 +8,7 @@ env_vars:
   PKG_CONFIG_PATH: "/usr/lib/${ARCH_TRIPLET}/dev/pkgconfig"
 dependencies_target:
   - "nano"
-  - "&& wget https://ubportslibpatches.github.io/ubporrts_ppa/dists/focal/sdl2mir_${ARCH_TRIPLET}.deb &&  dpkg -i ./sdl2mir_${ARCH_TRIPLET}.deb && wget https://ubportslibpatches.github.io/ubporrts_ppa/dists/focal/sdl2-image_${ARCH_TRIPLET}.deb && dpkg -i ./sdl2-image_${ARCH_TRIPLET}.deb  && apt-get install -y --force-yes --no-install-recommends net-tools"
+  - "&& wget http://192.168.1.6:9999/sdl2mir_${ARCH_TRIPLET}.deb &&  dpkg -i ./sdl2mir_${ARCH_TRIPLET}.deb && wget http://192.168.1.6:9999/sdl2-image_${ARCH_TRIPLET}.deb && dpkg -i ./sdl2-image_${ARCH_TRIPLET}.deb  && apt-get install -y --force-yes --no-install-recommends net-tools"
   - "libogg-dev"
   - "libopenal-dev"
   - "libfreetype6-dev"

src/main.cpp

@@ -21,10 +21,17 @@
 
 #include "supertux/main.hpp"
 
+#ifdef MIR_BUILD
+//required
+#include <QGuiApplication>
+#endif
 static std::unique_ptr<Main> g_main;
 
 int main(int argc, char** argv)
 {
+#ifdef MIR_BUILD
+    QGuiApplication app(argc, argv);
+#endif
   g_main = std::make_unique<Main>();
 
   int ret = g_main->run(argc, argv);
@@ -34,8 +41,8 @@ int main(int argc, char** argv)
   // destructors and thus would make the destruction crash.
   g_main.reset();
 #endif
+  return 0;
 
-  return ret;
 }
 
 /* EOF */