diff options
| author | Patric Stout <truebrain@openttd.org> | 2019-04-07 12:02:04 +0200 |
|---|---|---|
| committer | glx22 <glx22@users.noreply.github.com> | 2020-06-05 19:36:05 +0200 |
| commit | 4d04009d12932270da0e492b155cb2e699389c30 (patch) | |
| tree | e29a7242195bb91a08fc0ca4bc82ecd399b700f0 | |
| parent | 4218ebc932950a8751146784ea5dad127bc27b10 (diff) | |
| download | openttd-4d04009d12932270da0e492b155cb2e699389c30.tar.xz | |
Codechange: remove #ifdef from .cpp files to exclude features
With CMake, these files are simply not compiled to start with.
| -rw-r--r-- | src/music/dmusic.cpp | 5 | ||||
| -rw-r--r-- | src/os/windows/string_uniscribe.cpp | 4 | ||||
| -rw-r--r-- | src/os/windows/string_uniscribe.h | 4 | ||||
| -rw-r--r-- | src/sound/xaudio2_s.cpp | 4 |
4 files changed, 0 insertions, 17 deletions
diff --git a/src/music/dmusic.cpp b/src/music/dmusic.cpp index 780666142..b7bee4a4f 100644 --- a/src/music/dmusic.cpp +++ b/src/music/dmusic.cpp @@ -7,8 +7,6 @@ /** @file dmusic.cpp Playing music via DirectMusic. */ -#ifdef WIN32_ENABLE_DIRECTMUSIC_SUPPORT - #define INITGUID #include "../stdafx.h" #ifdef WIN32_LEAN_AND_MEAN @@ -1241,6 +1239,3 @@ void MusicDriver_DMusic::SetVolume(byte vol) { _playback.new_volume = vol; } - - -#endif /* WIN32_ENABLE_DIRECTMUSIC_SUPPORT */ diff --git a/src/os/windows/string_uniscribe.cpp b/src/os/windows/string_uniscribe.cpp index ce433364a..42a003ae1 100644 --- a/src/os/windows/string_uniscribe.cpp +++ b/src/os/windows/string_uniscribe.cpp @@ -7,8 +7,6 @@ /** @file string_uniscribe.cpp Functions related to laying out text on Win32. */ -#if defined(WITH_UNISCRIBE) - #include "../../stdafx.h" #include "../../debug.h" #include "string_uniscribe.h" @@ -620,5 +618,3 @@ const int *UniscribeParagraphLayout::UniscribeVisualRun::GetGlyphToCharMap() con return this->utf16_to_utf8[this->cur_pos]; } - -#endif /* defined(WITH_UNISCRIBE) */ diff --git a/src/os/windows/string_uniscribe.h b/src/os/windows/string_uniscribe.h index 9470b44b0..7ec7ca670 100644 --- a/src/os/windows/string_uniscribe.h +++ b/src/os/windows/string_uniscribe.h @@ -10,8 +10,6 @@ #ifndef STRING_UNISCRIBE_H #define STRING_UNISCRIBE_H -#if defined(WITH_UNISCRIBE) - #include "../../gfx_layout.h" #include "../../string_base.h" #include <vector> @@ -85,6 +83,4 @@ public: size_t Prev(IterType what) override; }; -#endif /* defined(WITH_UNISCRIBE) */ - #endif /* STRING_UNISCRIBE_H */ diff --git a/src/sound/xaudio2_s.cpp b/src/sound/xaudio2_s.cpp index 5aa058040..e89e28a78 100644 --- a/src/sound/xaudio2_s.cpp +++ b/src/sound/xaudio2_s.cpp @@ -7,8 +7,6 @@ /** @file xaudio2_s.cpp XAudio2 sound driver. */ -#ifdef WITH_XAUDIO2 - #include "../stdafx.h" #include "../openttd.h" #include "../driver.h" @@ -267,5 +265,3 @@ void SoundDriver_XAudio2::Stop() FreeLibrary(_xaudio_dll_handle); CoUninitialize(); } - -#endif |