dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Exclude MinGW headers from source/project files on non-MinGW platforms

Browse Source
This commit is contained in:
Jonathan G Rennison
2019-04-11 21:05:36 +01:00
parent 1c7b454a57
commit 5c1168603d
9 changed files with 8 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
configure vendored
View File

@@ -120,6 +120,7 @@ AWKCOMMAND='
if ($0 == "WIN32" && "'$os'" != "MINGW" && if ($0 == "WIN32" && "'$os'" != "MINGW" &&
"'$os'" != "CYGWIN" && "'$os'" != "MSVC") { next; } "'$os'" != "CYGWIN" && "'$os'" != "MSVC") { next; }
if ($0 == "MSVC" && "'$os'" != "MSVC") { next; } if ($0 == "MSVC" && "'$os'" != "MSVC") { next; }
if ($0 == "MINGW" && "'$os'" != "MINGW") { next; }
if ($0 == "DIRECTMUSIC" && "'$with_direct_music'" == "0") { next; } if ($0 == "DIRECTMUSIC" && "'$with_direct_music'" == "0") { next; }
if ($0 == "FLUIDSYNTH" && "'$fluidsynth'" == "" ) { next; } if ($0 == "FLUIDSYNTH" && "'$fluidsynth'" == "" ) { next; }
if ($0 == "USE_XAUDIO2" && "'$with_xaudio2'" == "0") { next; } if ($0 == "USE_XAUDIO2" && "'$with_xaudio2'" == "0") { next; }

1
projects/generate
View File

@@ -136,6 +136,7 @@ load_main_data() {
if ($0 == "WIN32" && "'$os'" != "MINGW" && if ($0 == "WIN32" && "'$os'" != "MINGW" &&
"'$os'" != "CYGWIN" && "'$os'" != "MSVC" ) { next; } "'$os'" != "CYGWIN" && "'$os'" != "MSVC" ) { next; }
if ($0 == "MSVC" && "'$os'" != "MSVC") { next; } if ($0 == "MSVC" && "'$os'" != "MSVC") { next; }
if ($0 == "MINGW" && "'$os'" != "MINGW") { next; }
if ($0 == "DIRECTMUSIC" && "'$enable_directmusic'" != "1") { next; } if ($0 == "DIRECTMUSIC" && "'$enable_directmusic'" != "1") { next; }
if ($0 == "FLUIDSYNTH" && "'$enable_fluidsynth'" != "1") { next; } if ($0 == "FLUIDSYNTH" && "'$enable_fluidsynth'" != "1") { next; }
if ($0 == "USE_XAUDIO2" && "'$with_xaudio2'" == "0") { next; } if ($0 == "USE_XAUDIO2" && "'$with_xaudio2'" == "0") { next; }

4
projects/openttd_vs140.vcxproj
View File

@@ -1403,10 +1403,6 @@
<ClInclude Include="..\src\3rdparty\cpp-btree\safe_btree.h" /> <ClInclude Include="..\src\3rdparty\cpp-btree\safe_btree.h" />
<ClInclude Include="..\src\3rdparty\cpp-btree\safe_btree_map.h" /> <ClInclude Include="..\src\3rdparty\cpp-btree\safe_btree_map.h" />
<ClInclude Include="..\src\3rdparty\cpp-btree\safe_btree_set.h" /> <ClInclude Include="..\src\3rdparty\cpp-btree\safe_btree_set.h" />
<ClInclude Include="..\src\3rdparty\mingw-std-threads\mingw.condition_variable.h" />
<ClInclude Include="..\src\3rdparty\mingw-std-threads\mingw.mutex.h" />
<ClInclude Include="..\src\3rdparty\mingw-std-threads\mingw.shared_mutex.h" />
<ClInclude Include="..\src\3rdparty\mingw-std-threads\mingw.thread.h" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<None Include="..\media\openttd.ico" /> <None Include="..\media\openttd.ico" />

12
projects/openttd_vs140.vcxproj.filters
View File

@@ -3303,18 +3303,6 @@
<ClInclude Include="..\src\3rdparty\cpp-btree\safe_btree_set.h"> <ClInclude Include="..\src\3rdparty\cpp-btree\safe_btree_set.h">
<Filter>Btree containers</Filter> <Filter>Btree containers</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="..\src\3rdparty\mingw-std-threads\mingw.condition_variable.h">
<Filter>MinGW threading</Filter>
</ClInclude>
<ClInclude Include="..\src\3rdparty\mingw-std-threads\mingw.mutex.h">
<Filter>MinGW threading</Filter>
</ClInclude>
<ClInclude Include="..\src\3rdparty\mingw-std-threads\mingw.shared_mutex.h">
<Filter>MinGW threading</Filter>
</ClInclude>
<ClInclude Include="..\src\3rdparty\mingw-std-threads\mingw.thread.h">
<Filter>MinGW threading</Filter>
</ClInclude>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<None Include="..\media\openttd.ico" /> <None Include="..\media\openttd.ico" />

4
projects/openttd_vs141.vcxproj
View File

@@ -1403,10 +1403,6 @@
<ClInclude Include="..\src\3rdparty\cpp-btree\safe_btree.h" /> <ClInclude Include="..\src\3rdparty\cpp-btree\safe_btree.h" />
<ClInclude Include="..\src\3rdparty\cpp-btree\safe_btree_map.h" /> <ClInclude Include="..\src\3rdparty\cpp-btree\safe_btree_map.h" />
<ClInclude Include="..\src\3rdparty\cpp-btree\safe_btree_set.h" /> <ClInclude Include="..\src\3rdparty\cpp-btree\safe_btree_set.h" />
<ClInclude Include="..\src\3rdparty\mingw-std-threads\mingw.condition_variable.h" />
<ClInclude Include="..\src\3rdparty\mingw-std-threads\mingw.mutex.h" />
<ClInclude Include="..\src\3rdparty\mingw-std-threads\mingw.shared_mutex.h" />
<ClInclude Include="..\src\3rdparty\mingw-std-threads\mingw.thread.h" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<None Include="..\media\openttd.ico" /> <None Include="..\media\openttd.ico" />

12
projects/openttd_vs141.vcxproj.filters
View File

@@ -3303,18 +3303,6 @@
<ClInclude Include="..\src\3rdparty\cpp-btree\safe_btree_set.h"> <ClInclude Include="..\src\3rdparty\cpp-btree\safe_btree_set.h">
<Filter>Btree containers</Filter> <Filter>Btree containers</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="..\src\3rdparty\mingw-std-threads\mingw.condition_variable.h">
<Filter>MinGW threading</Filter>
</ClInclude>
<ClInclude Include="..\src\3rdparty\mingw-std-threads\mingw.mutex.h">
<Filter>MinGW threading</Filter>
</ClInclude>
<ClInclude Include="..\src\3rdparty\mingw-std-threads\mingw.shared_mutex.h">
<Filter>MinGW threading</Filter>
</ClInclude>
<ClInclude Include="..\src\3rdparty\mingw-std-threads\mingw.thread.h">
<Filter>MinGW threading</Filter>
</ClInclude>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<None Include="..\media\openttd.ico" /> <None Include="..\media\openttd.ico" />

4
projects/openttd_vs142.vcxproj
View File

@@ -1403,10 +1403,6 @@
<ClInclude Include="..\src\3rdparty\cpp-btree\safe_btree.h" /> <ClInclude Include="..\src\3rdparty\cpp-btree\safe_btree.h" />
<ClInclude Include="..\src\3rdparty\cpp-btree\safe_btree_map.h" /> <ClInclude Include="..\src\3rdparty\cpp-btree\safe_btree_map.h" />
<ClInclude Include="..\src\3rdparty\cpp-btree\safe_btree_set.h" /> <ClInclude Include="..\src\3rdparty\cpp-btree\safe_btree_set.h" />
<ClInclude Include="..\src\3rdparty\mingw-std-threads\mingw.condition_variable.h" />
<ClInclude Include="..\src\3rdparty\mingw-std-threads\mingw.mutex.h" />
<ClInclude Include="..\src\3rdparty\mingw-std-threads\mingw.shared_mutex.h" />
<ClInclude Include="..\src\3rdparty\mingw-std-threads\mingw.thread.h" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<None Include="..\media\openttd.ico" /> <None Include="..\media\openttd.ico" />

12
projects/openttd_vs142.vcxproj.filters
View File

@@ -3303,18 +3303,6 @@
<ClInclude Include="..\src\3rdparty\cpp-btree\safe_btree_set.h"> <ClInclude Include="..\src\3rdparty\cpp-btree\safe_btree_set.h">
<Filter>Btree containers</Filter> <Filter>Btree containers</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="..\src\3rdparty\mingw-std-threads\mingw.condition_variable.h">
<Filter>MinGW threading</Filter>
</ClInclude>
<ClInclude Include="..\src\3rdparty\mingw-std-threads\mingw.mutex.h">
<Filter>MinGW threading</Filter>
</ClInclude>
<ClInclude Include="..\src\3rdparty\mingw-std-threads\mingw.shared_mutex.h">
<Filter>MinGW threading</Filter>
</ClInclude>
<ClInclude Include="..\src\3rdparty\mingw-std-threads\mingw.thread.h">
<Filter>MinGW threading</Filter>
</ClInclude>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<None Include="..\media\openttd.ico" /> <None Include="..\media\openttd.ico" />

10
source.list
View File

@@ -1249,7 +1249,9 @@ scope_info.h
3rdparty/cpp-btree/safe_btree_set.h 3rdparty/cpp-btree/safe_btree_set.h
# MinGW threading # MinGW threading
3rdparty/mingw-std-threads/mingw.condition_variable.h #if MINGW
3rdparty/mingw-std-threads/mingw.mutex.h 3rdparty/mingw-std-threads/mingw.condition_variable.h
3rdparty/mingw-std-threads/mingw.shared_mutex.h 3rdparty/mingw-std-threads/mingw.mutex.h
3rdparty/mingw-std-threads/mingw.thread.h 3rdparty/mingw-std-threads/mingw.shared_mutex.h
3rdparty/mingw-std-threads/mingw.thread.h
#end