Add the data repositories, define the DEV_EXTRA_PATHS var (#2)

ChristopherHX · Jun 30, 2018 · b8b54ce · b8b54ce
1 parent 8ad42ca
commit b8b54ce
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 1 deletion.
diff --git a/.gitmodules b/.gitmodules
@@ -58,3 +58,6 @@
 [submodule "arg-parser"]
 	path = arg-parser
 	url = ../arg-parser.git
+[submodule "mcpelauncher-linux-bin"]
+	path = mcpelauncher-linux-bin
+	url = ../mcpelauncher-linux-bin.git
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -11,6 +11,12 @@ else()
     set(CMAKE_LIBRARY_ARCHITECTURE "i386-linux-gnu")
 endif(APPLE)
 
+option(ENABLE_DEV_PATHS "Enables lookup in source directories for misc files required by the launcher. This should be disabled for package builds." ON)
+if (ENABLE_DEV_PATHS)
+    add_definitions(-DDEV_EXTRA_PATHS="${CMAKE_SOURCE_DIR}/mcpelauncher-linux-bin")
+endif()
+
+
 include(ext/json.cmake)
 include(ext/glfw.cmake)
 

diff --git a/mcpelauncher-common b/mcpelauncher-common
diff --git a/mcpelauncher-linux-bin b/mcpelauncher-linux-bin