Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

added libhybris , setting SDL_VIDEODRIVER as null and setting QT_QPA_… #7

Merged
merged 1 commit into from
Sep 17, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -278,9 +278,12 @@ if(NOT EMSCRIPTEN)
IF(MIR_BUILD)
find_package(Qt5Gui REQUIRED) #LOMIRI doesnt start without starting QGui
find_package(Qt5Core REQUIRED)
pkg_search_module(Hybris REQUIRED hybris-egl-platform > 0.1.0)

target_compile_definitions(supertux2_lib PUBLIC MIR_BUILD=1)
target_link_directories(supertux2_lib PUBLIC ${SDL2_LIBDIR})
target_link_directories(supertux2_lib PUBLIC ${SDL2_LIBDIR} ${Hybris_LIBDIR})
target_link_libraries(supertux2_lib PUBLIC Qt5::Gui Qt5::Core)
target_link_libraries(supertux2_lib PUBLIC ${Hybris_LIBRARIES})
endif()
target_link_libraries(supertux2_lib PUBLIC LibSDL2_ttf)
target_link_libraries(supertux2_lib PUBLIC LibSDL2 LibSDL2_image)
Expand Down
3 changes: 3 additions & 0 deletions clickable.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ dependencies_target:
- "libpng-dev"
- "libvorbis-dev"
- "libraqm-dev"
- "libhybris-dev"

install_lib:
- "/usr/lib/${ARCH_TRIPLET}/libogg.so*"
Expand All @@ -38,6 +39,8 @@ install_lib:
- "/usr/lib/${ARCH_TRIPLET}/libsndio.so*"
- "/lib/${ARCH_TRIPLET}/libz.so.1.2.11"
- "/lib/${ARCH_TRIPLET}/libraqm.so*"
- "/lib/${ARCH_TRIPLET}/libEGL_libhybris.so.0"
- "/lib/${ARCH_TRIPLET}/libEGL_libhybris.so.0.*"
build_args:
- "-DUBUNTU_TOUCH=ON"
- "-DENABLE_OPENGL=OFF"
Expand Down
2 changes: 2 additions & 0 deletions src/main.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,8 @@ static std::unique_ptr<Main> g_main;
int main(int argc, char** argv)
{
#ifdef MIR_BUILD
qputenv("SDL_VIDEODRIVER","");
qputenv("QT_QPA_PLATFORM","ubuntumirclient");
QGuiApplication app(argc, argv);
#endif
g_main = std::make_unique<Main>();
Expand Down
Loading