From 076354184864ac6eec40f1de5b0378ce1aaa1ad9 Mon Sep 17 00:00:00 2001 From: Amar Takhar Date: Sun, 4 Jan 2009 06:31:48 +0000 Subject: [PATCH] Change how configuration works. * move win32/config0.h -> config/config_windows0.h * move win32/stdint.h -> msvc/stdint.h * move posix/defines.h -> config/config_unix.h * add config.h - brings in config_(windows|unix).h as required * add config.h to *.cpp * Self-contain FFmpegSource2 with required function defines wrapped with __UNIX__ instead of the now removed defines.h. * Edit aegisub_vs2008.vcproj to remove explicit inclusion of config.h, also change VCPreBuildEventTool to create windows_config.h from windows_config0.h. Add msvc to include path. * Change configure to create ./acconf.h instead of posix/acconf.h This will allow us to create a more standard and platform agnostic way of configuration aegsisub during build time. Originally committed to SVN as r2621. --- FFmpegSource2/ffaudiosource.cpp | 4 +- FFmpegSource2/ffms.cpp | 4 + FFmpegSource2/ffvideosource.cpp | 6 +- FFmpegSource2/indexing.cpp | 6 + FFmpegSource2/utils.cpp | 6 + aegisub/VideoSink.cpp | 2 + aegisub/aegisublocale.cpp | 2 + aegisub/ass_attachment.cpp | 2 + aegisub/ass_dialogue.cpp | 2 + aegisub/ass_entry.cpp | 2 + aegisub/ass_export_filter.cpp | 2 + aegisub/ass_exporter.cpp | 2 + aegisub/ass_file.cpp | 2 + aegisub/ass_karaoke.cpp | 2 + aegisub/ass_override.cpp | 2 + aegisub/ass_style.cpp | 2 + aegisub/ass_style_storage.cpp | 2 + aegisub/ass_time.cpp | 2 + aegisub/audio_box.cpp | 2 + aegisub/audio_display.cpp | 2 + aegisub/audio_karaoke.cpp | 2 + aegisub/audio_player.cpp | 2 + aegisub/audio_player_alsa.cpp | 2 + aegisub/audio_player_dsound.cpp | 2 + aegisub/audio_player_dsound2.cpp | 2 + aegisub/audio_player_openal.cpp | 2 + aegisub/audio_player_portaudio.cpp | 2 + aegisub/audio_player_pulse.cpp | 2 + aegisub/audio_provider.cpp | 2 + aegisub/audio_provider_avs.cpp | 2 + aegisub/audio_provider_convert.cpp | 2 + aegisub/audio_provider_downmix.cpp | 2 + aegisub/audio_provider_dummy.cpp | 2 + aegisub/audio_provider_ffmpegsource.cpp | 2 + aegisub/audio_provider_hd.cpp | 2 + aegisub/audio_provider_lavc.cpp | 2 + aegisub/audio_provider_pcm.cpp | 2 + aegisub/audio_provider_ram.cpp | 2 + aegisub/audio_provider_stream.cpp | 2 + aegisub/audio_spectrum.cpp | 2 + aegisub/auto4_auto3.cpp | 2 + aegisub/auto4_base.cpp | 2 + aegisub/auto4_lua.cpp | 2 + aegisub/auto4_lua_assfile.cpp | 2 + aegisub/auto4_lua_dialog.cpp | 2 + aegisub/auto4_lua_scriptreader.cpp | 2 + aegisub/auto4_perl.cpp | 2 + aegisub/auto4_perl_ass.cpp | 2 + aegisub/auto4_perl_console.cpp | 2 + aegisub/auto4_perl_dialogs.cpp | 2 + aegisub/auto4_perl_script.cpp | 2 + aegisub/auto4_ruby.cpp | 2 + aegisub/auto4_ruby_assfile.cpp | 2 + aegisub/auto4_ruby_dialog.cpp | 2 + aegisub/avisynth_wrap.cpp | 2 + aegisub/base_grid.cpp | 2 + aegisub/browse_button.cpp | 2 + aegisub/charset_detect.cpp | 2 + aegisub/colorspace.cpp | 2 + aegisub/colour_button.cpp | 2 + aegisub/config.h | 14 ++ .../{posix/defines.h => config/config_unix.h} | 0 .../config0.h => config/config_windows0.h} | 0 aegisub/dialog_about.cpp | 2 + aegisub/dialog_associations.cpp | 2 + aegisub/dialog_attachments.cpp | 2 + aegisub/dialog_automation.cpp | 2 + aegisub/dialog_colorpicker.cpp | 2 + aegisub/dialog_detached_video.cpp | 2 + aegisub/dialog_dummy_video.cpp | 2 + aegisub/dialog_export.cpp | 2 + aegisub/dialog_fonts_collector.cpp | 2 + aegisub/dialog_jumpto.cpp | 2 + aegisub/dialog_kanji_timer.cpp | 2 + aegisub/dialog_options.cpp | 2 + aegisub/dialog_paste_over.cpp | 2 + aegisub/dialog_progress.cpp | 2 + aegisub/dialog_properties.cpp | 2 + aegisub/dialog_resample.cpp | 2 + aegisub/dialog_search_replace.cpp | 2 + aegisub/dialog_selection.cpp | 2 + aegisub/dialog_shift_times.cpp | 2 + aegisub/dialog_spellchecker.cpp | 2 + aegisub/dialog_splash.cpp | 2 + aegisub/dialog_style_editor.cpp | 2 + aegisub/dialog_style_manager.cpp | 2 + aegisub/dialog_styling_assistant.cpp | 2 + aegisub/dialog_text_import.cpp | 2 + aegisub/dialog_timing_processor.cpp | 2 + aegisub/dialog_tip.cpp | 2 + aegisub/dialog_translation.cpp | 2 + aegisub/dialog_version_check.cpp | 2 + aegisub/dialog_video_details.cpp | 2 + aegisub/drop.cpp | 2 + aegisub/export_clean_info.cpp | 2 + aegisub/export_fixstyle.cpp | 2 + aegisub/export_framerate.cpp | 2 + aegisub/export_visible_lines.cpp | 2 + aegisub/ffmpegsource_common.cpp | 4 +- aegisub/fft.cpp | 2 + aegisub/float_spin.cpp | 2 + aegisub/font_file_lister.cpp | 2 + aegisub/font_file_lister_fontconfig.cpp | 2 + aegisub/font_file_lister_freetype.cpp | 3 +- aegisub/frame_main.cpp | 2 + aegisub/frame_main_events.cpp | 2 + aegisub/gl_text.cpp | 2 + aegisub/gl_wrap.cpp | 2 + aegisub/help_button.cpp | 2 + aegisub/hilimod_textctrl.cpp | 2 + aegisub/hotkeys.cpp | 2 + aegisub/idle_field_event.cpp | 2 + aegisub/kana_table.cpp | 2 + aegisub/keyframe.cpp | 2 + aegisub/lavc_file.cpp | 2 + aegisub/lavc_keyframes.cpp | 1 + aegisub/main.cpp | 2 + aegisub/mkv_wrap.cpp | 2 + aegisub/{win32 => msvc}/stdint.h | 0 aegisub/options.cpp | 2 + aegisub/osx_bevelButton.cpp | 2 + aegisub/plugin_manager.cpp | 2 + aegisub/scintilla_text_ctrl.cpp | 2 + aegisub/setup.cpp | 2 + aegisub/spellchecker.cpp | 2 + aegisub/spellchecker_hunspell.cpp | 2 + aegisub/spline.cpp | 2 + aegisub/spline_curve.cpp | 2 + aegisub/standard_paths.cpp | 2 + aegisub/static_bmp.cpp | 2 + aegisub/stdwx.cpp | 2 + aegisub/string_codec.cpp | 2 + aegisub/subs_edit_box.cpp | 2 + aegisub/subs_edit_ctrl.cpp | 2 + aegisub/subs_grid.cpp | 2 + aegisub/subs_preview.cpp | 2 + aegisub/subtitle_format.cpp | 2 + aegisub/subtitle_format_ass.cpp | 2 + aegisub/subtitle_format_dvd.cpp | 2 + aegisub/subtitle_format_encore.cpp | 2 + aegisub/subtitle_format_microdvd.cpp | 2 + aegisub/subtitle_format_mkv.cpp | 2 + aegisub/subtitle_format_prs.cpp | 2 + aegisub/subtitle_format_srt.cpp | 2 + aegisub/subtitle_format_transtation.cpp | 2 + aegisub/subtitle_format_ttxt.cpp | 2 + aegisub/subtitle_format_txt.cpp | 2 + aegisub/subtitles_provider.cpp | 2 + aegisub/subtitles_provider_csri.cpp | 2 + aegisub/subtitles_provider_libass.cpp | 2 + aegisub/text_file_reader.cpp | 2 + aegisub/text_file_writer.cpp | 2 + aegisub/thesaurus.cpp | 2 + aegisub/thesaurus_myspell.cpp | 2 + aegisub/timeedit_ctrl.cpp | 2 + aegisub/toggle_bitmap.cpp | 2 + aegisub/tooltip_manager.cpp | 2 + aegisub/utils.cpp | 2 + aegisub/validators.cpp | 2 + aegisub/variable_data.cpp | 2 + aegisub/vector2d.cpp | 2 + aegisub/version.cpp | 3 +- aegisub/vfr.cpp | 2 + aegisub/vfw_wrap.cpp | 2 + aegisub/video_box.cpp | 2 + aegisub/video_context.cpp | 2 + aegisub/video_display.cpp | 2 + aegisub/video_frame.cpp | 2 + aegisub/video_provider_avs.cpp | 2 + aegisub/video_provider_cache.cpp | 2 + aegisub/video_provider_dshow.cpp | 2 + aegisub/video_provider_dummy.cpp | 2 + aegisub/video_provider_ffmpegsource.cpp | 2 + aegisub/video_provider_lavc.cpp | 2 + aegisub/video_provider_manager.cpp | 2 + aegisub/video_slider.cpp | 2 + aegisub/visual_feature.cpp | 2 + aegisub/visual_tool.cpp | 2 + aegisub/visual_tool_clip.cpp | 2 + aegisub/visual_tool_cross.cpp | 2 + aegisub/visual_tool_drag.cpp | 2 + aegisub/visual_tool_rotatexy.cpp | 2 + aegisub/visual_tool_rotatez.cpp | 2 + aegisub/visual_tool_scale.cpp | 2 + aegisub/visual_tool_vector_clip.cpp | 2 + aegisub/win64/config0.h | 168 ------------- aegisub/win64/stdint.h | 221 ------------------ build/aegisub_vs2008/aegisub_vs2008.vcproj | 24 +- configure.in | 2 +- 189 files changed, 403 insertions(+), 407 deletions(-) create mode 100644 aegisub/config.h rename aegisub/{posix/defines.h => config/config_unix.h} (100%) rename aegisub/{win32/config0.h => config/config_windows0.h} (100%) rename aegisub/{win32 => msvc}/stdint.h (100%) delete mode 100644 aegisub/win64/config0.h delete mode 100644 aegisub/win64/stdint.h diff --git a/FFmpegSource2/ffaudiosource.cpp b/FFmpegSource2/ffaudiosource.cpp index 6a1968971..488fa4ae0 100644 --- a/FFmpegSource2/ffaudiosource.cpp +++ b/FFmpegSource2/ffaudiosource.cpp @@ -21,7 +21,9 @@ #include "ffaudiosource.h" #include - +#ifdef __UNIX__ +#define _snprintf snprintf +#endif AudioBase::AudioBase() { DecodingBuffer = new uint8_t[AVCODEC_MAX_AUDIO_FRAME_SIZE * 10]; diff --git a/FFmpegSource2/ffms.cpp b/FFmpegSource2/ffms.cpp index 2d93dc43b..15d089d21 100644 --- a/FFmpegSource2/ffms.cpp +++ b/FFmpegSource2/ffms.cpp @@ -23,6 +23,10 @@ #include "ffaudiosource.h" #include "indexing.h" +#ifdef __UNIX__ +#define _snprintf snprintf +#endif + FrameInfo::FrameInfo(int64_t DTS, bool KeyFrame) { this->DTS = DTS; this->SampleStart = 0; diff --git a/FFmpegSource2/ffvideosource.cpp b/FFmpegSource2/ffvideosource.cpp index d110aa16f..a3f2ac710 100644 --- a/FFmpegSource2/ffvideosource.cpp +++ b/FFmpegSource2/ffvideosource.cpp @@ -21,6 +21,10 @@ #include "ffvideosource.h" #include +#ifdef __UNIX__ +#define _snprintf snprintf +#endif + int VideoBase::InitPP(const char *PP, int PixelFormat, char *ErrorMsg, unsigned MsgSize) { if (PP == NULL || !strcmp(PP, "")) return 0; @@ -792,4 +796,4 @@ AVFrameLite *HaaliTSVideoSource::GetFrame(int n, char *ErrorMsg, unsigned MsgSiz return OutputFrame(DecodeFrame); } -#endif // HAALITS \ No newline at end of file +#endif // HAALITS diff --git a/FFmpegSource2/indexing.cpp b/FFmpegSource2/indexing.cpp index cd34e25d7..474bd60fe 100644 --- a/FFmpegSource2/indexing.cpp +++ b/FFmpegSource2/indexing.cpp @@ -27,6 +27,12 @@ #include "indexing.h" #include "wave64writer.h" +#ifdef __UNIX__ +#define _fseeki64 fseeko +#define _ftelli64 ftello +#define _snprintf snprintf +#endif + extern "C" { #include #include diff --git a/FFmpegSource2/utils.cpp b/FFmpegSource2/utils.cpp index e946060ef..aaaec64a6 100644 --- a/FFmpegSource2/utils.cpp +++ b/FFmpegSource2/utils.cpp @@ -25,6 +25,12 @@ # include #endif +#ifdef __UNIX__ +#define _fseeki64 fseeko +#define _ftelli64 ftello +#define _snprintf snprintf +#endif + int GetCPUFlags() { // FIXME Add proper feature detection when msvc isn't used int Flags = PP_CPU_CAPS_MMX | PP_CPU_CAPS_MMX2; diff --git a/aegisub/VideoSink.cpp b/aegisub/VideoSink.cpp index 25e19ed5a..efc6742b4 100644 --- a/aegisub/VideoSink.cpp +++ b/aegisub/VideoSink.cpp @@ -6,6 +6,8 @@ */ +#include "config.h" + #ifdef WITH_DIRECTSHOW #include #ifdef __WXDEBUG__ diff --git a/aegisub/aegisublocale.cpp b/aegisub/aegisublocale.cpp index 27407e0e2..d1134aa7a 100644 --- a/aegisub/aegisublocale.cpp +++ b/aegisub/aegisublocale.cpp @@ -36,6 +36,8 @@ /////////// // Headers +#include "config.h" + #include #include #include diff --git a/aegisub/ass_attachment.cpp b/aegisub/ass_attachment.cpp index 45668260c..ecf65cb12 100644 --- a/aegisub/ass_attachment.cpp +++ b/aegisub/ass_attachment.cpp @@ -36,6 +36,8 @@ //////////// // Includes +#include "config.h" + #include #include #include "ass_attachment.h" diff --git a/aegisub/ass_dialogue.cpp b/aegisub/ass_dialogue.cpp index ad4f8cbb0..d5bc12092 100644 --- a/aegisub/ass_dialogue.cpp +++ b/aegisub/ass_dialogue.cpp @@ -36,6 +36,8 @@ //////////// // Includes +#include "config.h" + #include #include #include diff --git a/aegisub/ass_entry.cpp b/aegisub/ass_entry.cpp index 32cfb2de1..875312fa2 100644 --- a/aegisub/ass_entry.cpp +++ b/aegisub/ass_entry.cpp @@ -36,6 +36,8 @@ /////////// // Headers +#include "config.h" + #include "ass_dialogue.h" #include "ass_style.h" #include "ass_attachment.h" diff --git a/aegisub/ass_export_filter.cpp b/aegisub/ass_export_filter.cpp index 9d5b6abde..3b0a12f1c 100644 --- a/aegisub/ass_export_filter.cpp +++ b/aegisub/ass_export_filter.cpp @@ -36,6 +36,8 @@ /////////// // Headers +#include "config.h" + #include "ass_export_filter.h" #include "ass_file.h" diff --git a/aegisub/ass_exporter.cpp b/aegisub/ass_exporter.cpp index 21ece053a..eb7c252f8 100644 --- a/aegisub/ass_exporter.cpp +++ b/aegisub/ass_exporter.cpp @@ -36,6 +36,8 @@ /////////// // Headers +#include "config.h" + #include "ass_exporter.h" #include "ass_export_filter.h" #include "ass_file.h" diff --git a/aegisub/ass_file.cpp b/aegisub/ass_file.cpp index b903beaa2..85b90ee57 100644 --- a/aegisub/ass_file.cpp +++ b/aegisub/ass_file.cpp @@ -36,6 +36,8 @@ //////////// // Includes +#include "config.h" + #include #include #include diff --git a/aegisub/ass_karaoke.cpp b/aegisub/ass_karaoke.cpp index 85eed07d7..47bfbcd0c 100644 --- a/aegisub/ass_karaoke.cpp +++ b/aegisub/ass_karaoke.cpp @@ -34,6 +34,8 @@ // +#include "config.h" + #include "ass_karaoke.h" #include "ass_override.h" diff --git a/aegisub/ass_override.cpp b/aegisub/ass_override.cpp index c7dcb7fda..04bb95fe4 100644 --- a/aegisub/ass_override.cpp +++ b/aegisub/ass_override.cpp @@ -36,6 +36,8 @@ //////////// // Includes +#include "config.h" + #include "ass_dialogue.h" #include "ass_override.h" #include diff --git a/aegisub/ass_style.cpp b/aegisub/ass_style.cpp index d1ed584d1..68d4980d4 100644 --- a/aegisub/ass_style.cpp +++ b/aegisub/ass_style.cpp @@ -35,6 +35,8 @@ //////////// // Includes +#include "config.h" + #include #include #include "ass_style.h" diff --git a/aegisub/ass_style_storage.cpp b/aegisub/ass_style_storage.cpp index 75273b20e..ce3b4a8fa 100644 --- a/aegisub/ass_style_storage.cpp +++ b/aegisub/ass_style_storage.cpp @@ -36,6 +36,8 @@ //////////// // Includes +#include "config.h" + #include #include "ass_style_storage.h" #include "ass_style.h" diff --git a/aegisub/ass_time.cpp b/aegisub/ass_time.cpp index 8ea585250..40b846e4b 100644 --- a/aegisub/ass_time.cpp +++ b/aegisub/ass_time.cpp @@ -36,6 +36,8 @@ //////////// // Includes +#include "config.h" + #include #include #include "ass_time.h" diff --git a/aegisub/audio_box.cpp b/aegisub/audio_box.cpp index 32893eb82..b81e7488b 100644 --- a/aegisub/audio_box.cpp +++ b/aegisub/audio_box.cpp @@ -36,6 +36,8 @@ /////////// // Headers +#include "config.h" + #include #include #include diff --git a/aegisub/audio_display.cpp b/aegisub/audio_display.cpp index 7a1efa7f3..f2c622936 100644 --- a/aegisub/audio_display.cpp +++ b/aegisub/audio_display.cpp @@ -36,6 +36,8 @@ /////////// // Headers +#include "config.h" + #include #include #include diff --git a/aegisub/audio_karaoke.cpp b/aegisub/audio_karaoke.cpp index 4dea9bf98..94bf35863 100644 --- a/aegisub/audio_karaoke.cpp +++ b/aegisub/audio_karaoke.cpp @@ -36,6 +36,8 @@ /////////// // Headers +#include "config.h" + #include "audio_karaoke.h" #include "audio_display.h" #include "audio_box.h" diff --git a/aegisub/audio_player.cpp b/aegisub/audio_player.cpp index 82eb53396..93af59658 100644 --- a/aegisub/audio_player.cpp +++ b/aegisub/audio_player.cpp @@ -36,6 +36,8 @@ /////////// // Headers +#include "config.h" + #include #include "audio_player_manager.h" #include "options.h" diff --git a/aegisub/audio_player_alsa.cpp b/aegisub/audio_player_alsa.cpp index 467ad1775..d985ea057 100644 --- a/aegisub/audio_player_alsa.cpp +++ b/aegisub/audio_player_alsa.cpp @@ -34,6 +34,8 @@ // +#include "config.h" + #ifdef WITH_ALSA diff --git a/aegisub/audio_player_dsound.cpp b/aegisub/audio_player_dsound.cpp index 12332ac16..a56612700 100644 --- a/aegisub/audio_player_dsound.cpp +++ b/aegisub/audio_player_dsound.cpp @@ -36,6 +36,8 @@ /////////// // Headers +#include "config.h" + #ifdef WITH_DIRECTSOUND #include diff --git a/aegisub/audio_player_dsound2.cpp b/aegisub/audio_player_dsound2.cpp index 43dfddecd..9bdf1f90b 100644 --- a/aegisub/audio_player_dsound2.cpp +++ b/aegisub/audio_player_dsound2.cpp @@ -36,6 +36,8 @@ /////////// // Headers +#include "config.h" + #ifdef WITH_DIRECTSOUND #include diff --git a/aegisub/audio_player_openal.cpp b/aegisub/audio_player_openal.cpp index 8b1e574ba..06ab5ef76 100644 --- a/aegisub/audio_player_openal.cpp +++ b/aegisub/audio_player_openal.cpp @@ -34,6 +34,8 @@ // +#include "config.h" + #ifdef WITH_OPENAL diff --git a/aegisub/audio_player_portaudio.cpp b/aegisub/audio_player_portaudio.cpp index daf8795d1..81d3f53ee 100644 --- a/aegisub/audio_player_portaudio.cpp +++ b/aegisub/audio_player_portaudio.cpp @@ -34,6 +34,8 @@ // +#include "config.h" + #ifdef WITH_PORTAUDIO diff --git a/aegisub/audio_player_pulse.cpp b/aegisub/audio_player_pulse.cpp index ed5b37c0d..9048e55c5 100644 --- a/aegisub/audio_player_pulse.cpp +++ b/aegisub/audio_player_pulse.cpp @@ -34,6 +34,8 @@ // +#include "config.h" + #ifdef WITH_PULSEAUDIO diff --git a/aegisub/audio_provider.cpp b/aegisub/audio_provider.cpp index 02146fe9b..2758f2019 100644 --- a/aegisub/audio_provider.cpp +++ b/aegisub/audio_provider.cpp @@ -36,6 +36,8 @@ /////////// // Headers +#include "config.h" + #include #include #include "audio_provider_ram.h" diff --git a/aegisub/audio_provider_avs.cpp b/aegisub/audio_provider_avs.cpp index 5faa5c16b..774e9885c 100644 --- a/aegisub/audio_provider_avs.cpp +++ b/aegisub/audio_provider_avs.cpp @@ -36,6 +36,8 @@ /////////// // Headers +#include "config.h" + #include #ifdef WITH_AVISYNTH #include diff --git a/aegisub/audio_provider_convert.cpp b/aegisub/audio_provider_convert.cpp index b00ee7ebb..a70ce63b9 100644 --- a/aegisub/audio_provider_convert.cpp +++ b/aegisub/audio_provider_convert.cpp @@ -36,6 +36,8 @@ /////////// // Headers +#include "config.h" + #include "audio_provider_convert.h" #include "audio_provider_downmix.h" diff --git a/aegisub/audio_provider_downmix.cpp b/aegisub/audio_provider_downmix.cpp index 02570fa33..b57057d40 100644 --- a/aegisub/audio_provider_downmix.cpp +++ b/aegisub/audio_provider_downmix.cpp @@ -35,6 +35,8 @@ ////////////////// // Headers +#include "config.h" + #include "audio_provider_downmix.h" diff --git a/aegisub/audio_provider_dummy.cpp b/aegisub/audio_provider_dummy.cpp index d44160bed..ab104b39e 100644 --- a/aegisub/audio_provider_dummy.cpp +++ b/aegisub/audio_provider_dummy.cpp @@ -36,6 +36,8 @@ /////////// // Headers +#include "config.h" + #include "audio_provider_dummy.h" #include "utils.h" diff --git a/aegisub/audio_provider_ffmpegsource.cpp b/aegisub/audio_provider_ffmpegsource.cpp index b35eab4f6..ccc310d3b 100644 --- a/aegisub/audio_provider_ffmpegsource.cpp +++ b/aegisub/audio_provider_ffmpegsource.cpp @@ -33,6 +33,8 @@ // Contact: mailto:zeratul@cellosoft.com // +#include "config.h" + #ifdef WITH_FFMPEGSOURCE /////////// diff --git a/aegisub/audio_provider_hd.cpp b/aegisub/audio_provider_hd.cpp index 10ea95ed6..27df73308 100644 --- a/aegisub/audio_provider_hd.cpp +++ b/aegisub/audio_provider_hd.cpp @@ -36,6 +36,8 @@ /////////// // Headers +#include "config.h" + #include #include #include diff --git a/aegisub/audio_provider_lavc.cpp b/aegisub/audio_provider_lavc.cpp index 93a1bfe87..f29338a9a 100644 --- a/aegisub/audio_provider_lavc.cpp +++ b/aegisub/audio_provider_lavc.cpp @@ -36,6 +36,8 @@ /////////// // Headers +#include "config.h" + #ifdef WITH_FFMPEG #ifdef WIN32 diff --git a/aegisub/audio_provider_pcm.cpp b/aegisub/audio_provider_pcm.cpp index e93b299da..6b82c2a68 100644 --- a/aegisub/audio_provider_pcm.cpp +++ b/aegisub/audio_provider_pcm.cpp @@ -34,6 +34,8 @@ // +#include "config.h" + #include #include #include "audio_provider_pcm.h" diff --git a/aegisub/audio_provider_ram.cpp b/aegisub/audio_provider_ram.cpp index 6a960db9b..4e8f50e90 100644 --- a/aegisub/audio_provider_ram.cpp +++ b/aegisub/audio_provider_ram.cpp @@ -36,6 +36,8 @@ /////////// // Headers +#include "config.h" + #include "dialog_progress.h" #include "audio_provider_ram.h" #include "utils.h" diff --git a/aegisub/audio_provider_stream.cpp b/aegisub/audio_provider_stream.cpp index 39ffbdda7..dc6125c24 100644 --- a/aegisub/audio_provider_stream.cpp +++ b/aegisub/audio_provider_stream.cpp @@ -36,6 +36,8 @@ /////////// // Headers +#include "config.h" + #include "audio_provider_stream.h" #include "utils.h" diff --git a/aegisub/audio_spectrum.cpp b/aegisub/audio_spectrum.cpp index 7e63c672b..11ff24c50 100644 --- a/aegisub/audio_spectrum.cpp +++ b/aegisub/audio_spectrum.cpp @@ -34,6 +34,8 @@ // Contact: mailto:zeratul@cellosoft.com // +#include "config.h" + #include #include #include diff --git a/aegisub/auto4_auto3.cpp b/aegisub/auto4_auto3.cpp index 4cc69f375..de94c4619 100644 --- a/aegisub/auto4_auto3.cpp +++ b/aegisub/auto4_auto3.cpp @@ -34,6 +34,8 @@ // +#include "config.h" + #ifdef WITH_AUTOMATION #ifdef WITH_AUTO3 diff --git a/aegisub/auto4_base.cpp b/aegisub/auto4_base.cpp index 3d02a9e58..65fa076fe 100644 --- a/aegisub/auto4_base.cpp +++ b/aegisub/auto4_base.cpp @@ -34,6 +34,8 @@ // +#include "config.h" + #ifdef WITH_AUTOMATION #include "auto4_base.h" diff --git a/aegisub/auto4_lua.cpp b/aegisub/auto4_lua.cpp index 4e0239027..367bb799f 100644 --- a/aegisub/auto4_lua.cpp +++ b/aegisub/auto4_lua.cpp @@ -33,6 +33,8 @@ // Contact: mailto:jiifurusu@gmail.com // +#include "config.h" + #ifdef WITH_AUTO4_LUA #include "auto4_lua.h" diff --git a/aegisub/auto4_lua_assfile.cpp b/aegisub/auto4_lua_assfile.cpp index 45ed8566c..22c56fc50 100644 --- a/aegisub/auto4_lua_assfile.cpp +++ b/aegisub/auto4_lua_assfile.cpp @@ -33,6 +33,8 @@ // Contact: mailto:jiifurusu@gmail.com // +#include "config.h" + #ifdef WITH_AUTO4_LUA #include "auto4_lua.h" diff --git a/aegisub/auto4_lua_dialog.cpp b/aegisub/auto4_lua_dialog.cpp index 8c9361e16..18c4bf0aa 100644 --- a/aegisub/auto4_lua_dialog.cpp +++ b/aegisub/auto4_lua_dialog.cpp @@ -34,6 +34,8 @@ // +#include "config.h" + #ifdef WITH_AUTO4_LUA #include "auto4_lua.h" diff --git a/aegisub/auto4_lua_scriptreader.cpp b/aegisub/auto4_lua_scriptreader.cpp index d2e986edf..8dc213571 100644 --- a/aegisub/auto4_lua_scriptreader.cpp +++ b/aegisub/auto4_lua_scriptreader.cpp @@ -33,6 +33,8 @@ // Contact: mailto:jiifurusu@gmail.com // +#include "config.h" + #ifdef WITH_AUTO4_LUA #include "auto4_lua_scriptreader.h" diff --git a/aegisub/auto4_perl.cpp b/aegisub/auto4_perl.cpp index d0214e39c..f8053853a 100644 --- a/aegisub/auto4_perl.cpp +++ b/aegisub/auto4_perl.cpp @@ -34,6 +34,8 @@ // +#include "config.h" + #ifdef WITH_PERL diff --git a/aegisub/auto4_perl_ass.cpp b/aegisub/auto4_perl_ass.cpp index 968ba1d2d..42d528909 100644 --- a/aegisub/auto4_perl_ass.cpp +++ b/aegisub/auto4_perl_ass.cpp @@ -34,6 +34,8 @@ // +#include "config.h" + #ifdef WITH_PERL diff --git a/aegisub/auto4_perl_console.cpp b/aegisub/auto4_perl_console.cpp index ee97ec0e9..1dbc31439 100644 --- a/aegisub/auto4_perl_console.cpp +++ b/aegisub/auto4_perl_console.cpp @@ -34,6 +34,8 @@ // +#include "config.h" + #ifdef WITH_PERL #ifdef WITH_PERLCONSOLE diff --git a/aegisub/auto4_perl_dialogs.cpp b/aegisub/auto4_perl_dialogs.cpp index 1a139cbc2..aa4bb59ca 100644 --- a/aegisub/auto4_perl_dialogs.cpp +++ b/aegisub/auto4_perl_dialogs.cpp @@ -34,6 +34,8 @@ // +#include "config.h" + #ifdef WITH_PERL diff --git a/aegisub/auto4_perl_script.cpp b/aegisub/auto4_perl_script.cpp index f98ec8d42..c4aedf2ef 100644 --- a/aegisub/auto4_perl_script.cpp +++ b/aegisub/auto4_perl_script.cpp @@ -34,6 +34,8 @@ // +#include "config.h" + #ifdef WITH_PERL diff --git a/aegisub/auto4_ruby.cpp b/aegisub/auto4_ruby.cpp index 32b668789..af9e982d3 100644 --- a/aegisub/auto4_ruby.cpp +++ b/aegisub/auto4_ruby.cpp @@ -33,6 +33,8 @@ // Contact: mailto:pomyk@go2.pl // +#include "config.h" + #ifdef WITH_RUBY #ifdef _MSC_VER diff --git a/aegisub/auto4_ruby_assfile.cpp b/aegisub/auto4_ruby_assfile.cpp index b404a7bab..ca992343b 100644 --- a/aegisub/auto4_ruby_assfile.cpp +++ b/aegisub/auto4_ruby_assfile.cpp @@ -33,6 +33,8 @@ // Contact: mailto:pomyk@go2.pl // +#include "config.h" + #ifdef WITH_RUBY #ifdef _MSC_VER diff --git a/aegisub/auto4_ruby_dialog.cpp b/aegisub/auto4_ruby_dialog.cpp index 8c6c9eb6f..cfa3dc14c 100644 --- a/aegisub/auto4_ruby_dialog.cpp +++ b/aegisub/auto4_ruby_dialog.cpp @@ -34,6 +34,8 @@ // +#include "config.h" + #ifdef WITH_RUBY #include "auto4_ruby.h" #include diff --git a/aegisub/avisynth_wrap.cpp b/aegisub/avisynth_wrap.cpp index a80650d5e..5dda8bb09 100644 --- a/aegisub/avisynth_wrap.cpp +++ b/aegisub/avisynth_wrap.cpp @@ -37,6 +37,8 @@ //////////// // Includes +#include "config.h" + #ifdef WITH_AVISYNTH #include "avisynth_wrap.h" #include "options.h" diff --git a/aegisub/base_grid.cpp b/aegisub/base_grid.cpp index 60c820542..acd6e1437 100644 --- a/aegisub/base_grid.cpp +++ b/aegisub/base_grid.cpp @@ -36,6 +36,8 @@ //////////// // Includes +#include "config.h" + #include "base_grid.h" #include "utils.h" #include "ass_file.h" diff --git a/aegisub/browse_button.cpp b/aegisub/browse_button.cpp index c572a439e..cc04c325c 100644 --- a/aegisub/browse_button.cpp +++ b/aegisub/browse_button.cpp @@ -36,6 +36,8 @@ /////////// // Headers +#include "config.h" + #include #include #include diff --git a/aegisub/charset_detect.cpp b/aegisub/charset_detect.cpp index bcbb07c6e..2abce3579 100644 --- a/aegisub/charset_detect.cpp +++ b/aegisub/charset_detect.cpp @@ -36,6 +36,8 @@ /////////// // Headers +#include "config.h" + #ifdef WITH_UNIVCHARDET #include #include "text_file_reader.h" diff --git a/aegisub/colorspace.cpp b/aegisub/colorspace.cpp index c0175c5d9..53973b404 100644 --- a/aegisub/colorspace.cpp +++ b/aegisub/colorspace.cpp @@ -33,6 +33,8 @@ // Contact: mailto:zeratul@cellosoft.com // +#include "config.h" + #include "colorspace.h" #include "utils.h" diff --git a/aegisub/colour_button.cpp b/aegisub/colour_button.cpp index 1cb1e2781..6b374c4a2 100644 --- a/aegisub/colour_button.cpp +++ b/aegisub/colour_button.cpp @@ -36,6 +36,8 @@ //////////// // Includes +#include "config.h" + #include #include "colour_button.h" #include "dialog_colorpicker.h" diff --git a/aegisub/config.h b/aegisub/config.h new file mode 100644 index 000000000..21e7cd859 --- /dev/null +++ b/aegisub/config.h @@ -0,0 +1,14 @@ +#ifdef __WINDOWS__ + +// Windows specific settings +#include "config/config_windows.h" + +#else + +// Generated by configure.in +#include "../acconf.h" + +// Unix specific settings and defines. +#include "config/config_unix.h" + +#endif // __WINDOWS__ diff --git a/aegisub/posix/defines.h b/aegisub/config/config_unix.h similarity index 100% rename from aegisub/posix/defines.h rename to aegisub/config/config_unix.h diff --git a/aegisub/win32/config0.h b/aegisub/config/config_windows0.h similarity index 100% rename from aegisub/win32/config0.h rename to aegisub/config/config_windows0.h diff --git a/aegisub/dialog_about.cpp b/aegisub/dialog_about.cpp index 01b22f28f..158d3a423 100644 --- a/aegisub/dialog_about.cpp +++ b/aegisub/dialog_about.cpp @@ -36,6 +36,8 @@ //////////// // Includes +#include "config.h" + #include #include #include diff --git a/aegisub/dialog_associations.cpp b/aegisub/dialog_associations.cpp index 52ef732a5..3c2554ca5 100644 --- a/aegisub/dialog_associations.cpp +++ b/aegisub/dialog_associations.cpp @@ -36,6 +36,8 @@ /////////// // Headers +#include "config.h" + #include #include #include diff --git a/aegisub/dialog_attachments.cpp b/aegisub/dialog_attachments.cpp index 2ddef5021..1218dba80 100644 --- a/aegisub/dialog_attachments.cpp +++ b/aegisub/dialog_attachments.cpp @@ -36,6 +36,8 @@ /////////// // Headers +#include "config.h" + #include #include #include diff --git a/aegisub/dialog_automation.cpp b/aegisub/dialog_automation.cpp index 10572d0db..5c1ca5fe3 100644 --- a/aegisub/dialog_automation.cpp +++ b/aegisub/dialog_automation.cpp @@ -34,6 +34,8 @@ // +#include "config.h" + #ifdef WITH_AUTOMATION #include "main.h" diff --git a/aegisub/dialog_colorpicker.cpp b/aegisub/dialog_colorpicker.cpp index 64278411e..74eb35249 100644 --- a/aegisub/dialog_colorpicker.cpp +++ b/aegisub/dialog_colorpicker.cpp @@ -33,6 +33,8 @@ // Contact: mailto:zeratul@cellosoft.com // +#include "config.h" + #include #include #include diff --git a/aegisub/dialog_detached_video.cpp b/aegisub/dialog_detached_video.cpp index 12a1e4aa8..0e20ba131 100644 --- a/aegisub/dialog_detached_video.cpp +++ b/aegisub/dialog_detached_video.cpp @@ -36,6 +36,8 @@ /////////// // Headers +#include "config.h" + #include #include #include "dialog_detached_video.h" diff --git a/aegisub/dialog_dummy_video.cpp b/aegisub/dialog_dummy_video.cpp index dd9849f37..65a35a072 100644 --- a/aegisub/dialog_dummy_video.cpp +++ b/aegisub/dialog_dummy_video.cpp @@ -34,6 +34,8 @@ // +#include "config.h" + #include "dialog_dummy_video.h" #include #include diff --git a/aegisub/dialog_export.cpp b/aegisub/dialog_export.cpp index cdaa8b8ed..3edaedcf0 100644 --- a/aegisub/dialog_export.cpp +++ b/aegisub/dialog_export.cpp @@ -36,6 +36,8 @@ /////////// // Headers +#include "config.h" + #include #include #include diff --git a/aegisub/dialog_fonts_collector.cpp b/aegisub/dialog_fonts_collector.cpp index a131f6512..099722116 100644 --- a/aegisub/dialog_fonts_collector.cpp +++ b/aegisub/dialog_fonts_collector.cpp @@ -36,6 +36,8 @@ //////////// // Includes +#include "config.h" + #include #include #include diff --git a/aegisub/dialog_jumpto.cpp b/aegisub/dialog_jumpto.cpp index cba87e427..32777a90f 100644 --- a/aegisub/dialog_jumpto.cpp +++ b/aegisub/dialog_jumpto.cpp @@ -36,6 +36,8 @@ /////////// // Headers +#include "config.h" + #include #include #include diff --git a/aegisub/dialog_kanji_timer.cpp b/aegisub/dialog_kanji_timer.cpp index 891c93283..049280a15 100644 --- a/aegisub/dialog_kanji_timer.cpp +++ b/aegisub/dialog_kanji_timer.cpp @@ -43,6 +43,8 @@ /////////// // Headers +#include "config.h" + #include #include "dialog_kanji_timer.h" #include "ass_file.h" diff --git a/aegisub/dialog_options.cpp b/aegisub/dialog_options.cpp index 9987b44c3..1812a0b34 100644 --- a/aegisub/dialog_options.cpp +++ b/aegisub/dialog_options.cpp @@ -36,6 +36,8 @@ /////////// // Headers +#include "config.h" + #include "dialog_options.h" #if wxUSE_TREEBOOK && !__WXMAC__ #include diff --git a/aegisub/dialog_paste_over.cpp b/aegisub/dialog_paste_over.cpp index f648e465a..4aee17387 100644 --- a/aegisub/dialog_paste_over.cpp +++ b/aegisub/dialog_paste_over.cpp @@ -36,6 +36,8 @@ /////////// // Headers +#include "config.h" + #include #include #include diff --git a/aegisub/dialog_progress.cpp b/aegisub/dialog_progress.cpp index 4bde8fb3f..f0c11e352 100644 --- a/aegisub/dialog_progress.cpp +++ b/aegisub/dialog_progress.cpp @@ -36,6 +36,8 @@ /////////// // Headers +#include "config.h" + #include #include #include "dialog_progress.h" diff --git a/aegisub/dialog_properties.cpp b/aegisub/dialog_properties.cpp index 79ee6c71d..4a7ac3333 100644 --- a/aegisub/dialog_properties.cpp +++ b/aegisub/dialog_properties.cpp @@ -36,6 +36,8 @@ /////////// // Headers +#include "config.h" + #include #include #include diff --git a/aegisub/dialog_resample.cpp b/aegisub/dialog_resample.cpp index d378eb157..4a061ff19 100644 --- a/aegisub/dialog_resample.cpp +++ b/aegisub/dialog_resample.cpp @@ -36,6 +36,8 @@ /////////// // Headers +#include "config.h" + #include "dialog_resample.h" #include "ass_file.h" #include "ass_dialogue.h" diff --git a/aegisub/dialog_search_replace.cpp b/aegisub/dialog_search_replace.cpp index 466864d94..47069c88c 100644 --- a/aegisub/dialog_search_replace.cpp +++ b/aegisub/dialog_search_replace.cpp @@ -36,6 +36,8 @@ /////////// // Headers +#include "config.h" + #include #include #include diff --git a/aegisub/dialog_selection.cpp b/aegisub/dialog_selection.cpp index b0b44b84e..b3fab8ee4 100644 --- a/aegisub/dialog_selection.cpp +++ b/aegisub/dialog_selection.cpp @@ -36,6 +36,8 @@ /////////// // Headers +#include "config.h" + #include #include #include diff --git a/aegisub/dialog_shift_times.cpp b/aegisub/dialog_shift_times.cpp index 584960a1b..36369f24e 100644 --- a/aegisub/dialog_shift_times.cpp +++ b/aegisub/dialog_shift_times.cpp @@ -36,6 +36,8 @@ /////////// // Headers +#include "config.h" + #include #include #include diff --git a/aegisub/dialog_spellchecker.cpp b/aegisub/dialog_spellchecker.cpp index 62aa03925..f7fd3cfb9 100644 --- a/aegisub/dialog_spellchecker.cpp +++ b/aegisub/dialog_spellchecker.cpp @@ -35,6 +35,8 @@ /////////// // Headers +#include "config.h" + #include #include "dialog_spellchecker.h" #include "spellchecker_manager.h" diff --git a/aegisub/dialog_splash.cpp b/aegisub/dialog_splash.cpp index 6de9f7b1e..485fbec2a 100644 --- a/aegisub/dialog_splash.cpp +++ b/aegisub/dialog_splash.cpp @@ -36,6 +36,8 @@ //////////// // Includes +#include "config.h" + #include #include #include diff --git a/aegisub/dialog_style_editor.cpp b/aegisub/dialog_style_editor.cpp index fb8553b7d..923af4ae1 100644 --- a/aegisub/dialog_style_editor.cpp +++ b/aegisub/dialog_style_editor.cpp @@ -36,6 +36,8 @@ //////////// // Includes +#include "config.h" + #include #include #include diff --git a/aegisub/dialog_style_manager.cpp b/aegisub/dialog_style_manager.cpp index c8f30fb4a..149fa16f3 100644 --- a/aegisub/dialog_style_manager.cpp +++ b/aegisub/dialog_style_manager.cpp @@ -36,6 +36,8 @@ //////////// // Includes +#include "config.h" + #include #include #include diff --git a/aegisub/dialog_styling_assistant.cpp b/aegisub/dialog_styling_assistant.cpp index d286f4191..acbc363f5 100644 --- a/aegisub/dialog_styling_assistant.cpp +++ b/aegisub/dialog_styling_assistant.cpp @@ -36,6 +36,8 @@ /////////// // Headers +#include "config.h" + #include #include "dialog_styling_assistant.h" #include "subs_grid.h" diff --git a/aegisub/dialog_text_import.cpp b/aegisub/dialog_text_import.cpp index 2f0e4fcb4..1204a6fee 100644 --- a/aegisub/dialog_text_import.cpp +++ b/aegisub/dialog_text_import.cpp @@ -36,6 +36,8 @@ /////////// // Headers +#include "config.h" + #include "dialog_text_import.h" #include #include diff --git a/aegisub/dialog_timing_processor.cpp b/aegisub/dialog_timing_processor.cpp index d131863f5..226e90676 100644 --- a/aegisub/dialog_timing_processor.cpp +++ b/aegisub/dialog_timing_processor.cpp @@ -35,6 +35,8 @@ //////////// // Includes +#include "config.h" + #include "dialog_timing_processor.h" #include "subs_grid.h" #include "ass_file.h" diff --git a/aegisub/dialog_tip.cpp b/aegisub/dialog_tip.cpp index 6afa886d5..dfb3eebc7 100644 --- a/aegisub/dialog_tip.cpp +++ b/aegisub/dialog_tip.cpp @@ -36,6 +36,8 @@ /////////// // Headers +#include "config.h" + #include #include #include diff --git a/aegisub/dialog_translation.cpp b/aegisub/dialog_translation.cpp index f2b6b58db..c11b3267a 100644 --- a/aegisub/dialog_translation.cpp +++ b/aegisub/dialog_translation.cpp @@ -36,6 +36,8 @@ /////////// // Headers +#include "config.h" + #include #include #include "dialog_translation.h" diff --git a/aegisub/dialog_version_check.cpp b/aegisub/dialog_version_check.cpp index 1fb5dfcea..adb374e17 100644 --- a/aegisub/dialog_version_check.cpp +++ b/aegisub/dialog_version_check.cpp @@ -36,6 +36,8 @@ /////////// // Headers +#include "config.h" + #include #include #include diff --git a/aegisub/dialog_video_details.cpp b/aegisub/dialog_video_details.cpp index 56e9586f6..7423dbb45 100644 --- a/aegisub/dialog_video_details.cpp +++ b/aegisub/dialog_video_details.cpp @@ -36,6 +36,8 @@ /////////// // Headers +#include "config.h" + #include "dialog_video_details.h" #include "video_context.h" #include "video_provider_manager.h" diff --git a/aegisub/drop.cpp b/aegisub/drop.cpp index 990cd6599..bd71f7a57 100644 --- a/aegisub/drop.cpp +++ b/aegisub/drop.cpp @@ -36,6 +36,8 @@ /////////// // Headers +#include "config.h" + #include "drop.h" #include "frame_main.h" #include diff --git a/aegisub/export_clean_info.cpp b/aegisub/export_clean_info.cpp index 3ea0e1a61..0f5a677a1 100644 --- a/aegisub/export_clean_info.cpp +++ b/aegisub/export_clean_info.cpp @@ -36,6 +36,8 @@ /////////// // Headers +#include "config.h" + #include "export_clean_info.h" #include "ass_file.h" #include "ass_dialogue.h" diff --git a/aegisub/export_fixstyle.cpp b/aegisub/export_fixstyle.cpp index 37fb52a9f..5c33aefe3 100644 --- a/aegisub/export_fixstyle.cpp +++ b/aegisub/export_fixstyle.cpp @@ -36,6 +36,8 @@ /////////// // Headers +#include "config.h" + #include "export_fixstyle.h" #include "ass_file.h" #include "ass_dialogue.h" diff --git a/aegisub/export_framerate.cpp b/aegisub/export_framerate.cpp index c8fc177ab..a4aa9450a 100644 --- a/aegisub/export_framerate.cpp +++ b/aegisub/export_framerate.cpp @@ -36,6 +36,8 @@ /////////// // Headers +#include "config.h" + #include "export_framerate.h" #include "vfr.h" #include "ass_file.h" diff --git a/aegisub/export_visible_lines.cpp b/aegisub/export_visible_lines.cpp index a7fc2ab98..5d49be018 100644 --- a/aegisub/export_visible_lines.cpp +++ b/aegisub/export_visible_lines.cpp @@ -36,6 +36,8 @@ /////////// // Headers +#include "config.h" + #include "export_visible_lines.h" #include "ass_file.h" #include "ass_dialogue.h" diff --git a/aegisub/ffmpegsource_common.cpp b/aegisub/ffmpegsource_common.cpp index c45954c8c..4c5fdfe27 100644 --- a/aegisub/ffmpegsource_common.cpp +++ b/aegisub/ffmpegsource_common.cpp @@ -33,6 +33,8 @@ // Contact: mailto:zeratul@cellosoft.com // +#include "config.h" + #ifdef WITH_FFMPEGSOURCE /////////// @@ -132,4 +134,4 @@ wxString FFmpegSourceProvider::GetCacheFilename(const wxString& filename) return dirfn.GetShortPath() + _T("/") + fn.GetFullName(); } -#endif WITH_FFMPEGSOURCE \ No newline at end of file +#endif WITH_FFMPEGSOURCE diff --git a/aegisub/fft.cpp b/aegisub/fft.cpp index 64cb6a8e5..37b96d7fe 100644 --- a/aegisub/fft.cpp +++ b/aegisub/fft.cpp @@ -42,6 +42,8 @@ /////////// // Headers +#include "config.h" + #include "fft.h" #include diff --git a/aegisub/float_spin.cpp b/aegisub/float_spin.cpp index 61e17005b..3feef20b9 100644 --- a/aegisub/float_spin.cpp +++ b/aegisub/float_spin.cpp @@ -36,6 +36,8 @@ /////////// // Headers +#include "config.h" + #include #include #include "float_spin.h" diff --git a/aegisub/font_file_lister.cpp b/aegisub/font_file_lister.cpp index fb9f0243e..91a46e418 100644 --- a/aegisub/font_file_lister.cpp +++ b/aegisub/font_file_lister.cpp @@ -37,6 +37,8 @@ //////////// // Includes +#include "config.h" + #include #include "font_file_lister.h" #include "text_file_writer.h" diff --git a/aegisub/font_file_lister_fontconfig.cpp b/aegisub/font_file_lister_fontconfig.cpp index 8eb1106ef..090ea6314 100644 --- a/aegisub/font_file_lister_fontconfig.cpp +++ b/aegisub/font_file_lister_fontconfig.cpp @@ -36,6 +36,8 @@ //////////// // Includes +#include "config.h" + #include #ifndef WIN32 #include "font_file_lister_fontconfig.h" diff --git a/aegisub/font_file_lister_freetype.cpp b/aegisub/font_file_lister_freetype.cpp index d2d42c28a..a5464121b 100644 --- a/aegisub/font_file_lister_freetype.cpp +++ b/aegisub/font_file_lister_freetype.cpp @@ -37,8 +37,9 @@ //////////// // Includes -#ifdef WITH_FREETYPE2 +#include "config.h" +#ifdef WITH_FREETYPE2 #include "font_file_lister_freetype.h" #include #include FT_FREETYPE_H diff --git a/aegisub/frame_main.cpp b/aegisub/frame_main.cpp index 3191440bc..5dca08270 100644 --- a/aegisub/frame_main.cpp +++ b/aegisub/frame_main.cpp @@ -36,6 +36,8 @@ /////////////////// // Include headers +#include "config.h" + #include #include #include diff --git a/aegisub/frame_main_events.cpp b/aegisub/frame_main_events.cpp index 3994f19b2..35a105cc8 100644 --- a/aegisub/frame_main_events.cpp +++ b/aegisub/frame_main_events.cpp @@ -36,6 +36,8 @@ /////////////////// // Include headers +#include "config.h" + #include #include #include diff --git a/aegisub/gl_text.cpp b/aegisub/gl_text.cpp index 177580429..a94cdd8e0 100644 --- a/aegisub/gl_text.cpp +++ b/aegisub/gl_text.cpp @@ -36,6 +36,8 @@ /////////// // Headers +#include "config.h" + #include #include #include "gl_text.h" diff --git a/aegisub/gl_wrap.cpp b/aegisub/gl_wrap.cpp index ba52eea3d..39dd6ed05 100644 --- a/aegisub/gl_wrap.cpp +++ b/aegisub/gl_wrap.cpp @@ -36,6 +36,8 @@ /////////// // Headers +#include "config.h" + #include #include #ifdef __APPLE__ diff --git a/aegisub/help_button.cpp b/aegisub/help_button.cpp index 23a413864..0b054110b 100644 --- a/aegisub/help_button.cpp +++ b/aegisub/help_button.cpp @@ -36,6 +36,8 @@ /////////// // Headers +#include "config.h" + #include #include #include diff --git a/aegisub/hilimod_textctrl.cpp b/aegisub/hilimod_textctrl.cpp index b85675d0e..c7a236534 100644 --- a/aegisub/hilimod_textctrl.cpp +++ b/aegisub/hilimod_textctrl.cpp @@ -36,6 +36,8 @@ //////////// // Includes +#include "config.h" + #include "hilimod_textctrl.h" #include "options.h" diff --git a/aegisub/hotkeys.cpp b/aegisub/hotkeys.cpp index ffa1fe25e..e00dd2762 100644 --- a/aegisub/hotkeys.cpp +++ b/aegisub/hotkeys.cpp @@ -36,6 +36,8 @@ /////////// // Headers +#include "config.h" + #include "hotkeys.h" #include #include "text_file_reader.h" diff --git a/aegisub/idle_field_event.cpp b/aegisub/idle_field_event.cpp index c12828c1e..d222f1118 100644 --- a/aegisub/idle_field_event.cpp +++ b/aegisub/idle_field_event.cpp @@ -36,6 +36,8 @@ /////////// // Headers +#include "config.h" + #include "idle_field_event.h" #include #include diff --git a/aegisub/kana_table.cpp b/aegisub/kana_table.cpp index 14ff4834a..d8c0045e5 100644 --- a/aegisub/kana_table.cpp +++ b/aegisub/kana_table.cpp @@ -36,6 +36,8 @@ /////////// // Headers +#include "config.h" + #include "kana_table.h" diff --git a/aegisub/keyframe.cpp b/aegisub/keyframe.cpp index 579adc6a2..316845a00 100644 --- a/aegisub/keyframe.cpp +++ b/aegisub/keyframe.cpp @@ -35,6 +35,8 @@ /////////// // Headers +#include "config.h" + #include #include "video_context.h" #include "keyframe.h" diff --git a/aegisub/lavc_file.cpp b/aegisub/lavc_file.cpp index aad50186a..62ee2c39d 100644 --- a/aegisub/lavc_file.cpp +++ b/aegisub/lavc_file.cpp @@ -35,6 +35,8 @@ +#include "config.h" + #ifdef WITH_FFMPEG #include #include diff --git a/aegisub/lavc_keyframes.cpp b/aegisub/lavc_keyframes.cpp index e46142d6e..cb4c3dd21 100644 --- a/aegisub/lavc_keyframes.cpp +++ b/aegisub/lavc_keyframes.cpp @@ -37,6 +37,7 @@ /////////// // Headers #include "config.h" + #ifdef WITH_FFMPEG #ifdef WIN32 diff --git a/aegisub/main.cpp b/aegisub/main.cpp index 4628c1eeb..aac671b10 100644 --- a/aegisub/main.cpp +++ b/aegisub/main.cpp @@ -36,6 +36,8 @@ //////////// // Includes +#include "config.h" + #include #include #include diff --git a/aegisub/mkv_wrap.cpp b/aegisub/mkv_wrap.cpp index 567be53b3..8fc6e4c8a 100644 --- a/aegisub/mkv_wrap.cpp +++ b/aegisub/mkv_wrap.cpp @@ -36,6 +36,8 @@ /////////// // Headers +#include "config.h" + #include #include #include diff --git a/aegisub/win32/stdint.h b/aegisub/msvc/stdint.h similarity index 100% rename from aegisub/win32/stdint.h rename to aegisub/msvc/stdint.h diff --git a/aegisub/options.cpp b/aegisub/options.cpp index 3da15b89d..cec29ed9b 100644 --- a/aegisub/options.cpp +++ b/aegisub/options.cpp @@ -36,6 +36,8 @@ //////////// // Includes +#include "config.h" + #include #include #include diff --git a/aegisub/osx_bevelButton.cpp b/aegisub/osx_bevelButton.cpp index 658103e7a..c153c3d51 100644 --- a/aegisub/osx_bevelButton.cpp +++ b/aegisub/osx_bevelButton.cpp @@ -9,6 +9,8 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// +#include "config.h" + #ifdef __WXMAC__ #if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) diff --git a/aegisub/plugin_manager.cpp b/aegisub/plugin_manager.cpp index c1605eddf..5f768d2ad 100644 --- a/aegisub/plugin_manager.cpp +++ b/aegisub/plugin_manager.cpp @@ -36,6 +36,8 @@ /////////// // Headers +#include "config.h" + #include "plugin_manager.h" #include "video_provider_manager.h" #include "audio_provider_manager.h" diff --git a/aegisub/scintilla_text_ctrl.cpp b/aegisub/scintilla_text_ctrl.cpp index 6c2d87e0b..1e9adcd27 100644 --- a/aegisub/scintilla_text_ctrl.cpp +++ b/aegisub/scintilla_text_ctrl.cpp @@ -36,6 +36,8 @@ //////////// // Includes +#include "config.h" + #include "scintilla_text_ctrl.h" #include "utils.h" diff --git a/aegisub/setup.cpp b/aegisub/setup.cpp index e5942e8c2..2514ba57b 100644 --- a/aegisub/setup.cpp +++ b/aegisub/setup.cpp @@ -36,6 +36,8 @@ /////////// // Headers +#include "config.h" + #include diff --git a/aegisub/spellchecker.cpp b/aegisub/spellchecker.cpp index bcbcd1c0f..9e1a59bc5 100644 --- a/aegisub/spellchecker.cpp +++ b/aegisub/spellchecker.cpp @@ -36,6 +36,8 @@ /////////// // Headers +#include "config.h" + #include "spellchecker_manager.h" #ifdef WITH_HUNSPELL #include "spellchecker_hunspell.h" diff --git a/aegisub/spellchecker_hunspell.cpp b/aegisub/spellchecker_hunspell.cpp index 90cb88fd9..163fe3438 100644 --- a/aegisub/spellchecker_hunspell.cpp +++ b/aegisub/spellchecker_hunspell.cpp @@ -36,6 +36,8 @@ /////////// // Headers +#include "config.h" + #ifdef WITH_HUNSPELL diff --git a/aegisub/spline.cpp b/aegisub/spline.cpp index 585f76200..bd8f846a2 100644 --- a/aegisub/spline.cpp +++ b/aegisub/spline.cpp @@ -36,6 +36,8 @@ /////////// // Headers +#include "config.h" + #include #include "spline.h" #include "utils.h" diff --git a/aegisub/spline_curve.cpp b/aegisub/spline_curve.cpp index a5b982073..3c89845bf 100644 --- a/aegisub/spline_curve.cpp +++ b/aegisub/spline_curve.cpp @@ -36,6 +36,8 @@ /////////// // Headers +#include "config.h" + #include "spline_curve.h" #include "utils.h" diff --git a/aegisub/standard_paths.cpp b/aegisub/standard_paths.cpp index 24f8a4cb1..b749ab533 100644 --- a/aegisub/standard_paths.cpp +++ b/aegisub/standard_paths.cpp @@ -36,6 +36,8 @@ /////////// // Headers +#include "config.h" + #include #include #include "standard_paths.h" diff --git a/aegisub/static_bmp.cpp b/aegisub/static_bmp.cpp index 9ec3997e8..9aa65d58f 100644 --- a/aegisub/static_bmp.cpp +++ b/aegisub/static_bmp.cpp @@ -36,6 +36,8 @@ //////////// // Includes +#include "config.h" + #include #include "static_bmp.h" diff --git a/aegisub/stdwx.cpp b/aegisub/stdwx.cpp index bca28ddcf..885e49fa7 100644 --- a/aegisub/stdwx.cpp +++ b/aegisub/stdwx.cpp @@ -45,4 +45,6 @@ // MatroskaParser.c, as well as any possible future .c files. // +#include "config.h" + #include "stdwx.h" diff --git a/aegisub/string_codec.cpp b/aegisub/string_codec.cpp index 48323090c..7ebeb2308 100644 --- a/aegisub/string_codec.cpp +++ b/aegisub/string_codec.cpp @@ -36,6 +36,8 @@ // Functions for inline string encoding. // See header file for details. +#include "config.h" + #include "string_codec.h" wxString inline_string_encode(const wxString &input) diff --git a/aegisub/subs_edit_box.cpp b/aegisub/subs_edit_box.cpp index cb48fb3c7..199a15e37 100644 --- a/aegisub/subs_edit_box.cpp +++ b/aegisub/subs_edit_box.cpp @@ -36,6 +36,8 @@ //////////// // Includes +#include "config.h" + #include #include #include "subs_edit_box.h" diff --git a/aegisub/subs_edit_ctrl.cpp b/aegisub/subs_edit_ctrl.cpp index 6c434056b..8aba0e60e 100644 --- a/aegisub/subs_edit_ctrl.cpp +++ b/aegisub/subs_edit_ctrl.cpp @@ -36,6 +36,8 @@ //////////// // Includes +#include "config.h" + #include #include #include "subs_edit_ctrl.h" diff --git a/aegisub/subs_grid.cpp b/aegisub/subs_grid.cpp index 8734b48c4..a3a8efde2 100644 --- a/aegisub/subs_grid.cpp +++ b/aegisub/subs_grid.cpp @@ -36,6 +36,8 @@ //////////// // Includes +#include "config.h" + #include #include #include diff --git a/aegisub/subs_preview.cpp b/aegisub/subs_preview.cpp index 4f20e8f3b..00ad59e8e 100644 --- a/aegisub/subs_preview.cpp +++ b/aegisub/subs_preview.cpp @@ -36,6 +36,8 @@ //////////// // Includes +#include "config.h" + #include #include #include diff --git a/aegisub/subtitle_format.cpp b/aegisub/subtitle_format.cpp index 9de107731..43c7e0183 100644 --- a/aegisub/subtitle_format.cpp +++ b/aegisub/subtitle_format.cpp @@ -36,6 +36,8 @@ /////////// // Headers +#include "config.h" + #include #include #include "subtitle_format.h" diff --git a/aegisub/subtitle_format_ass.cpp b/aegisub/subtitle_format_ass.cpp index 8b2c98092..4eb101044 100644 --- a/aegisub/subtitle_format_ass.cpp +++ b/aegisub/subtitle_format_ass.cpp @@ -36,6 +36,8 @@ /////////// // Headers +#include "config.h" + #include "subtitle_format_ass.h" #include "text_file_reader.h" #include "text_file_writer.h" diff --git a/aegisub/subtitle_format_dvd.cpp b/aegisub/subtitle_format_dvd.cpp index bee136284..705c329e1 100644 --- a/aegisub/subtitle_format_dvd.cpp +++ b/aegisub/subtitle_format_dvd.cpp @@ -36,6 +36,8 @@ /////////// // Headers +#include "config.h" + #include "subtitle_format_dvd.h" #include "video_provider_dummy.h" #include "subtitles_provider_manager.h" diff --git a/aegisub/subtitle_format_encore.cpp b/aegisub/subtitle_format_encore.cpp index 177619874..9386c4a39 100644 --- a/aegisub/subtitle_format_encore.cpp +++ b/aegisub/subtitle_format_encore.cpp @@ -36,6 +36,8 @@ /////////// // Headers +#include "config.h" + #include "ass_dialogue.h" #include "subtitle_format_encore.h" #include "text_file_writer.h" diff --git a/aegisub/subtitle_format_microdvd.cpp b/aegisub/subtitle_format_microdvd.cpp index 18ae56c97..a1d8ae209 100644 --- a/aegisub/subtitle_format_microdvd.cpp +++ b/aegisub/subtitle_format_microdvd.cpp @@ -36,6 +36,8 @@ /////////// // Headers +#include "config.h" + #include "subtitle_format_microdvd.h" #include "ass_dialogue.h" #include "ass_time.h" diff --git a/aegisub/subtitle_format_mkv.cpp b/aegisub/subtitle_format_mkv.cpp index b39c5c12b..bc0bdff18 100644 --- a/aegisub/subtitle_format_mkv.cpp +++ b/aegisub/subtitle_format_mkv.cpp @@ -36,6 +36,8 @@ /////////// // Headers +#include "config.h" + #include "subtitle_format_mkv.h" #include "ass_dialogue.h" #include "mkv_wrap.h" diff --git a/aegisub/subtitle_format_prs.cpp b/aegisub/subtitle_format_prs.cpp index 04489adc2..5af95c3c1 100644 --- a/aegisub/subtitle_format_prs.cpp +++ b/aegisub/subtitle_format_prs.cpp @@ -36,6 +36,8 @@ /////////// // Headers +#include "config.h" + #if USE_PRS == 1 #include #include diff --git a/aegisub/subtitle_format_srt.cpp b/aegisub/subtitle_format_srt.cpp index e50e81d8e..1f2365903 100644 --- a/aegisub/subtitle_format_srt.cpp +++ b/aegisub/subtitle_format_srt.cpp @@ -36,6 +36,8 @@ /////////// // Headers +#include "config.h" + #include "subtitle_format_srt.h" #include "text_file_reader.h" #include "text_file_writer.h" diff --git a/aegisub/subtitle_format_transtation.cpp b/aegisub/subtitle_format_transtation.cpp index 6e973c98e..bfd0dafd0 100644 --- a/aegisub/subtitle_format_transtation.cpp +++ b/aegisub/subtitle_format_transtation.cpp @@ -36,6 +36,8 @@ /////////// // Headers +#include "config.h" + #include "ass_dialogue.h" #include "ass_file.h" #include "ass_style.h" diff --git a/aegisub/subtitle_format_ttxt.cpp b/aegisub/subtitle_format_ttxt.cpp index 71093f1b8..adeb8e704 100644 --- a/aegisub/subtitle_format_ttxt.cpp +++ b/aegisub/subtitle_format_ttxt.cpp @@ -36,6 +36,8 @@ /////////// // Headers +#include "config.h" + #include "subtitle_format_ttxt.h" #include "ass_time.h" #include "ass_file.h" diff --git a/aegisub/subtitle_format_txt.cpp b/aegisub/subtitle_format_txt.cpp index 9890572cc..a05212f25 100644 --- a/aegisub/subtitle_format_txt.cpp +++ b/aegisub/subtitle_format_txt.cpp @@ -36,6 +36,8 @@ /////////// // Headers +#include "config.h" + #include "subtitle_format_txt.h" #include "text_file_reader.h" #include "text_file_writer.h" diff --git a/aegisub/subtitles_provider.cpp b/aegisub/subtitles_provider.cpp index 753fc3cd4..a7f90295a 100644 --- a/aegisub/subtitles_provider.cpp +++ b/aegisub/subtitles_provider.cpp @@ -36,6 +36,8 @@ /////////// // Headers +#include "config.h" + #include "subtitles_provider_manager.h" #ifdef WITH_CSRI #include "subtitles_provider_csri.h" diff --git a/aegisub/subtitles_provider_csri.cpp b/aegisub/subtitles_provider_csri.cpp index 7f7315d54..8bc7c6690 100644 --- a/aegisub/subtitles_provider_csri.cpp +++ b/aegisub/subtitles_provider_csri.cpp @@ -36,6 +36,8 @@ /////////// // Headers +#include "config.h" + #ifdef WITH_CSRI diff --git a/aegisub/subtitles_provider_libass.cpp b/aegisub/subtitles_provider_libass.cpp index 29a491268..a924d12f8 100644 --- a/aegisub/subtitles_provider_libass.cpp +++ b/aegisub/subtitles_provider_libass.cpp @@ -35,6 +35,8 @@ /////////// // Headers +#include "config.h" + #ifdef WITH_LIBASS diff --git a/aegisub/text_file_reader.cpp b/aegisub/text_file_reader.cpp index 3203fde2e..d148a535b 100644 --- a/aegisub/text_file_reader.cpp +++ b/aegisub/text_file_reader.cpp @@ -36,6 +36,8 @@ /////////// // Headers +#include "config.h" + #include #include #include diff --git a/aegisub/text_file_writer.cpp b/aegisub/text_file_writer.cpp index 81a006568..4ccdb6d94 100644 --- a/aegisub/text_file_writer.cpp +++ b/aegisub/text_file_writer.cpp @@ -36,6 +36,8 @@ /////////// // Headers +#include "config.h" + #include #include "text_file_writer.h" #include "options.h" diff --git a/aegisub/thesaurus.cpp b/aegisub/thesaurus.cpp index 1549e9b78..20aa518ee 100644 --- a/aegisub/thesaurus.cpp +++ b/aegisub/thesaurus.cpp @@ -36,6 +36,8 @@ /////////// // Headers +#include "config.h" + #include "thesaurus.h" #include "thesaurus_myspell.h" diff --git a/aegisub/thesaurus_myspell.cpp b/aegisub/thesaurus_myspell.cpp index 350260bb8..59ea17e8c 100644 --- a/aegisub/thesaurus_myspell.cpp +++ b/aegisub/thesaurus_myspell.cpp @@ -36,6 +36,8 @@ /////////// // Headers +#include "config.h" + #include #include #include diff --git a/aegisub/timeedit_ctrl.cpp b/aegisub/timeedit_ctrl.cpp index 146a52a20..305fb0e1e 100644 --- a/aegisub/timeedit_ctrl.cpp +++ b/aegisub/timeedit_ctrl.cpp @@ -36,6 +36,8 @@ //////////// // Includes +#include "config.h" + #include #include #include diff --git a/aegisub/toggle_bitmap.cpp b/aegisub/toggle_bitmap.cpp index 380a30600..10dc2a33d 100644 --- a/aegisub/toggle_bitmap.cpp +++ b/aegisub/toggle_bitmap.cpp @@ -36,6 +36,8 @@ /////////// // Headers +#include "config.h" + #include "toggle_bitmap.h" #include #include diff --git a/aegisub/tooltip_manager.cpp b/aegisub/tooltip_manager.cpp index caa919d04..c66d76b97 100644 --- a/aegisub/tooltip_manager.cpp +++ b/aegisub/tooltip_manager.cpp @@ -36,6 +36,8 @@ /////////// // Headers +#include "config.h" + #include "tooltip_manager.h" #include "hotkeys.h" diff --git a/aegisub/utils.cpp b/aegisub/utils.cpp index 6c10dad99..e1de6d4db 100644 --- a/aegisub/utils.cpp +++ b/aegisub/utils.cpp @@ -36,6 +36,8 @@ /////////// // Headers +#include "config.h" + #include #include #include diff --git a/aegisub/validators.cpp b/aegisub/validators.cpp index b1263494b..cc965de3d 100644 --- a/aegisub/validators.cpp +++ b/aegisub/validators.cpp @@ -36,6 +36,8 @@ /////////// // Headers +#include "config.h" + #include #include "validators.h" #include "utils.h" diff --git a/aegisub/variable_data.cpp b/aegisub/variable_data.cpp index 67e024495..09fa2875a 100644 --- a/aegisub/variable_data.cpp +++ b/aegisub/variable_data.cpp @@ -36,6 +36,8 @@ //////////// // Includes +#include "config.h" + #include "variable_data.h" #include "ass_dialogue.h" #include "ass_style.h" diff --git a/aegisub/vector2d.cpp b/aegisub/vector2d.cpp index 17bfc0cc4..7e5b2d5e3 100644 --- a/aegisub/vector2d.cpp +++ b/aegisub/vector2d.cpp @@ -36,6 +36,8 @@ /////////// // Headers +#include "config.h" + #include "vector2d.h" diff --git a/aegisub/version.cpp b/aegisub/version.cpp index c31a2bb18..4043484e2 100644 --- a/aegisub/version.cpp +++ b/aegisub/version.cpp @@ -33,12 +33,13 @@ // Contact: mailto:jiifurusu@gmail.com // +#include "config.h" + #include #include #include "version.h" #ifdef __WINDOWS__ -#include "config.h" #include "../build/svn-revision.h" #else diff --git a/aegisub/vfr.cpp b/aegisub/vfr.cpp index 591102324..8c80e4996 100644 --- a/aegisub/vfr.cpp +++ b/aegisub/vfr.cpp @@ -36,6 +36,8 @@ /////////// // Headers +#include "config.h" + #include #include "options.h" #include "vfr.h" diff --git a/aegisub/vfw_wrap.cpp b/aegisub/vfw_wrap.cpp index 12034693e..7fd5ed093 100644 --- a/aegisub/vfw_wrap.cpp +++ b/aegisub/vfw_wrap.cpp @@ -39,6 +39,8 @@ /////////// // Headers +#include "config.h" + #include "vfw_wrap.h" #ifdef __WINDOWS__ #include diff --git a/aegisub/video_box.cpp b/aegisub/video_box.cpp index 92cb96f3d..0934c0ea8 100644 --- a/aegisub/video_box.cpp +++ b/aegisub/video_box.cpp @@ -36,6 +36,8 @@ //////////// // Includes +#include "config.h" + #include #include #include diff --git a/aegisub/video_context.cpp b/aegisub/video_context.cpp index 516d66ae2..2f4a7e870 100644 --- a/aegisub/video_context.cpp +++ b/aegisub/video_context.cpp @@ -36,6 +36,8 @@ //////////// // Includes +#include "config.h" + #ifdef __APPLE__ #include #include diff --git a/aegisub/video_display.cpp b/aegisub/video_display.cpp index d626a307a..61a228e99 100644 --- a/aegisub/video_display.cpp +++ b/aegisub/video_display.cpp @@ -36,6 +36,8 @@ //////////// // Includes +#include "config.h" + #include #ifdef __APPLE__ #include diff --git a/aegisub/video_frame.cpp b/aegisub/video_frame.cpp index 4f05fa41e..5c76edd67 100644 --- a/aegisub/video_frame.cpp +++ b/aegisub/video_frame.cpp @@ -36,6 +36,8 @@ /////////// // Headers +#include "config.h" + #include "video_frame.h" #include "utils.h" diff --git a/aegisub/video_provider_avs.cpp b/aegisub/video_provider_avs.cpp index 08caec63f..310f8048d 100644 --- a/aegisub/video_provider_avs.cpp +++ b/aegisub/video_provider_avs.cpp @@ -36,6 +36,8 @@ /////////// // Headers +#include "config.h" + #include #ifdef WITH_AVISYNTH #include diff --git a/aegisub/video_provider_cache.cpp b/aegisub/video_provider_cache.cpp index fa02bb348..12d887ef1 100644 --- a/aegisub/video_provider_cache.cpp +++ b/aegisub/video_provider_cache.cpp @@ -36,6 +36,8 @@ /////////// // Headers +#include "config.h" + #include "video_provider_cache.h" diff --git a/aegisub/video_provider_dshow.cpp b/aegisub/video_provider_dshow.cpp index f5bc9fb1e..1966f8da0 100644 --- a/aegisub/video_provider_dshow.cpp +++ b/aegisub/video_provider_dshow.cpp @@ -36,6 +36,8 @@ /////////// // Headers +#include "config.h" + #ifdef WITH_DIRECTSHOW diff --git a/aegisub/video_provider_dummy.cpp b/aegisub/video_provider_dummy.cpp index 37376377b..8b5c04ddc 100644 --- a/aegisub/video_provider_dummy.cpp +++ b/aegisub/video_provider_dummy.cpp @@ -36,6 +36,8 @@ /////////// // Headers +#include "config.h" + #include "video_provider_dummy.h" #include "colorspace.h" #include diff --git a/aegisub/video_provider_ffmpegsource.cpp b/aegisub/video_provider_ffmpegsource.cpp index d22e6ba9e..26c8ed6ec 100644 --- a/aegisub/video_provider_ffmpegsource.cpp +++ b/aegisub/video_provider_ffmpegsource.cpp @@ -33,6 +33,8 @@ // Contact: mailto:zeratul@cellosoft.com // +#include "config.h" + #ifdef WITH_FFMPEGSOURCE /////////// diff --git a/aegisub/video_provider_lavc.cpp b/aegisub/video_provider_lavc.cpp index b11bbb69f..283e58876 100644 --- a/aegisub/video_provider_lavc.cpp +++ b/aegisub/video_provider_lavc.cpp @@ -36,6 +36,8 @@ /////////// // Headers +#include "config.h" + #ifdef WITH_FFMPEG diff --git a/aegisub/video_provider_manager.cpp b/aegisub/video_provider_manager.cpp index 34fbf2008..a366cfe34 100644 --- a/aegisub/video_provider_manager.cpp +++ b/aegisub/video_provider_manager.cpp @@ -36,6 +36,8 @@ /////////// // Headers +#include "config.h" + #include "video_provider_manager.h" #include "video_provider_dummy.h" #include "options.h" diff --git a/aegisub/video_slider.cpp b/aegisub/video_slider.cpp index 0b188a4c7..d397b2dd1 100644 --- a/aegisub/video_slider.cpp +++ b/aegisub/video_slider.cpp @@ -36,6 +36,8 @@ //////////// // Includes +#include "config.h" + #include #include #include "video_slider.h" diff --git a/aegisub/visual_feature.cpp b/aegisub/visual_feature.cpp index fd1a14a3f..1b581ae95 100644 --- a/aegisub/visual_feature.cpp +++ b/aegisub/visual_feature.cpp @@ -36,6 +36,8 @@ /////////// // Headers +#include "config.h" + #include "visual_feature.h" #include "gl_wrap.h" diff --git a/aegisub/visual_tool.cpp b/aegisub/visual_tool.cpp index 30196e8d2..e030f01f8 100644 --- a/aegisub/visual_tool.cpp +++ b/aegisub/visual_tool.cpp @@ -36,6 +36,8 @@ ////////////// // Headers +#include "config.h" + #include #ifdef __APPLE__ #include diff --git a/aegisub/visual_tool_clip.cpp b/aegisub/visual_tool_clip.cpp index 8ee4d6c08..cc2e79b1e 100644 --- a/aegisub/visual_tool_clip.cpp +++ b/aegisub/visual_tool_clip.cpp @@ -36,6 +36,8 @@ /////////// // Headers +#include "config.h" + #include "visual_tool_clip.h" #include "subs_grid.h" #include "subs_edit_box.h" diff --git a/aegisub/visual_tool_cross.cpp b/aegisub/visual_tool_cross.cpp index 8cf835ee3..dba327875 100644 --- a/aegisub/visual_tool_cross.cpp +++ b/aegisub/visual_tool_cross.cpp @@ -36,6 +36,8 @@ /////////// // Headers +#include "config.h" + #include "visual_tool_cross.h" #include "gl_text.h" #include "subs_grid.h" diff --git a/aegisub/visual_tool_drag.cpp b/aegisub/visual_tool_drag.cpp index 1b29254cf..ab294fdff 100644 --- a/aegisub/visual_tool_drag.cpp +++ b/aegisub/visual_tool_drag.cpp @@ -36,6 +36,8 @@ /////////// // Headers +#include "config.h" + #include "visual_tool_drag.h" #include "subs_grid.h" #include "subs_edit_box.h" diff --git a/aegisub/visual_tool_rotatexy.cpp b/aegisub/visual_tool_rotatexy.cpp index b2ecadd1b..2c72dbd54 100644 --- a/aegisub/visual_tool_rotatexy.cpp +++ b/aegisub/visual_tool_rotatexy.cpp @@ -36,6 +36,8 @@ /////////// // Headers +#include "config.h" + #include "visual_tool_rotatexy.h" #include "subs_grid.h" #include "subs_edit_box.h" diff --git a/aegisub/visual_tool_rotatez.cpp b/aegisub/visual_tool_rotatez.cpp index 43c97245a..4b4ea825e 100644 --- a/aegisub/visual_tool_rotatez.cpp +++ b/aegisub/visual_tool_rotatez.cpp @@ -36,6 +36,8 @@ /////////// // Headers +#include "config.h" + #include "visual_tool_rotatez.h" #include "subs_grid.h" #include "subs_edit_box.h" diff --git a/aegisub/visual_tool_scale.cpp b/aegisub/visual_tool_scale.cpp index 20c0c9999..202c20727 100644 --- a/aegisub/visual_tool_scale.cpp +++ b/aegisub/visual_tool_scale.cpp @@ -36,6 +36,8 @@ /////////// // Headers +#include "config.h" + #include "visual_tool_scale.h" #include "subs_grid.h" #include "subs_edit_box.h" diff --git a/aegisub/visual_tool_vector_clip.cpp b/aegisub/visual_tool_vector_clip.cpp index 87a85554c..5aff075eb 100644 --- a/aegisub/visual_tool_vector_clip.cpp +++ b/aegisub/visual_tool_vector_clip.cpp @@ -36,6 +36,8 @@ /////////// // Headers +#include "config.h" + #include "visual_tool_vector_clip.h" #include "ass_dialogue.h" diff --git a/aegisub/win64/config0.h b/aegisub/win64/config0.h deleted file mode 100644 index 84e8845d0..000000000 --- a/aegisub/win64/config0.h +++ /dev/null @@ -1,168 +0,0 @@ -// Copyright (c) 2007, Rodrigo Braz Monteiro -// All rights reserved. -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions are met: -// -// * Redistributions of source code must retain the above copyright notice, -// this list of conditions and the following disclaimer. -// * Redistributions in binary form must reproduce the above copyright notice, -// this list of conditions and the following disclaimer in the documentation -// and/or other materials provided with the distribution. -// * Neither the name of the Aegisub Group nor the names of its contributors -// may be used to endorse or promote products derived from this software -// without specific prior written permission. -// -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE -// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR -// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF -// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS -// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN -// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) -// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE -// POSSIBILITY OF SUCH DAMAGE. -// -// ----------------------------------------------------------------------------- -// -// AEGISUB -// -// Website: http://aegisub.cellosoft.com -// Contact: mailto:zeratul@cellosoft.com -// - - -#pragma once - - -// Build credit: Set this to a string with your name as you want it to appear on the program -#ifndef BUILD_CREDIT -#define BUILD_CREDIT "Anonymous" -#endif - - -// Endianness: We don't support any Windows version that runs on big endian -#define HAVE_LITTLE_ENDIAN -#undef HAVE_BIG_ENDIAN - - -////////////// HIGH PRIORITY ///////////// - -// Enable Automation -// Requires: Nothing -//#define WITH_AUTOMATION - - -// Enable Automation 4 Lua -// Requires: Lua 5.1 (in repository) -//#define WITH_AUTO4_LUA - - -// Enable Automation 3 -// Requires: auto3 dll (in repository), Lua (in repository) -//#define WITH_AUTO3 - - -// Enable DirectSound audio player -// Requires: DirectX SDK -//#define WITH_DIRECTSOUND - - -// Enable Avisynth -// Requires: nothing (just the avisynth dlls) -//#define WITH_AVISYNTH - - - -///////////// MEDIUM PRIORITY //////////// - -// Enable FreeType2 font lister for the fonts collector -// If you're on Visual Studio, also uncomment the library names and make sure they match the files that you have -// Requires: FreeType2 -//#define WITH_FREETYPE2 -//#define FT2_LIB_RELEASE "freetype235_x64.lib" -//#define FT2_LIB_DEBUG "freetype235_D_x64.lib" - - -// Enable CSRI, required for styles previews in the style editor and some video providers -// Requires: csri (in repository) -//#define WITH_CSRI - - -// Enable universal charset detector, so Aegisub can automatically detect the encoding of non-unicode subtitles -// Requires: universalcharset (in repository) -//#define WITH_UNIVCHARDET - - -// Enable Hunspell-based spellchecker -// Requires: hunspell (in repository for Win32) -// If you have an old version of Hunspell (that uses Hunspell::put_word() instead of Hunspell::add()), -// uncomment the second line as well. -//#define WITH_HUNSPELL -//#define WITH_OLD_HUNSPELL - - - -/////////////// LOW PRIORITY //////////// - -// Enable DirectShow video provider -// Requires: DirectShow "baseclasses", DirectX SDK -//#define WITH_DIRECTSHOW - - -// Enable Perl scripting -// Requires: perl library (ActivePerl comes with one for Visual C++ under lib\core\) -//#define WITH_PERL - - - -///////////// NOT RECOMMENDED ///////////// - -// Enable FontConfig -// Requires: fontconfig -//#define WITH_FONTCONFIG - - -// Enable libass -// Requires: libass -//#define WITH_LIBASS - - -// Enable FFmpeg video and audio decoders -// Requires: libavcodec, libavformat, libswscale, libavutil -// If you compiled static libraries (yes, by default), uncomment the second line as well, -// and remember to add the correct .a files to the linker's additional dependencies. -// #define WITH_FFMPEG -// #define WITH_STATIC_FFMPEG - - -// Enable ffmpegsource video and audio providers -// Requires: ffmpegsource version 2 -// #define WITH_FFMPEGSOURCE - - -// Enable Ruby support for Automation -// Requires: Ruby 1.9 -//#define WITH_RUBY - - -// Enable PortAudio audio player -// Requires PortAudio release 18 -//#define WITH_PORTAUDIO - - -// Enable ALSA audio player -// Requires Linux and libasound -//#define WITH_ALSA - - -// Enable OpenAL audio player -// Requires OpenAL development libraries and headers -//#define WITH_OPENAL - - -// Enable Pulse Audio audio player -// Requires libpulse (and a *NIX compatible system and a running sound server to actually use) -//#define WITH_PULSEAUDIO diff --git a/aegisub/win64/stdint.h b/aegisub/win64/stdint.h deleted file mode 100644 index 739c89e7e..000000000 --- a/aegisub/win64/stdint.h +++ /dev/null @@ -1,221 +0,0 @@ -// ISO C9x compliant stdint.h for Miscrosoft Visual Studio -// Based on ISO/IEC 9899:TC2 Committee draft (May 6, 2005) WG14/N1124 -// -// Copyright (c) 2006 Alexander Chemeris -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions are met: -// -// 1. Redistributions of source code must retain the above copyright notice, -// this list of conditions and the following disclaimer. -// -// 2. Redistributions in binary form must reproduce the above copyright -// notice, this list of conditions and the following disclaimer in the -// documentation and/or other materials provided with the distribution. -// -// 3. The name of the author may be used to endorse or promote products -// derived from this software without specific prior written permission. -// -// THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED -// WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO -// EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; -// OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -// WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -// OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -// ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -// -/////////////////////////////////////////////////////////////////////////////// - -#ifdef _MSC_VER - -#ifndef _MSC_STDINT_H_ // [ -#define _MSC_STDINT_H_ - -#if _MSC_VER > 1000 -#pragma once -#endif - -#include - -// For Visual Studio 6 in C++ mode wrap include with 'extern "C++" {}' -// or compiler give many errors like this: -// error C2733: second C linkage of overloaded function 'wmemchr' not allowed -#if (_MSC_VER < 1300) && defined(__cplusplus) - extern "C++" { -#endif -# include -#if (_MSC_VER < 1300) && defined(__cplusplus) - } -#endif - -// 7.18.1 Integer types - -// 7.18.1.1 Exact-width integer types -typedef __int8 int8_t; -typedef __int16 int16_t; -typedef __int32 int32_t; -typedef __int64 int64_t; -typedef unsigned __int8 uint8_t; -typedef unsigned __int16 uint16_t; -typedef unsigned __int32 uint32_t; -typedef unsigned __int64 uint64_t; - -// 7.18.1.2 Minimum-width integer types -typedef int8_t int_least8_t; -typedef int16_t int_least16_t; -typedef int32_t int_least32_t; -typedef int64_t int_least64_t; -typedef uint8_t uint_least8_t; -typedef uint16_t uint_least16_t; -typedef uint32_t uint_least32_t; -typedef uint64_t uint_least64_t; - -// 7.18.1.3 Fastest minimum-width integer types -typedef int8_t int_fast8_t; -typedef int16_t int_fast16_t; -typedef int32_t int_fast32_t; -typedef int64_t int_fast64_t; -typedef uint8_t uint_fast8_t; -typedef uint16_t uint_fast16_t; -typedef uint32_t uint_fast32_t; -typedef uint64_t uint_fast64_t; - -// 7.18.1.4 Integer types capable of holding object pointers -#ifdef _WIN64 // [ - typedef __int64 intptr_t; - typedef unsigned __int64 uintptr_t; -#else // _WIN64 ][ - typedef int intptr_t; - typedef unsigned int uintptr_t; -#endif // _WIN64 ] - -// 7.18.1.5 Greatest-width integer types -typedef int64_t intmax_t; -typedef uint64_t uintmax_t; - - -// 7.18.2 Limits of specified-width integer types - -#if !defined(__cplusplus) || defined(__STDC_LIMIT_MACROS) // [ See footnote 220 at page 257 and footnote 221 at page 259 - -// 7.18.2.1 Limits of exact-width integer types -#define INT8_MIN _I8_MIN -#define INT8_MAX _I8_MAX -#define INT16_MIN _I16_MIN -#define INT16_MAX _I16_MAX -#define INT32_MIN _I32_MIN -#define INT32_MAX _I32_MAX -#define INT64_MIN _I64_MIN -#define INT64_MAX _I64_MAX -#define UINT8_MAX _UI8_MAX -#define UINT16_MAX _UI16_MAX -#define UINT32_MAX _UI32_MAX -#define UINT64_MAX _UI64_MAX - -// 7.18.2.2 Limits of minimum-width integer types -#define INT_LEAST8_MIN INT8_MIN -#define INT_LEAST8_MAX INT8_MAX -#define INT_LEAST16_MIN INT16_MIN -#define INT_LEAST16_MAX INT16_MAX -#define INT_LEAST32_MIN INT32_MIN -#define INT_LEAST32_MAX INT32_MAX -#define INT_LEAST64_MIN INT64_MIN -#define INT_LEAST64_MAX INT64_MAX -#define UINT_LEAST8_MAX UINT8_MAX -#define UINT_LEAST16_MAX UINT16_MAX -#define UINT_LEAST32_MAX UINT32_MAX -#define UINT_LEAST64_MAX UINT64_MAX - -// 7.18.2.3 Limits of fastest minimum-width integer types -#define INT_FAST8_MIN INT8_MIN -#define INT_FAST8_MAX INT8_MAX -#define INT_FAST16_MIN INT16_MIN -#define INT_FAST16_MAX INT16_MAX -#define INT_FAST32_MIN INT32_MIN -#define INT_FAST32_MAX INT32_MAX -#define INT_FAST64_MIN INT64_MIN -#define INT_FAST64_MAX INT64_MAX -#define UINT_FAST8_MAX UINT8_MAX -#define UINT_FAST16_MAX UINT16_MAX -#define UINT_FAST32_MAX UINT32_MAX -#define UINT_FAST64_MAX UINT64_MAX - -// 7.18.2.4 Limits of integer types capable of holding object pointers -#ifdef _WIN64 // [ -# define INTPTR_MIN INT64_MIN -# define INTPTR_MAX INT64_MAX -# define UINTPTR_MAX UINT64_MAX -#else // _WIN64 ][ -# define INTPTR_MIN INT32_MIN -# define INTPTR_MAX INT32_MAX -# define UINTPTR_MAX UINT32_MAX -#endif // _WIN64 ] - -// 7.18.2.5 Limits of greatest-width integer types -#define INTMAX_MIN INT64_MIN -#define INTMAX_MAX INT64_MAX -#define UINTMAX_MAX UINT64_MAX - -// 7.18.3 Limits of other integer types - -#ifdef _WIN64 // [ -# define PTRDIFF_MIN _I64_MIN -# define PTRDIFF_MAX _I64_MAX -#else // _WIN64 ][ -# define PTRDIFF_MIN _I32_MIN -# define PTRDIFF_MAX _I32_MAX -#endif // _WIN64 ] - -#define SIG_ATOMIC_MIN INT_MIN -#define SIG_ATOMIC_MAX INT_MAX - -#ifndef SIZE_MAX // [ -# ifdef _WIN64 // [ -# define SIZE_MAX _UI64_MAX -# else // _WIN64 ][ -# define SIZE_MAX _UI32_MAX -# endif // _WIN64 ] -#endif // SIZE_MAX ] - -// WCHAR_MIN and WCHAR_MAX are also defined in -#ifndef WCHAR_MIN // [ -# define WCHAR_MIN 0 -#endif // WCHAR_MIN ] -#ifndef WCHAR_MAX // [ -# define WCHAR_MAX _UI16_MAX -#endif // WCHAR_MAX ] - -#define WINT_MIN 0 -#define WINT_MAX _UI16_MAX - -#endif // __STDC_LIMIT_MACROS ] - - -// 7.18.4 Limits of other integer types - -#if !defined(__cplusplus) || defined(__STDC_CONSTANT_MACROS) // [ See footnote 224 at page 260 - -// 7.18.4.1 Macros for minimum-width integer constants - -#define INT8_C(val) val -#define INT16_C(val) val -#define INT32_C(val) val##L -#define INT64_C(val) val##i64 - -#define UINT8_C(val) val -#define UINT16_C(val) val -#define UINT32_C(val) val##UL -#define UINT64_C(val) val##Ui64 - -// 7.18.4.2 Macros for greatest-width integer constants -#define INTMAX_C INT64_C -#define UINTMAX_C UINT64_C - -#endif // __STDC_CONSTANT_MACROS ] - - -#endif // _MSC_STDINT_H_ ] -#endif // _MSC_VER ] diff --git a/build/aegisub_vs2008/aegisub_vs2008.vcproj b/build/aegisub_vs2008/aegisub_vs2008.vcproj index 2fc5a9a3f..aa1a12693 100644 --- a/build/aegisub_vs2008/aegisub_vs2008.vcproj +++ b/build/aegisub_vs2008/aegisub_vs2008.vcproj @@ -28,7 +28,7 @@ >