Remove content submodule

Closes: #1260
pull/1267/head
Hleb Valoshka 2021-12-27 11:26:42 +02:00
parent 3e93c71a95
commit 28f47b0dd8
4 changed files with 3 additions and 8 deletions

View File

@ -3,10 +3,10 @@ name: Celestia
on:
push:
branches: [ master ]
paths: [ src/**, .github/workflows/*.yml ]
paths: [ src/**, .github/workflows/*.yml, CMakeLists.txt ]
pull_request:
branches: [ master ]
paths: [ src/**, .github/workflows/*.yml ]
paths: [ src/**, .github/workflows/*.yml, CMakeLists.txt ]
env:
BUILD_TYPE: RelWithDebInfo

1
.gitignore vendored
View File

@ -22,3 +22,4 @@ extras-standard/
models/
textures/
mingw/
content/

View File

@ -55,7 +55,6 @@ option(ENABLE_TOOLS "Build different tools? (Default: off)" OFF)
option(NATIVE_OSX_APP "Support native OSX paths read data from (Default: off)" OFF)
option(FAST_MATH "Build with unsafe fast-math compiller option (Default: off)" OFF)
option(ENABLE_TESTS "Enable unit tests? (Default: off)" OFF)
option(ENABLE_DATA "Install data from content submodule? (Default: on)" ON)
option(ENABLE_GLES "Build for OpenGL ES 2.0 instead of OpenGL 2.1 (Default: off)" OFF)
option(USE_GTKGLEXT "Use libgtkglext1 for GTK2 frontend (Default: on)" ON)
option(USE_GTK3 "Use Gtk3 in GTK2 frontend (Default: off)" OFF)
@ -402,10 +401,6 @@ add_subdirectory(locale)
add_subdirectory(scripts)
add_subdirectory(shaders)
if(ENABLE_DATA)
add_subdirectory(content)
endif()
if(ENABLE_TESTS)
enable_testing()
add_subdirectory(test)

@ -1 +0,0 @@
Subproject commit 6d3ffb4813b6839553f9fee652fc0844b8282dc2