Update subrepos (Mac support, fixes), fix game-window compilation

ChristopherHX · Jul 9, 2018 · 3e62fa8 · 3e62fa8
1 parent 1bb8a1a
commit 3e62fa8
Show file tree

Hide file tree

Showing 10 changed files with 17 additions and 15 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -27,6 +27,14 @@ endif()
 
 include(ext/json.cmake)
 
+include(game-window/BuildSettings.cmake)
+if (GAMEWINDOW_SYSTEM STREQUAL "EGLUT")
+    add_subdirectory(eglut)
+    add_subdirectory(linux-gamepad)
+elseif (GAMEWINDOW_SYSTEM STREQUAL "GLFW")
+    include(ext/glfw.cmake)
+endif()
+
 if (APPLE)
     add_subdirectory(osx-elf-header)
     add_subdirectory(epoll-shim)
@@ -45,12 +53,6 @@ add_subdirectory(msa-daemon-client)
 add_subdirectory(libhybris)
 add_subdirectory(file-picker)
 add_subdirectory(game-window)
-if (GAMEWINDOW_SYSTEM STREQUAL "EGLUT")
-    add_subdirectory(eglut)
-    add_subdirectory(linux-gamepad)
-elseif (GAMEWINDOW_SYSTEM STREQUAL "GLFW")
-    include(ext/glfw.cmake)
-endif()
 
 add_subdirectory(cll-telemetry)
 

diff --git a/base64 b/base64
diff --git a/cll-telemetry b/cll-telemetry
diff --git a/daemon-utils b/daemon-utils
diff --git a/epoll-shim b/epoll-shim
diff --git a/game-window b/game-window
diff --git a/libhybris b/libhybris
diff --git a/mcpelauncher-core b/mcpelauncher-core
diff --git a/minecraft-symbols b/minecraft-symbols
diff --git a/simple-ipc b/simple-ipc
+18 −2		src/hooks.c
+2 −2		src/hooks_net.c
+18 −2		src/hooks_net_darwin.c
+1 −1		src/hooks_pthread.c
+1 −8		include/mcpelauncher/app_platform.h
+2 −1		src/app_platform.cpp
+9 −2		CMakeLists.txt
+0 −5		src/common/encoding/encoding.cpp
+4 −4		src/common/encoding/encoding_json.h
+4 −4		src/common/encoding/encoding_json_cbor.h
+2 −0		src/common/message/message_container.h
+0 −1		src/unix/epoll_io_handler.cpp
+92 −0		src/unix/kqueue_io_handler.cpp
+38 −0		src/unix/kqueue_io_handler.h