From 226e59c2450e095a386ba67b52952663882e2c03 Mon Sep 17 00:00:00 2001 From: Christopher Homberger Date: Tue, 12 May 2020 21:27:07 +0200 Subject: [PATCH 01/17] macOS x86_64 use newer libfmod --- CMakeLists.txt | 2 +- mcpelauncher-core | 2 +- mcpelauncher-mac-bin | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index e0b5eeb8..eef0c9e8 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -58,7 +58,7 @@ option(BUILD_TESTING "Build tests for cll-telemetry (requires GTest)" OFF) if (APPLE) set(NATIVES_PATH_DIR "${CMAKE_SOURCE_DIR}/mcpelauncher-mac-bin") - set(NATIVES_PATH_LIB_DIR "${NATIVES_PATH_DIR}/libs") + set(NATIVES_PATH_LIB_DIR "${NATIVES_PATH_DIR}/lib") else() set(NATIVES_PATH_DIR "${CMAKE_SOURCE_DIR}/mcpelauncher-linux-bin") set(NATIVES_PATH_LIB_DIR "${NATIVES_PATH_DIR}/lib") diff --git a/mcpelauncher-core b/mcpelauncher-core index 021e0ee6..f35ab7c2 160000 --- a/mcpelauncher-core +++ b/mcpelauncher-core @@ -1 +1 @@ -Subproject commit 021e0ee6322b1a7f061711c1bfb200503223b04c +Subproject commit f35ab7c2f64febc4f328cd37c73eaa33dd3897bb diff --git a/mcpelauncher-mac-bin b/mcpelauncher-mac-bin index 1f7ab4c5..cb248500 160000 --- a/mcpelauncher-mac-bin +++ b/mcpelauncher-mac-bin @@ -1 +1 @@ -Subproject commit 1f7ab4c5af6454d1d9641014a0b29594e062829e +Subproject commit cb2485005dd1189791f1534c93bcd530028f2efd From f87faa6549645f6a93736758b57e9b11115fd869 Mon Sep 17 00:00:00 2001 From: Christopher Homberger Date: Wed, 24 Jun 2020 21:14:07 +0200 Subject: [PATCH 02/17] update daemon-utils --- daemon-utils | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/daemon-utils b/daemon-utils index db43d0b9..f380f5b1 160000 --- a/daemon-utils +++ b/daemon-utils @@ -1 +1 @@ -Subproject commit db43d0b919e5bc079b61fc47acb0fa81f99cf569 +Subproject commit f380f5b1c0fb4b38db067d800e6916dc8c568264 From ff6379adeca57eec0552569c2127b1e52ac921cb Mon Sep 17 00:00:00 2001 From: Christopher Homberger Date: Mon, 29 Jun 2020 00:08:32 +0200 Subject: [PATCH 03/17] Update submodules Exit normally FN11 fullscreen Support 1.16.0.2 Support new 1.16 betas (no xbox, 64bit only) on Linux Fix loading newer libc++ --- game-window | 2 +- libc-shim | 2 +- mcpelauncher-client | 2 +- mcpelauncher-core | 2 +- mcpelauncher-linker | 2 +- minecraft-imported-symbols | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/game-window b/game-window index c9c148fa..ae554bda 160000 --- a/game-window +++ b/game-window @@ -1 +1 @@ -Subproject commit c9c148faccf9faf3584030f5f12ed82fbb1c74c0 +Subproject commit ae554bda9d7cb525e94e21db9a60e39d812b7046 diff --git a/libc-shim b/libc-shim index cdeba566..ab546716 160000 --- a/libc-shim +++ b/libc-shim @@ -1 +1 @@ -Subproject commit cdeba566b0c8d3f5f10980e1593516a46b1bc23b +Subproject commit ab546716a5a20daa759f5bb85193d324a7bc20d7 diff --git a/mcpelauncher-client b/mcpelauncher-client index e3958c25..45ed4f70 160000 --- a/mcpelauncher-client +++ b/mcpelauncher-client @@ -1 +1 @@ -Subproject commit e3958c25af91da4c92ae69ed006752d691f81eb1 +Subproject commit 45ed4f70094f3e0b6d0b386ce3e54a63b29912e2 diff --git a/mcpelauncher-core b/mcpelauncher-core index f35ab7c2..aedc7a78 160000 --- a/mcpelauncher-core +++ b/mcpelauncher-core @@ -1 +1 @@ -Subproject commit f35ab7c2f64febc4f328cd37c73eaa33dd3897bb +Subproject commit aedc7a785477e65438747753b3277e638e182662 diff --git a/mcpelauncher-linker b/mcpelauncher-linker index ca2cdaee..5a3eb0b5 160000 --- a/mcpelauncher-linker +++ b/mcpelauncher-linker @@ -1 +1 @@ -Subproject commit ca2cdaeece3ca74b8edf7fb185365fb7db7e1f1d +Subproject commit 5a3eb0b5c6f31ad9a05b79d05ccf72bcb025ce96 diff --git a/minecraft-imported-symbols b/minecraft-imported-symbols index 4709331f..7c2fb154 160000 --- a/minecraft-imported-symbols +++ b/minecraft-imported-symbols @@ -1 +1 @@ -Subproject commit 4709331f7c452d3db118223f4caa71e1653eb82a +Subproject commit 7c2fb154cf56a467bad618435b113afc826057af From efd67054928699ef51a81dba38e48c69e72d90f6 Mon Sep 17 00:00:00 2001 From: Christopher Homberger Date: Mon, 29 Jun 2020 00:43:41 +0200 Subject: [PATCH 04/17] ExternalProject -> FetchContent nlohmann_json, glfw allows an external source to be provided (flatpak) Fix glfw dependencies on Linux Add missing header glfw --- ext/glfw.cmake | 22 ++++++++-------------- ext/json.cmake | 17 ++++++++++------- game-window | 2 +- 3 files changed, 19 insertions(+), 22 deletions(-) diff --git a/ext/glfw.cmake b/ext/glfw.cmake index 46295057..b786945e 100644 --- a/ext/glfw.cmake +++ b/ext/glfw.cmake @@ -1,19 +1,13 @@ -include(ExternalProject) +include(FetchContent) -ExternalProject_Add( +FetchContent_Declare( glfw3_ext URL "https://github.com/minecraft-linux/glfw/archive/master.zip" - INSTALL_DIR ${CMAKE_BINARY_DIR}/ext/glfw - CMAKE_ARGS "-DCMAKE_INSTALL_PREFIX=${CMAKE_BINARY_DIR}/ext/glfw" "-DBUILD_SHARED_LIBS=OFF" "-DCMAKE_C_FLAGS=${CMAKE_C_FLAGS}" "-DCMAKE_LINK_FLAGS=${CMAKE_LINK_FLAGS}" "-DCMAKE_LIBRARY_ARCHITECTURE=${CMAKE_LIBRARY_ARCHITECTURE}" ) -file(MAKE_DIRECTORY ${CMAKE_BINARY_DIR}/ext/glfw/include/) -add_library(glfw3 STATIC IMPORTED) -add_dependencies(glfw3 glfw3_ext) -set_property(TARGET glfw3 PROPERTY IMPORTED_LOCATION ${CMAKE_BINARY_DIR}/ext/glfw/lib/libglfw3.a) -if (APPLE) - set_property(TARGET glfw3 PROPERTY INTERFACE_LINK_LIBRARIES "-framework Cocoa" "-framework IOKit" "-framework CoreFoundation" "-framework CoreVideo") -else() - find_package(X11 REQUIRED) - set_property(TARGET glfw3 PROPERTY INTERFACE_LINK_LIBRARIES ${X11_X11_LIB} ${X11_Xcursor_LIB} ${X11_Xrandr_LIB} ${X11_Xxf86vm_LIB} ${X11_Xinerama_LIB}) + +FetchContent_GetProperties(glfw3_ext) +if(NOT glfw3_ext_POPULATED) + FetchContent_Populate(glfw3_ext) + add_subdirectory(${glfw3_ext_SOURCE_DIR} ${glfw3_ext_BINARY_DIR}) endif() -set_property(TARGET glfw3 PROPERTY INTERFACE_INCLUDE_DIRECTORIES ${CMAKE_BINARY_DIR}/ext/glfw/include/) +add_library(glfw3 ALIAS glfw) \ No newline at end of file diff --git a/ext/json.cmake b/ext/json.cmake index 93fa7a46..98245190 100644 --- a/ext/json.cmake +++ b/ext/json.cmake @@ -1,12 +1,15 @@ -include(ExternalProject) +include(FetchContent) -ExternalProject_Add( +FetchContent_Declare( nlohmann_json_ext - URL "https://github.com/nlohmann/json/releases/download/v3.7.0/include.zip" - CONFIGURE_COMMAND "" BUILD_COMMAND "" INSTALL_DIR "" INSTALL_COMMAND "" + URL "https://github.com/nlohmann/json/releases/download/v3.7.3/include.zip" ) -ExternalProject_Get_Property(nlohmann_json_ext SOURCE_DIR) -file(MAKE_DIRECTORY ${SOURCE_DIR}) + +FetchContent_GetProperties(nlohmann_json_ext) +if(NOT nlohmann_json_ext_POPULATED) + FetchContent_Populate(nlohmann_json_ext) +endif() + add_library(nlohmann_json INTERFACE IMPORTED) add_dependencies(nlohmann_json nlohmann_json_ext) -set_property(TARGET nlohmann_json PROPERTY INTERFACE_INCLUDE_DIRECTORIES ${SOURCE_DIR}) +set_property(TARGET nlohmann_json PROPERTY INTERFACE_INCLUDE_DIRECTORIES "${nlohmann_json_ext_SOURCE_DIR}/include") \ No newline at end of file diff --git a/game-window b/game-window index ae554bda..c07bff37 160000 --- a/game-window +++ b/game-window @@ -1 +1 @@ -Subproject commit ae554bda9d7cb525e94e21db9a60e39d812b7046 +Subproject commit c07bff371b68e5d8239c31206014cd2234b565ba From 87aa068ff00b88ebc5817d8828c3613fc6bd3850 Mon Sep 17 00:00:00 2001 From: Christopher Homberger Date: Mon, 29 Jun 2020 22:02:12 +0200 Subject: [PATCH 05/17] Update libc-shim, arg-parser --- arg-parser | 2 +- libc-shim | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/arg-parser b/arg-parser index b653da4b..3d7ee7df 160000 --- a/arg-parser +++ b/arg-parser @@ -1 +1 @@ -Subproject commit b653da4b56c4634eaf215295090fe4ca0e42acf8 +Subproject commit 3d7ee7df79f088ee6c9f438a9384b4eb2b1b0a77 diff --git a/libc-shim b/libc-shim index ab546716..01d8ebbf 160000 --- a/libc-shim +++ b/libc-shim @@ -1 +1 @@ -Subproject commit ab546716a5a20daa759f5bb85193d324a7bc20d7 +Subproject commit 01d8ebbf229fd2dff82f972dbf812cc202397921 From 5a6ba4d95aa3529e5d2a22efb836f31ac0b85c26 Mon Sep 17 00:00:00 2001 From: Christopher Homberger Date: Sun, 18 Oct 2020 20:06:05 +0200 Subject: [PATCH 06/17] Fix PickImage Cancel --- mcpelauncher-client | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mcpelauncher-client b/mcpelauncher-client index 45ed4f70..5bfcedf4 160000 --- a/mcpelauncher-client +++ b/mcpelauncher-client @@ -1 +1 @@ -Subproject commit 45ed4f70094f3e0b6d0b386ce3e54a63b29912e2 +Subproject commit 5bfcedf4323448ce0dba6b0f1901c2e7b335e09f From 0faf8502b0edaa7ffb3c1c3e126c393322496797 Mon Sep 17 00:00:00 2001 From: Christopher Homberger Date: Sun, 18 Oct 2020 20:09:29 +0200 Subject: [PATCH 07/17] Fix fake-egl asserts Fix loadMinecraft error logging --- mcpelauncher-client | 2 +- mcpelauncher-core | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/mcpelauncher-client b/mcpelauncher-client index 5bfcedf4..55c5ebb6 160000 --- a/mcpelauncher-client +++ b/mcpelauncher-client @@ -1 +1 @@ -Subproject commit 5bfcedf4323448ce0dba6b0f1901c2e7b335e09f +Subproject commit 55c5ebb63287c6b32450c0557d2230c0741dc749 diff --git a/mcpelauncher-core b/mcpelauncher-core index aedc7a78..c20f858f 160000 --- a/mcpelauncher-core +++ b/mcpelauncher-core @@ -1 +1 @@ -Subproject commit aedc7a785477e65438747753b3277e638e182662 +Subproject commit c20f858fda98c8b20383811d3a2d19ca20e675d1 From 01c430afccf5303ef90374839c5d3914d65f51e4 Mon Sep 17 00:00:00 2001 From: Christopher Homberger Date: Sun, 18 Oct 2020 22:03:26 +0200 Subject: [PATCH 08/17] basic aarch64 support updated fake-jni / baron thanks to @freundTech required for aarch64 linux and libxal libfmod audio via jni pulseaudio --- CMakeLists.txt | 2 ++ baron | 2 +- cmake/FindPulseAudio.cmake | 61 ++++++++++++++++++++++++++++++++++++++ fake-jni | 2 +- libc-shim | 2 +- mcpelauncher-client | 2 +- mcpelauncher-common | 2 +- mcpelauncher-core | 2 +- 8 files changed, 69 insertions(+), 6 deletions(-) create mode 100644 cmake/FindPulseAudio.cmake diff --git a/CMakeLists.txt b/CMakeLists.txt index eef0c9e8..e1601bb6 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -18,6 +18,8 @@ endif() set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-delete-null-pointer-checks") +set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake) + string(TIMESTAMP BUILD_TIMESTAMP "%Y%m%d-%H%M%S" UTC) set(IS_ARM_BUILD FALSE) diff --git a/baron b/baron index b1565232..0088704e 160000 --- a/baron +++ b/baron @@ -1 +1 @@ -Subproject commit b15652328d87f367622c287877dc01dfcd15c73a +Subproject commit 0088704e8cd24174b3dbb34b5fbccbfc066f7bf6 diff --git a/cmake/FindPulseAudio.cmake b/cmake/FindPulseAudio.cmake new file mode 100644 index 00000000..e0691d1f --- /dev/null +++ b/cmake/FindPulseAudio.cmake @@ -0,0 +1,61 @@ +# - Try to find PulseAudioSimple +# Once done this will define +# +# PULSEAUDIO_FOUND - system has pulseaudio simple +# PULSEAUDIO_INCLUDE_DIRS - the pulseaudio simple include directory +# PULSEAUDIO_LIBRARIES - Link these to use pulseaudio simple +# PULSEAUDIOSIMPLE_FOUND - system has pulseaudio simple +# PULSEAUDIOSIMPLE_INCLUDE_DIRS - the pulseaudio simple include directory +# PULSEAUDIOSIMPLE_LIBRARIES - Link these to use pulseaudio simple +# +# Copyright © 2014 Laszlo Papp +# +# Redistribution and use is allowed according to the terms of the New +# BSD license. +# For details see the accompanying COPYING-CMAKE-SCRIPTS file. +# + +foreach (pulsevariablename PULSEAUDIOSIMPLE PULSEAUDIO) + find_path(${pulsevariablename}_INCLUDE_DIR + NAMES + pulseaudio.h + PATH_SUFFIXES pulse + PATHS + /usr/include + /usr/local/include + /opt/local/include + /sw/include + ) + + set(pulselibname pulse) + set(pulsepackagename PulseAudio) + if (${pulsevariablename} STREQUAL "PULSEAUDIOSIMPLE") + set(pulselibname pulse-simple) + set(pulsepackagename PulseAudioSimple) + endif() + + find_library(${pulsevariablename}_LIBRARY + NAMES + ${pulselibname} + PATHS + /usr/lib + /usr/local/lib + /opt/local/lib + /sw/lib + ) + + set(${pulsevariablename}_INCLUDE_DIRS + ${${pulsevariablename}_DIR} + ) + set(${pulsevariablename}_LIBRARIES + ${${pulsevariablename}_LIBRARY} + ) + + include(FindPackageHandleStandardArgs) + # handle the QUIETLY and REQUIRED arguments and set ${pulsevariablename}_FOUND to TRUE if + # all listed variables are TRUE + find_package_handle_standard_args(${pulsepackagename} DEFAULT_MSG ${pulsevariablename}_LIBRARY ${pulsevariablename}_INCLUDE_DIR) + + # show the ${pulsevariablename}_INCLUDE_DIRS and ${pulsevariablename}_LIBRARIES variables only in the advanced view + mark_as_advanced(${pulsevariablename}_INCLUDE_DIRS ${pulsevariablename}_LIBRARIES) +endforeach(pulsevariablename) \ No newline at end of file diff --git a/fake-jni b/fake-jni index 791c80dc..d28adf76 160000 --- a/fake-jni +++ b/fake-jni @@ -1 +1 @@ -Subproject commit 791c80dc27a4d9b6b4c14c939df84f74698e8f94 +Subproject commit d28adf7670302a87720cdf369cd0942166ad9368 diff --git a/libc-shim b/libc-shim index 01d8ebbf..c49452be 160000 --- a/libc-shim +++ b/libc-shim @@ -1 +1 @@ -Subproject commit 01d8ebbf229fd2dff82f972dbf812cc202397921 +Subproject commit c49452be688e2b4d23eb76d26fbe4851416a6b27 diff --git a/mcpelauncher-client b/mcpelauncher-client index 55c5ebb6..8c33c25d 160000 --- a/mcpelauncher-client +++ b/mcpelauncher-client @@ -1 +1 @@ -Subproject commit 55c5ebb63287c6b32450c0557d2230c0741dc749 +Subproject commit 8c33c25df5aee851086ffe5406a6db7d5dd080bc diff --git a/mcpelauncher-common b/mcpelauncher-common index 83ee974f..7616f9c0 160000 --- a/mcpelauncher-common +++ b/mcpelauncher-common @@ -1 +1 @@ -Subproject commit 83ee974ff120a2135157ce90cda63f779baebc6d +Subproject commit 7616f9c0f0eb7f8a222ae1faf4f0108347e6d831 diff --git a/mcpelauncher-core b/mcpelauncher-core index c20f858f..45bdf535 160000 --- a/mcpelauncher-core +++ b/mcpelauncher-core @@ -1 +1 @@ -Subproject commit c20f858fda98c8b20383811d3a2d19ca20e675d1 +Subproject commit 45bdf5355b5286107e2a7ea683b5837989d2ad6c From 08696c084fbea26b023d66fde78de95e684e2272 Mon Sep 17 00:00:00 2001 From: Christopher Homberger Date: Sun, 18 Oct 2020 22:08:23 +0200 Subject: [PATCH 09/17] Update curl version, improved openssl handling --- ext/curl.cmake | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/ext/curl.cmake b/ext/curl.cmake index 4f4d9598..9e66ed68 100644 --- a/ext/curl.cmake +++ b/ext/curl.cmake @@ -1,17 +1,20 @@ include(ExternalProject) if (NOT APPLE) - find_package(OpenSSL REQUIRED) + find_package(OpenSSL REQUIRED COMPONENTS SSL Crypto) +endif() + +if (NOT CURL_EXT_EXTRA_OPTIONS) + set(CURL_EXT_EXTRA_OPTIONS ) endif() -set(CURL_EXT_EXTRA_OPTIONS ) if (DEFINED OPENSSL_ROOT_DIR) list(APPEND CURL_EXT_EXTRA_OPTIONS "-DOPENSSL_ROOT_DIR=${OPENSSL_ROOT_DIR}") endif() ExternalProject_Add( curl_ext - URL "http://curl.haxx.se/download/curl-7.61.0.tar.gz" + URL "http://curl.haxx.se/download/curl-7.72.0.tar.gz" INSTALL_DIR ${CMAKE_BINARY_DIR}/ext/curl CMAKE_ARGS "-DCMAKE_INSTALL_PREFIX=${CMAKE_BINARY_DIR}/ext/curl" "-DBUILD_CURL_EXE=OFF" "-DBUILD_SHARED_LIBS=OFF" "-DCURL_STATICLIB=ON" "-DCURL_DISABLE_LDAP=ON" "-DCMAKE_USE_LIBSSH2=OFF" "-DCMAKE_USE_OPENLDAP=OFF" "-DCMAKE_C_FLAGS=-m32" "-DCMAKE_LINK_FLAGS=-m32" "-DCMAKE_LIBRARY_ARCHITECTURE=${CMAKE_LIBRARY_ARCHITECTURE}" ${CURL_EXT_EXTRA_OPTIONS} ) @@ -21,7 +24,7 @@ add_dependencies(curl curl_ext) set_property(TARGET curl PROPERTY IMPORTED_LOCATION ${CMAKE_BINARY_DIR}/ext/curl/lib/libcurl.a) set_property(TARGET curl PROPERTY INTERFACE_INCLUDE_DIRECTORIES ${CMAKE_BINARY_DIR}/ext/curl/include/) if (NOT APPLE) - set_property(TARGET curl PROPERTY INTERFACE_LINK_LIBRARIES ${OPENSSL_LIBRARIES}) + set_property(TARGET curl PROPERTY INTERFACE_LINK_LIBRARIES OpenSSL::SSL OpenSSL::Crypto) endif() set(CURL_FOUND TRUE) From 03bf56f556d6f89f13c0f4accc3d8ccfa8896ea5 Mon Sep 17 00:00:00 2001 From: Christopher Homberger Date: Sun, 18 Oct 2020 22:13:41 +0200 Subject: [PATCH 10/17] Fix one undefined behaviour gamepad crash accessed first element of an empty queue, without checking if it isn't empty --- mcpelauncher-client | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mcpelauncher-client b/mcpelauncher-client index 8c33c25d..d7974525 160000 --- a/mcpelauncher-client +++ b/mcpelauncher-client @@ -1 +1 @@ -Subproject commit 8c33c25df5aee851086ffe5406a6db7d5dd080bc +Subproject commit d797452586f6b564f59a5c0a6ae2f3187bc0b905 From eac31fd4d9026b28215c1fca1f360fc37ec82b52 Mon Sep 17 00:00:00 2001 From: Christopher Homberger Date: Sun, 18 Oct 2020 22:18:46 +0200 Subject: [PATCH 11/17] Fix libuuid, last character of uuid got lost snprintf requires a null terminated buffer, buffer was one byte to small to store null terminator, => cropped uuid --- mcpelauncher-client | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mcpelauncher-client b/mcpelauncher-client index d7974525..aa1bf3e1 160000 --- a/mcpelauncher-client +++ b/mcpelauncher-client @@ -1 +1 @@ -Subproject commit d797452586f6b564f59a5c0a6ae2f3187bc0b905 +Subproject commit aa1bf3e1779c9bdbd831487d97738ec46e0f1413 From 2a423b9cc97b2200f7b0f96881d1476effc066a0 Mon Sep 17 00:00:00 2001 From: Christopher Homberger Date: Mon, 19 Oct 2020 16:28:06 +0200 Subject: [PATCH 12/17] Merge feature-xal into ng --- .gitmodules | 3 +++ CMakeLists.txt | 5 +++++ fake-jni | 2 +- mcpelauncher-client | 2 +- mcpelauncher-webview | 1 + 5 files changed, 11 insertions(+), 2 deletions(-) create mode 160000 mcpelauncher-webview diff --git a/.gitmodules b/.gitmodules index 2e32b88d..f03c88d3 100644 --- a/.gitmodules +++ b/.gitmodules @@ -76,3 +76,6 @@ [submodule "mcpelauncher-linker"] path = mcpelauncher-linker url = ../mcpelauncher-linker.git +[submodule "mcpelauncher-webview"] + path = mcpelauncher-webview + url = https://github.com/freundTech/mcpelauncher-webview diff --git a/CMakeLists.txt b/CMakeLists.txt index e1601bb6..89b0fae0 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -93,6 +93,11 @@ if (BUILD_CLIENT) endif() endif() +option(BUILD_WEBVIEW "Build webview for xboxlive login" ON) +if (BUILD_WEBVIEW) + add_subdirectory(mcpelauncher-webview) +endif() + if (APPLE) add_subdirectory(osx-elf-header) add_subdirectory(epoll-shim) diff --git a/fake-jni b/fake-jni index d28adf76..14376948 160000 --- a/fake-jni +++ b/fake-jni @@ -1 +1 @@ -Subproject commit d28adf7670302a87720cdf369cd0942166ad9368 +Subproject commit 143769486df51b704a605258131eaa41a97b2242 diff --git a/mcpelauncher-client b/mcpelauncher-client index aa1bf3e1..b9090b50 160000 --- a/mcpelauncher-client +++ b/mcpelauncher-client @@ -1 +1 @@ -Subproject commit aa1bf3e1779c9bdbd831487d97738ec46e0f1413 +Subproject commit b9090b50762aa2263ccb67c09e1c31cad1df2027 diff --git a/mcpelauncher-webview b/mcpelauncher-webview new file mode 160000 index 00000000..1b1d3afc --- /dev/null +++ b/mcpelauncher-webview @@ -0,0 +1 @@ +Subproject commit 1b1d3afc611ebdf2c45309d5c5de541f8b5874c7 From 8a4f9a50e12d756c56d77c1b0f428fa8deb67cd4 Mon Sep 17 00:00:00 2001 From: Christopher Homberger Date: Mon, 19 Oct 2020 16:29:15 +0200 Subject: [PATCH 13/17] 1.16.100 fix shutdown crash / add liblog symbol --- mcpelauncher-client | 2 +- mcpelauncher-core | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/mcpelauncher-client b/mcpelauncher-client index b9090b50..975b0299 160000 --- a/mcpelauncher-client +++ b/mcpelauncher-client @@ -1 +1 @@ -Subproject commit b9090b50762aa2263ccb67c09e1c31cad1df2027 +Subproject commit 975b029966a78349e5ffb3f69924b6a48f7092a7 diff --git a/mcpelauncher-core b/mcpelauncher-core index 45bdf535..aa0f68bf 160000 --- a/mcpelauncher-core +++ b/mcpelauncher-core @@ -1 +1 @@ -Subproject commit 45bdf5355b5286107e2a7ea683b5837989d2ad6c +Subproject commit aa0f68bf66b3bebc45d4268c75a0f91ca9517fe8 From 1c98f1997ebbbd6490eb9a2af75f427c1218754d Mon Sep 17 00:00:00 2001 From: Christopher Homberger Date: Tue, 20 Oct 2020 11:31:40 +0200 Subject: [PATCH 14/17] Fix building mcpelauncher-webview for x86/x86_64 This code prevented finding the correct qt5 version --- CMakeLists.txt | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 89b0fae0..6f2bd87e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -29,11 +29,11 @@ if(${CMAKE_SYSTEM_PROCESSOR} MATCHES "arm" OR ${CMAKE_SYSTEM_PROCESSOR} MATCHES set(IS_ARMHF_BUILD TRUE) endif() -if(APPLE) - set(CMAKE_LIBRARY_ARCHITECTURE "i386-apple-darwin") -elseif(NOT IS_ARM_BUILD) - set(CMAKE_LIBRARY_ARCHITECTURE "i386-linux-gnu") -endif() +# if(APPLE) +# set(CMAKE_LIBRARY_ARCHITECTURE "i386-apple-darwin") +# elseif(NOT IS_ARM_BUILD) +# set(CMAKE_LIBRARY_ARCHITECTURE "i386-linux-gnu") +# endif() set(DEB_OS_NAME "none" CACHE STRING "Specifies the target OS for building the debs (ubuntu-xenial, ubuntu-bionic, ubuntu-disco)") mark_as_advanced(DEB_OS_NAME) From 8069f5b27605783a496d4653a88807a934cb06ba Mon Sep 17 00:00:00 2001 From: Christopher Homberger Date: Tue, 20 Oct 2020 11:32:17 +0200 Subject: [PATCH 15/17] Update linker to fix getauxval errors for arm --- mcpelauncher-linker | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mcpelauncher-linker b/mcpelauncher-linker index 5a3eb0b5..5127987c 160000 --- a/mcpelauncher-linker +++ b/mcpelauncher-linker @@ -1 +1 @@ -Subproject commit 5a3eb0b5c6f31ad9a05b79d05ccf72bcb025ce96 +Subproject commit 5127987ca49c4aeca6d180f26a9a4ac5aa4501c2 From c9e73a80b464a7e711240999c8a26f3832a6fecc Mon Sep 17 00:00:00 2001 From: Christopher Homberger Date: Tue, 20 Oct 2020 11:32:40 +0200 Subject: [PATCH 16/17] Add XAL_WEBVIEW_QT_PATH configure option --- mcpelauncher-client | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mcpelauncher-client b/mcpelauncher-client index 975b0299..7d3370ec 160000 --- a/mcpelauncher-client +++ b/mcpelauncher-client @@ -1 +1 @@ -Subproject commit 975b029966a78349e5ffb3f69924b6a48f7092a7 +Subproject commit 7d3370ec8fa439f7a0034b340d7c8729de578e07 From 775225d230b666315b0fd40d0b347c1dfdf3f8ab Mon Sep 17 00:00:00 2001 From: Christopher Homberger Date: Fri, 23 Oct 2020 21:32:51 +0200 Subject: [PATCH 17/17] aarch64: Remove need for -df log warn and use pulseaudio as backend Test build of arm64 flatpak here https://github.com/flathub/io.mrarm.mcpelauncher/pull/6 --- mcpelauncher-client | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mcpelauncher-client b/mcpelauncher-client index 7d3370ec..c7f46ebc 160000 --- a/mcpelauncher-client +++ b/mcpelauncher-client @@ -1 +1 @@ -Subproject commit 7d3370ec8fa439f7a0034b340d7c8729de578e07 +Subproject commit c7f46ebc5031268b735ac788c894b9bed5572879