Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Replaced downloading SDL2 from libsdl.org with git submodule SDL release 2.0.16 #1150

Merged
merged 4 commits into from
Oct 10, 2021
Merged

Replaced downloading SDL2 from libsdl.org with git submodule SDL release 2.0.16 #1150

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8076e62
Replaced downloading SDL2-2.0.14.tar.gz from libsdl.org with git subm…
OlegOAndreev Sep 17, 2021
2f93496
Automatically init submodules if there are no sources in sdl2-sys/SDL.
OlegOAndreev Sep 17, 2021
c5b1b38
Added extra libraries to link for Android static build (you still nee…
OlegOAndreev Oct 4, 2021
78e46e9
Fixed changelog links.
OlegOAndreev Sep 17, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .gitmodules
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[submodule "sdl2-sys/SDL"]
path = sdl2-sys/SDL
url = https://github.com/libsdl-org/SDL/
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ SDL2 >= 2.0.8 is recommended to use these bindings, but note that SDL2 >= 2.0.5

### "Bundled" Feature

Since 0.31, this crate supports a feature named "bundled" which downloads SDL2 from source, compiles it and links it automatically. While this should work for any architecture, you **will** need a C compiler (like `gcc`, `clang`, or MS's own compiler) to use this feature properly.
Since 0.31, this crate supports a feature named "bundled" which compiles SDL2 from source and links it automatically. While this should work for any architecture, you **will** need a C compiler (like `gcc`, `clang`, or MS's own compiler) to use this feature properly.

### Linux
Install these through your favourite package management tool, or via
Expand Down
2 changes: 2 additions & 0 deletions changelog.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@ enum variants directly in your project, you may be affected. If you only used sd

[PR #1138](https://github.com/Rust-SDL2/rust-sdl2/pull/1138) Added binding for `SDL_OpenURL`

[PR #1150](https://github.com/Rust-SDL2/rust-sdl2/pull/1150) Do not download SDL2 sources when using bundled feature

### v0.34.5

[PR #1100](https://github.com/Rust-SDL2/rust-sdl2/pull/1100) Added binding for `SDL_GetDisplayUsableBounds`
Expand Down
10 changes: 1 addition & 9 deletions sdl2-sys/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,18 +35,10 @@ optional = true
version = "^0.1"
optional = true

[build-dependencies.tar]
version = "^0.4"
optional = true

[build-dependencies.flate2]
version = "^1"
optional = true

[build-dependencies.unidiff]
version = "^0.3"
optional = true

[build-dependencies]
version-compare = "0.0.10"
cfg-if = "^1.0"
Expand All @@ -59,7 +51,7 @@ use-vcpkg = ["vcpkg"]
use-bindgen = ["bindgen"]
static-link = []
use_mac_framework = []
bundled = ["cmake", "tar", "flate2", "unidiff"]
bundled = ["cmake"]
mixer = []
image = []
ttf = []
Expand Down
1 change: 1 addition & 0 deletions sdl2-sys/SDL
Open in desktop
Submodule SDL added at 25f9ed
138 changes: 0 additions & 138 deletions sdl2-sys/SDL2-2.0.14/include/SDL.h
View file
Open in desktop

This file was deleted.

Loading