Ng

.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

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)
@@ -27,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)
@@ -58,7 +60,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")
@@ -91,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)

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 <[email protected]>
+#
+#  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)

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)

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)

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")