put 3rdparty in vendor to avoid merge errors

scp-fs2open · Oct 11, 2016 · beed3ff · beed3ff
1 parent dec45ba
commit beed3ff
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git 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
@@ -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)