Kill config.h and just force-include acconf.h in non-pch builds

This commit is contained in:
Thomas Goyne 2014-04-15 19:33:37 -07:00
parent dcf1270fc4
commit 1d5292fdee
218 changed files with 11 additions and 508 deletions

View File

@ -152,8 +152,8 @@ OBJCXXFLAGS := $(CXXFLAGS)
####################
# PRECOMPILED HEADER
####################
ifeq (yes, $(PRECOMPILED_HEADER))
ifdef PRECOMPILED_HEADER_NAME
ifdef PRECOMPILED_HEADER_NAME
ifeq (yes, $(PRECOMPILED_HEADER))
CXXFLAGS += -include $(PRECOMPILED_HEADER_NAME) $(PCHFLAGS)
# This hack is required until we can use the 'private' keyword (gmake 3.82) to avoid all the
# per-object CXXFLAGS being triggered by the ($OBJ) line.
@ -161,6 +161,8 @@ ifeq (yes, $(PRECOMPILED_HEADER))
$(OBJ): | $(PRECOMPILED_HEADER_NAME).gch
$(PRECOMPILED_HEADER_NAME).gch: CXXFLAGS = $(CXXFLAGS_GNU_MAKE_SUCKS)
$(PRECOMPILED_HEADER_NAME).gch: $(PRECOMPILED_HEADER_NAME)
else
CXXFLAGS += -include acconf.h
endif
endif

View File

@ -14,7 +14,6 @@
//
// Aegisub Project http://www.aegisub.org/
#include "config.h"
#include "auto4_lua_utils.h"

View File

@ -14,8 +14,6 @@
//
// Aegisub Project http://www.aegisub.org/
#include "../config.h"
#include "libaegisub/ass/dialogue_parser.h"
#include "libaegisub/spellchecker.h"

View File

@ -5,8 +5,6 @@ Project Webpage: http://cajun-jsonapi.sourceforge.net/
Author: Terry Caton
***********************************************/
#include "../../config.h"
#include "libaegisub/cajun/elements.h"
#include "libaegisub/cajun/visitor.h"
@ -62,7 +60,6 @@ public:
virtual void Accept(Visitor& visitor) = 0;
};
template <typename ElementTypeT>
class UnknownElement::Imp_T final : public UnknownElement::Imp
{
@ -155,7 +152,6 @@ ElementTypeT& UnknownElement::CastTo()
void UnknownElement::Accept(ConstVisitor& visitor) const { m_pImp->Accept(visitor); }
void UnknownElement::Accept(Visitor& visitor) { m_pImp->Accept(visitor); }
bool UnknownElement::operator == (const UnknownElement& element) const
{
return m_pImp->Compare(*element.m_pImp);

View File

@ -192,7 +192,6 @@ void Reader::Scan(Tokens& tokens, InputStream& inputStream) {
}
}
void Reader::EatWhiteSpace(InputStream& inputStream) {
while (!inputStream.EOS() && ::isspace(inputStream.Peek()))
inputStream.Get();

View File

@ -14,8 +14,6 @@
//
// Aegisub Project http://www.aegisub.org/
#include "../config.h"
#include "libaegisub/calltip_provider.h"
#include "libaegisub/ass/dialogue_parser.h"

View File

@ -16,8 +16,6 @@
/// @brief A charset converter for ISO-6937-2
/// @ingroup libaegisub
#include "../config.h"
#include "charset_6937.h"
#include <algorithm>

View File

@ -22,8 +22,6 @@
#include <cassert>
#include <map>
#include "../config.h"
#include <libaegisub/charset_conv.h>
#include <iconv.h>
@ -312,7 +310,7 @@ void IconvWrapper::Convert(const char *src, size_t srcLen, std::string &dest) {
dest.append(buff, sizeof(buff) - dstLen);
} while (res == iconv_failed && errno == E2BIG);
if (res == iconv_failed) {
switch (errno) {
case EINVAL:

View File

@ -12,8 +12,6 @@
// ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
// OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
#include "../config.h"
#include "libaegisub/color.h"
#include "parser.h"

View File

@ -14,8 +14,6 @@
//
// Aegisub Project http://www.aegisub.org/
#include "config.h"
#include "libaegisub/dispatch.h"
#include "libaegisub/util.h"

View File

@ -14,8 +14,6 @@
//
// Aegisub Project http://www.aegisub.org/
#include "../config.h"
#include "libaegisub/file_mapping.h"
#include "libaegisub/fs.h"

View File

@ -14,8 +14,6 @@
//
// Aegisub Project http://www.aegisub.org/
#include "config.h"
#include "libaegisub/fs.h"
#include "libaegisub/access.h"

View File

@ -16,8 +16,6 @@
/// @brief Hotkey handler
/// @ingroup hotkey menu event window
#include "../config.h"
#include "libaegisub/hotkey.h"
#include "libaegisub/cajun/writer.h"

View File

@ -16,8 +16,6 @@
/// @brief Parse JSON files and return json::UnknownElement
/// @ingroup libaegisub io
#include "../config.h"
#include "libaegisub/json.h"
#include "libaegisub/fs.h"

View File

@ -14,8 +14,6 @@
//
// Aegisub Project http://www.aegisub.org/
#include "../config.h"
#include "libaegisub/kana_table.h"
#include <boost/range/algorithm.hpp>

View File

@ -14,8 +14,6 @@
//
// Aegisub Project http://www.aegisub.org/
#include "../config.h"
#include "libaegisub/karaoke_matcher.h"
#include "libaegisub/kana_table.h"

View File

@ -17,8 +17,6 @@
/// @ingroup libaegisub
///
#include "../config.h"
#include "libaegisub/keyframe.h"
#include <algorithm>

View File

@ -16,8 +16,6 @@
/// @brief Logging
/// @ingroup libaegisub
#include "../config.h"
#include "libaegisub/log.h"
#include "libaegisub/cajun/elements.h"

View File

@ -16,8 +16,6 @@
/// @brief Most Recently Used (MRU) Lists
/// @ingroup libaegisub
#include "../config.h"
#include "libaegisub/mru.h"
#include "libaegisub/cajun/writer.h"

View File

@ -16,8 +16,6 @@
/// @brief Option interface.
/// @ingroup libaegisub
#include "../config.h"
#include "libaegisub/option.h"
#include "libaegisub/cajun/reader.h"

View File

@ -17,8 +17,6 @@
/// @see option_visit.h
/// @ingroup libaegisub
#include "../config.h"
#include "option_visit.h"
#include <cassert>

View File

@ -14,8 +14,6 @@
//
// Aegisub Project http://www.aegisub.org/
#include "../config.h"
#include "parser.h"
#include "libaegisub/color.h"

View File

@ -18,8 +18,6 @@
/// @brief Platform-independent path code
/// @ingroup libaegisub
#include "../config.h"
#include "libaegisub/path.h"
#include "libaegisub/fs.h"

View File

@ -14,8 +14,6 @@
//
// Aegisub Project http://www.aegisub.org/
#include "../config.h"
#include "libaegisub/util.h"
#include "libaegisub/util_osx.h"

View File

@ -16,8 +16,6 @@
/// @brief Framerate handling of all sorts
/// @ingroup libaegisub video_input
#include "../config.h"
#include "libaegisub/vfr.h"
#include "libaegisub/charset.h"

View File

@ -1,9 +0,0 @@
#ifdef _WIN32 // Windows specific settings
#define HAVE_PTHREAD 1
#else
// Generated by configure.in
#include "../acconf.h"
#endif // _WIN32

View File

@ -1,4 +1,6 @@
#include "config.h"
#ifndef _WIN32
#include "../acconf.h"
#endif
#define WIN32_LEAN_AND_MEAN

View File

@ -16,8 +16,6 @@
/// @brief OSX Utilities
/// @ingroup libosxutil osx
#include "config.h"
#include "libaegisub/util_osx.h"
#import <ApplicationServices/ApplicationServices.h>

View File

@ -16,8 +16,6 @@
/// @brief Unix access methods.
/// @ingroup libaegisub unix
#include "config.h"
#include "libaegisub/access.h"
#include "libaegisub/fs.h"

View File

@ -14,8 +14,6 @@
//
// Aegisub Project http://www.aegisub.org/
#include "config.h"
#include "libaegisub/access.h"
#include "libaegisub/fs.h"
#include "libaegisub/io.h"

View File

@ -16,8 +16,6 @@
/// @brief Unix logging
/// @ingroup libaegisub
#include "config.h"
#include <cstdio>
#include <ctime>
#include <cstring>

View File

@ -16,8 +16,6 @@
/// @brief Unix utility methods.
/// @ingroup libaegisub unix
#include "config.h"
#include "libaegisub/util.h"
#include <boost/thread.hpp>

View File

@ -16,7 +16,6 @@
/// @brief Windows access methods.
/// @ingroup libaegisub windows
#include <libaegisub/access.h>
#include <libaegisub/fs.h>

View File

@ -14,8 +14,6 @@
//
// Aegisub Project http://www.aegisub.org/
#include "config.h"
#include "libaegisub/fs.h"
#include "libaegisub/access.h"

View File

@ -16,8 +16,6 @@
/// @brief Windows utility methods.
/// @ingroup libaegisub windows
#include "../config.h"
#include "libaegisub/util.h"
#include "libaegisub/charset_conv_win.h"

View File

@ -32,8 +32,6 @@
/// @ingroup utility
///
#include "config.h"
#include "aegisublocale.h"
#include "options.h"

View File

@ -32,7 +32,6 @@
/// @ingroup main
///
//
// Precompiled Header Source File for MSVC
//

View File

@ -49,8 +49,6 @@
// Ensure we get a consistent SDK with VS2012 + Win8 SDK
#define _USING_V110_SDK71_ 1
#include "config.h"
#include "../libaegisub/lagi_pre.h"
// General headers

View File

@ -14,8 +14,6 @@
//
// Aegisub Project http://www.aegisub.org/
#include "config.h"
#include "ass_attachment.h"
#include <libaegisub/ass/uuencode.h>

View File

@ -31,8 +31,6 @@
/// @brief Class for dialogue lines in subtitles
/// @ingroup subs_storage
#include "config.h"
#include "ass_dialogue.h"
#include "subtitle_format.h"
#include "utils.h"

View File

@ -19,8 +19,6 @@
/// @ingroup subs_storage
///
#include "config.h"
#include "ass_entry.h"
std::string const& AssEntry::GroupHeader(bool ssa) const {

View File

@ -32,8 +32,6 @@
/// @ingroup export
///
#include "config.h"
#include "ass_export_filter.h"
#include <boost/format.hpp>

View File

@ -32,8 +32,6 @@
/// @ingroup export
///
#include "config.h"
#include "ass_exporter.h"
#include "ass_export_filter.h"

View File

@ -14,8 +14,6 @@
//
// Aegisub Project http://www.aegisub.org/
#include "config.h"
#include "ass_file.h"
#include "ass_attachment.h"

View File

@ -19,8 +19,6 @@
/// @ingroup subs_storage
///
#include "config.h"
#include "ass_karaoke.h"
#include "ass_dialogue.h"
@ -49,7 +47,6 @@ std::string AssKaraoke::Syllable::GetText(bool k_tag) const {
return ret;
}
AssKaraoke::AssKaraoke(AssDialogue *line, bool auto_split, bool normalize) {
if (line) SetLine(line, auto_split, normalize);
}

View File

@ -33,8 +33,6 @@
/// @ingroup subs_storage
///
#include "config.h"
#include "ass_dialogue.h"
#include "utils.h"

View File

@ -12,8 +12,6 @@
// ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
// OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
#include "config.h"
#include "ass_parser.h"
#include "ass_attachment.h"

View File

@ -32,8 +32,6 @@
/// @ingroup subs_storage
///
#include "config.h"
#include "ass_style.h"
#include "subtitle_format.h"

View File

@ -32,8 +32,6 @@
/// @ingroup style_editor
///
#include "config.h"
#include "ass_style_storage.h"
#include "ass_style.h"

View File

@ -19,8 +19,6 @@
/// @ingroup subs_storage
///
#include "config.h"
#include "ass_time.h"
#include "utils.h"

View File

@ -32,8 +32,6 @@
/// @ingroup audio_ui
///
#include "config.h"
#include <cmath>
#include <wx/bmpbuttn.h>

View File

@ -32,8 +32,6 @@
///
/// Manage colour schemes for the audio display
#include "config.h"
#include <algorithm>
#include "audio_colorscheme.h"

View File

@ -32,8 +32,6 @@
/// @ingroup audio_ui
///
#include "config.h"
#include "audio_controller.h"
#include "ass_file.h"
@ -150,7 +148,6 @@ void AudioController::OnAudioProviderChanged()
OpenAudio(agi::fs::path(audio_url));
}
void AudioController::OpenAudio(agi::fs::path const& url)
{
if (url.empty())
@ -214,7 +211,6 @@ void AudioController::CloseAudio()
AnnounceAudioClose();
}
bool AudioController::IsAudioOpen() const
{
return player && provider;
@ -258,7 +254,6 @@ void AudioController::PlayRange(const TimeRange &range)
AnnouncePlaybackPosition(range.begin());
}
void AudioController::PlayPrimaryRange()
{
PlayRange(GetPrimaryPlaybackRange());
@ -287,7 +282,6 @@ void AudioController::PlayToEnd(int start_ms)
AnnouncePlaybackPosition(start_ms);
}
void AudioController::Stop()
{
if (!IsAudioOpen()) return;
@ -299,13 +293,11 @@ void AudioController::Stop()
AnnouncePlaybackStop();
}
bool AudioController::IsPlaying()
{
return IsAudioOpen() && playback_mode != PM_NotPlaying;
}
int AudioController::GetPlaybackPosition()
{
if (!IsPlaying()) return 0;
@ -338,7 +330,6 @@ void AudioController::SetVolume(double volume)
player->SetVolume(volume);
}
int64_t AudioController::SamplesFromMilliseconds(int64_t ms) const
{
/// @todo There might be some subtle rounding errors here.
@ -352,7 +343,6 @@ int64_t AudioController::SamplesFromMilliseconds(int64_t ms) const
return (millisamples + 999) / 1000;
}
int64_t AudioController::MillisecondsFromSamples(int64_t samples) const
{
/// @todo There might be some subtle rounding errors here.

View File

@ -33,8 +33,6 @@
/// @ingroup audio_ui
///
#include "config.h"
#include "audio_display.h"
#include "ass_time.h"
@ -246,7 +244,6 @@ public:
const int AudioDisplayScrollbar::min_width;
class AudioDisplayTimeline final : public AudioDisplayInteractionObject {
int duration; ///< Total duration in ms
double ms_per_pixel; ///< Milliseconds per pixel
@ -940,7 +937,6 @@ void AudioDisplay::SetDraggedObject(AudioDisplayInteractionObject *new_obj)
audio_marker.reset();
}
void AudioDisplay::SetTrackCursor(int new_pos, bool show_time)
{
if (new_pos == track_cursor_pos) return;

View File

@ -19,8 +19,6 @@
/// @ingroup audio_ui
///
#include "config.h"
#include "audio_karaoke.h"
#include "include/aegisub/context.h"

View File

@ -19,8 +19,6 @@
/// @ingroup audio_ui
///
#include "config.h"
#include "audio_marker.h"
#include "include/aegisub/context.h"

View File

@ -32,8 +32,6 @@
/// @ingroup audio_output
///
#include "config.h"
#include "include/aegisub/audio_player.h"
#include "audio_controller.h"

View File

@ -32,8 +32,6 @@
/// @ingroup audio_output
///
#include "config.h"
#ifdef WITH_ALSA
#include "include/aegisub/audio_player.h"
@ -250,7 +248,7 @@ do_setup:
{
int64_t orig_position = position;
int64_t orig_ps_end_position = ps.end_position;
ScopedAliveFlag playing_flag(ps.playing);
// Sleep a bit, or until an event

View File

@ -32,8 +32,6 @@
/// @ingroup audio_output
///
#include "config.h"
#ifdef WITH_DIRECTSOUND
#include "include/aegisub/audio_player.h"
@ -374,4 +372,3 @@ std::unique_ptr<AudioPlayer> CreateDirectSoundPlayer(AudioProvider *provider, wx
}
#endif // WITH_DIRECTSOUND

View File

@ -32,8 +32,6 @@
/// @ingroup audio_output
///
#include "config.h"
#ifdef WITH_DIRECTSOUND
#include "include/aegisub/audio_player.h"
@ -234,14 +232,12 @@ class DirectSoundPlayer2Thread {
/// Audio frame to end playback at
int64_t end_frame = 0;
/// Desired length in milliseconds to write ahead of the playback cursor
int wanted_latency;
/// Multiplier for WantedLatency to get total buffer length
int buffer_length;
/// System millisecond timestamp of last playback start, used to calculate playback position
DWORD last_playback_restart;
@ -364,7 +360,6 @@ void DirectSoundPlayer2Thread::Run()
//wx Log Debug("DirectSoundPlayer2: Created buffer of %d bytes, supposed to be %d milliseconds or %d frames", bufSize, WANTED_LATENCY*BUFFER_LENGTH, bufSize/provider->GetBytesPerSample());
// Now we're ready to roll!
SetEvent(thread_running);
bool running = true;

View File

@ -32,8 +32,6 @@
/// @ingroup audio_output
///
#include "config.h"
#ifdef WITH_OPENAL
#include "include/aegisub/audio_player.h"

View File

@ -30,8 +30,6 @@
/// @ingroup audio_output
///
#include "config.h"
#ifdef WITH_OSS
#include "include/aegisub/audio_player.h"
@ -103,7 +101,6 @@ public:
::close(dspdev);
}
void Play(int64_t start, int64_t count);
void Stop();
bool IsPlaying() { return playing; }

View File

@ -32,8 +32,6 @@
/// @ingroup audio_output
///
#include "config.h"
#ifdef WITH_PORTAUDIO
#include "audio_player_portaudio.h"

View File

@ -32,8 +32,6 @@
/// @ingroup audio_output
///
#include "config.h"
#ifdef WITH_LIBPULSE
#include "include/aegisub/audio_player.h"

View File

@ -32,8 +32,6 @@
/// @ingroup audio_input
///
#include "config.h"
#include "include/aegisub/audio_provider.h"
#include "audio_controller.h"

View File

@ -32,8 +32,6 @@
/// @ingroup audio_input
///
#include "config.h"
#ifdef WITH_AVISYNTH
#include "include/aegisub/audio_provider.h"

View File

@ -19,8 +19,6 @@
/// @ingroup audio_input
///
#include "config.h"
#include "include/aegisub/audio_provider.h"
#include "audio_controller.h"

View File

@ -32,8 +32,6 @@
/// @ingroup audio_input
///
#include "config.h"
#include "include/aegisub/audio_provider.h"
#include <libaegisub/fs.h>

View File

@ -32,8 +32,6 @@
/// @ingroup audio_input ffms
///
#include "config.h"
#ifdef WITH_FFMS2
#include "include/aegisub/audio_provider.h"

View File

@ -14,8 +14,6 @@
//
// Aegisub Project http://www.aegisub.org/
#include "config.h"
#include "include/aegisub/audio_provider.h"
#include "audio_controller.h"

View File

@ -16,8 +16,6 @@
/// @brief An audio provider adapter for un-threadsafe audio providers
/// @ingroup audio_input
#include "config.h"
#include "include/aegisub/audio_provider.h"
#include <libaegisub/util.h>

View File

@ -32,8 +32,6 @@
/// @ingroup audio_input
///
#include "config.h"
#include "include/aegisub/audio_provider.h"
#include "audio_controller.h"

View File

@ -32,8 +32,6 @@
/// @ingroup audio_input
///
#include "config.h"
#include "include/aegisub/audio_provider.h"
#include "audio_controller.h"

View File

@ -31,8 +31,6 @@
/// @brief Base classes for audio renderers (spectrum, waveform, ...)
/// @ingroup audio_ui
#include "config.h"
#include "audio_renderer.h"
#include "include/aegisub/audio_provider.h"
@ -61,7 +59,6 @@ size_t AudioRendererBitmapCacheBitmapFactory::GetBlockSize() const
return sizeof(wxBitmap) + renderer->cache_bitmap_width * renderer->pixel_height * 3;
}
AudioRenderer::AudioRenderer()
{
for (int i = 0; i < AudioStyle_MAX; ++i)
@ -84,7 +81,6 @@ void AudioRenderer::SetMillisecondsPerPixel(double new_pixel_ms)
ResetBlockCount();
}
void AudioRenderer::SetHeight(int _pixel_height)
{
if (pixel_height == _pixel_height) return;
@ -93,7 +89,6 @@ void AudioRenderer::SetHeight(int _pixel_height)
Invalidate();
}
void AudioRenderer::SetAmplitudeScale(float _amplitude_scale)
{
if (amplitude_scale == _amplitude_scale) return;
@ -108,7 +103,6 @@ void AudioRenderer::SetAmplitudeScale(float _amplitude_scale)
Invalidate();
}
void AudioRenderer::SetRenderer(AudioRendererBitmapProvider *_renderer)
{
if (renderer == _renderer) return;
@ -124,7 +118,6 @@ void AudioRenderer::SetRenderer(AudioRendererBitmapProvider *_renderer)
}
}
void AudioRenderer::SetAudioProvider(AudioProvider *_provider)
{
if (provider == _provider) return;
@ -138,7 +131,6 @@ void AudioRenderer::SetAudioProvider(AudioProvider *_provider)
ResetBlockCount();
}
void AudioRenderer::SetCacheMaxSize(size_t max_size)
{
// Limit the bitmap cache sizes to 16 MB hard, to avoid the risk of exhausting
@ -149,7 +141,6 @@ void AudioRenderer::SetCacheMaxSize(size_t max_size)
cache_renderer_maxsize = max_size - 4*cache_bitmap_maxsize;
}
void AudioRenderer::ResetBlockCount()
{
if (provider)
@ -161,7 +152,6 @@ void AudioRenderer::ResetBlockCount()
}
}
const wxBitmap *AudioRenderer::GetCachedBitmap(int i, AudioRenderingStyle style)
{
assert(provider);
@ -180,7 +170,6 @@ const wxBitmap *AudioRenderer::GetCachedBitmap(int i, AudioRenderingStyle style)
return bmp;
}
void AudioRenderer::Render(wxDC &dc, wxPoint origin, int start, int length, AudioRenderingStyle style)
{
assert(start >= 0);
@ -225,14 +214,12 @@ void AudioRenderer::Render(wxDC &dc, wxPoint origin, int start, int length, Audi
}
}
void AudioRenderer::Invalidate()
{
for (auto& bmp : bitmaps) bmp.Age(0);
needs_age = false;
}
void AudioRendererBitmapProvider::SetProvider(AudioProvider *_provider)
{
if (provider == _provider) return;
@ -242,7 +229,6 @@ void AudioRendererBitmapProvider::SetProvider(AudioProvider *_provider)
OnSetProvider();
}
void AudioRendererBitmapProvider::SetMillisecondsPerPixel(double new_pixel_ms)
{
if (pixel_ms == new_pixel_ms) return;
@ -252,7 +238,6 @@ void AudioRendererBitmapProvider::SetMillisecondsPerPixel(double new_pixel_ms)
OnSetMillisecondsPerPixel();
}
void AudioRendererBitmapProvider::SetAmplitudeScale(float _amplitude_scale)
{
if (amplitude_scale == _amplitude_scale) return;

View File

@ -32,8 +32,6 @@
/// @brief Caching frequency-power spectrum renderer for audio display
/// @ingroup audio_ui