Skip to content

Commit d25a649

Browse files
authored
Moves submodule libraries to external folder (#96)
1 parent beb171e commit d25a649

File tree

8 files changed

+15
-19
lines changed

8 files changed

+15
-19
lines changed

.gitmodules

Lines changed: 9 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,12 @@
1-
[submodule "lib/SDL"]
2-
path = lib/SDL
1+
[submodule "external/SDL"]
2+
path = external/SDL
33
url = https://github.com/libsdl-org/SDL
4-
branch = SDL2
5-
[submodule "lib/SDL_image"]
6-
path = lib/SDL_image
4+
[submodule "external/SDL_image"]
5+
path = external/SDL_image
76
url = https://github.com/libsdl-org/SDL_image
8-
branch = SDL2
9-
[submodule "lib/SDL_ttf"]
10-
path = lib/SDL_ttf
11-
url = https://github.com/libsdl-org/SDL_ttf
12-
branch = SDL2
13-
[submodule "lib/SDL_mixer"]
14-
path = lib/SDL_mixer
7+
[submodule "external/SDL_mixer"]
8+
path = external/SDL_mixer
159
url = https://github.com/libsdl-org/SDL_mixer
16-
branch = SDL2
10+
[submodule "external/SDL_ttf"]
11+
path = external/SDL_ttf
12+
url = https://github.com/libsdl-org/SDL_ttf

CMakeLists.txt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ endif ()
120120
set(SDL_STATIC ON)
121121
set(SDL_SHARED OFF)
122122
set(SDL_TEST OFF)
123-
add_subdirectory(lib/SDL)
123+
add_subdirectory(external/SDL)
124124
set(SDL_INCLUDE_DIR lib/SDL/include)
125125
set(SDL_LIBRARY SDL3-static)
126126

@@ -144,18 +144,18 @@ set(SDLIMAGE_WEBP OFF)
144144
set(SDLIMAGE_XCF OFF)
145145
set(SDLIMAGE_XPM OFF)
146146
set(SDLIMAGE_XV OFF)
147-
add_subdirectory(lib/SDL_image)
147+
add_subdirectory(external/SDL_image)
148148
set(SDL_IMAGE_INCLUDE_DIR lib/SDL_image/include)
149149
set(SDL_IMAGE_LIBRARY SDL3_image-static)
150150

151151
# opusfile caused issues in macos build and we don't need it anyways
152152
set(SDLMIXER_OPUS OFF)
153-
add_subdirectory(lib/SDL_mixer)
153+
add_subdirectory(external/SDL_mixer)
154154
set(SDL_MIXER_INCLUDE_DIR lib/SDL_mixer/include)
155155
set(SDL_MIXER_LIBRARY SDL3_mixer-static)
156156

157157
set(SDLTTF_VENDORED ON)
158-
add_subdirectory(lib/SDL_ttf)
158+
add_subdirectory(external/SDL_ttf)
159159
set(SDL_TTF_INCLUDE_DIR lib/SDL_ttf/include)
160160
set(SDL_TTF_LIBRARY SDL3_ttf-static)
161161

external/SDL_image

Submodule SDL_image added at 4a762bd

external/SDL_mixer

Submodule SDL_mixer added at 39d11cd

lib/SDL_image

Lines changed: 0 additions & 1 deletion
This file was deleted.

lib/SDL_mixer

Lines changed: 0 additions & 1 deletion
This file was deleted.

0 commit comments

Comments
 (0)