diff options
| author | glx <glx@openttd.org> | 2020-05-26 21:38:07 +0200 |
|---|---|---|
| committer | glx22 <glx22@users.noreply.github.com> | 2020-05-26 22:44:18 +0200 |
| commit | bfa2e4edf001d617402da443a707a4445ee799b6 (patch) | |
| tree | 98c989b414a9c180aae5c104ac495ec2c9c9a485 | |
| parent | 2b2f60caf5f4b7db182940e3b9fbb5d2e8129032 (diff) | |
| download | openttd-bfa2e4edf001d617402da443a707a4445ee799b6.tar.xz | |
Fix: Inconsistency in handling of SDL2 in source.list
| -rwxr-xr-x | projects/generate | 2 | ||||
| -rw-r--r-- | projects/generate.vbs | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/projects/generate b/projects/generate index d1316a232..7d3c59965 100755 --- a/projects/generate +++ b/projects/generate @@ -69,6 +69,7 @@ fi # First, collect the list of Windows files allegro_config="" sdl_config="1" +sdl2_config="1" png_config="1" os="MSVC" enable_dedicated="0" @@ -123,6 +124,7 @@ load_main_data() { if ($0 == "ALLEGRO" && "'$allegro_config'" == "") { next; } if ($0 == "SDL" && "'$sdl_config'" == "") { next; } + if ($0 == "SDL2" && "'$sdl2_config'" == "") { next; } if ($0 == "PNG" && "'$png_config'" == "") { next; } if ($0 == "OSX" && "'$os'" != "OSX") { next; } if ($0 == "OS2" && "'$os'" != "OS2") { next; } diff --git a/projects/generate.vbs b/projects/generate.vbs index daeb32b03..577dce955 100644 --- a/projects/generate.vbs +++ b/projects/generate.vbs @@ -172,6 +172,7 @@ Sub load_main_data(filename, ByRef vcxproj, ByRef filters, ByRef files) line = Replace(line, "#if ", "") If deep = skip And ( _ line = "SDL" Or _ + line = "SDL2" Or _ line = "PNG" Or _ line = "WIN32" Or _ line = "MSVC" Or _ |