From beed3ff04fc049c7b9e4f5e3864cedb44ceb8fea Mon Sep 17 00:00:00 2001
From: Iss Mneur <iss.mneur@issmneur.ca>
Date: Mon, 10 Oct 2016 22:37:49 -0600
Subject: [PATCH] put 3rdparty in vendor to avoid merge errors

---
 .gitmodules    | 4 ++--
 CMakeLists.txt | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.gitmodules b/.gitmodules
index d8dff54..ae95670 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,5 +1,5 @@
-[submodule "3rdparty"]
-	path = 3rdparty
+[submodule "vendor"]
+	path = vendor
 	url = https://github.com/wxLauncher/wxlauncher-3rdparty.git
 [submodule "cmake/modules/sdl2-cmake-scripts"]
 	path = cmake/modules/sdl2-cmake-scripts
diff --git a/CMakeLists.txt b/CMakeLists.txt
index ac46e51..c97a97e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -38,7 +38,7 @@ set(LAUNCHER_CMAKE_SOURCE_DIR ${CMAKE_SOURCE_DIR}/cmake)
 include(${LAUNCHER_CMAKE_SOURCE_DIR}/setup_submodules.cmake)
 include(${LAUNCHER_CMAKE_SOURCE_DIR}/modules/modules.cmake)
 list(INSERT CMAKE_MODULE_PATH 0 "${LAUNCHER_CMAKE_SOURCE_DIR}/include")
-set(3RD_PARTY_SOURCE_DIR ${CMAKE_SOURCE_DIR}/3rdparty)
+set(3RD_PARTY_SOURCE_DIR ${CMAKE_SOURCE_DIR}/vendor)
 
 include(${LAUNCHER_CMAKE_SOURCE_DIR}/GetVersionFromGitTag.cmake)