mirror of
https://github.com/OpenTTD/OpenTTD.git
synced 2025-03-12 18:40:29 +00:00
Codechange: remove #ifdef from .cpp files to exclude features
With CMake, these files are simply not compiled to start with.
This commit is contained in:
parent
4218ebc932
commit
4d04009d12
@ -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 */
|
||||
|
@ -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) */
|
||||
|
@ -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 */
|
||||
|
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user