Update modules, add arg-parser

ChristopherHX · Jun 20, 2018 · ec0392f · ec0392f
1 parent 1f5901e
commit ec0392f
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 4 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -55,3 +55,6 @@
 [submodule "mcpelauncher-server"]
 	path = mcpelauncher-server
 	url = ../mcpelauncher-server.git
+[submodule "arg-parser"]
+	path = arg-parser
+	url = ../arg-parser.git
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -11,14 +11,14 @@ else()
     set(CMAKE_LIBRARY_ARCHITECTURE "i386-linux-gnu")
 endif(APPLE)
 
-
 include(ext/json.cmake)
 include(ext/glfw.cmake)
 
 add_subdirectory(logger)
 add_subdirectory(base64)
 add_subdirectory(file-util)
 add_subdirectory(properties-parser)
+add_subdirectory(arg-parser)
 
 add_subdirectory(simple-ipc)
 add_subdirectory(daemon-utils/client)

diff --git a/arg-parser b/arg-parser
diff --git a/mcpelauncher-client b/mcpelauncher-client
diff --git a/mcpelauncher-common b/mcpelauncher-common
diff --git a/mcpelauncher-core b/mcpelauncher-core
+2 −2		CMakeLists.txt
+77 −0		src/gl_core_patch.cpp
+25 −0		src/gl_core_patch.h
+18 −4		src/main.cpp
+1 −1		src/xbox_live_patches.cpp
+5 −1		CMakeLists.txt
+5 −1		include/mcpelauncher/minecraft_utils.h
+44 −7		src/app_platform.cpp
+12 −4		src/minecraft_utils.cpp