mirror of https://github.com/OpenTTD/OpenTTD.git
Fix: Inconsistency in handling of SDL2 in source.list
This commit is contained in:
parent
2b2f60caf5
commit
bfa2e4edf0
|
@ -69,6 +69,7 @@ fi
|
||||||
# First, collect the list of Windows files
|
# First, collect the list of Windows files
|
||||||
allegro_config=""
|
allegro_config=""
|
||||||
sdl_config="1"
|
sdl_config="1"
|
||||||
|
sdl2_config="1"
|
||||||
png_config="1"
|
png_config="1"
|
||||||
os="MSVC"
|
os="MSVC"
|
||||||
enable_dedicated="0"
|
enable_dedicated="0"
|
||||||
|
@ -123,6 +124,7 @@ load_main_data() {
|
||||||
|
|
||||||
if ($0 == "ALLEGRO" && "'$allegro_config'" == "") { next; }
|
if ($0 == "ALLEGRO" && "'$allegro_config'" == "") { next; }
|
||||||
if ($0 == "SDL" && "'$sdl_config'" == "") { next; }
|
if ($0 == "SDL" && "'$sdl_config'" == "") { next; }
|
||||||
|
if ($0 == "SDL2" && "'$sdl2_config'" == "") { next; }
|
||||||
if ($0 == "PNG" && "'$png_config'" == "") { next; }
|
if ($0 == "PNG" && "'$png_config'" == "") { next; }
|
||||||
if ($0 == "OSX" && "'$os'" != "OSX") { next; }
|
if ($0 == "OSX" && "'$os'" != "OSX") { next; }
|
||||||
if ($0 == "OS2" && "'$os'" != "OS2") { next; }
|
if ($0 == "OS2" && "'$os'" != "OS2") { next; }
|
||||||
|
|
|
@ -172,6 +172,7 @@ Sub load_main_data(filename, ByRef vcxproj, ByRef filters, ByRef files)
|
||||||
line = Replace(line, "#if ", "")
|
line = Replace(line, "#if ", "")
|
||||||
If deep = skip And ( _
|
If deep = skip And ( _
|
||||||
line = "SDL" Or _
|
line = "SDL" Or _
|
||||||
|
line = "SDL2" Or _
|
||||||
line = "PNG" Or _
|
line = "PNG" Or _
|
||||||
line = "WIN32" Or _
|
line = "WIN32" Or _
|
||||||
line = "MSVC" Or _
|
line = "MSVC" Or _
|
||||||
|
|
Loading…
Reference in New Issue