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

@@ -21,7 +21,9 @@
 #include "ffaudiosource.h"
 #include <errno.h>
 
-
+#ifdef __UNIX__
+#define _snprintf snprintf
+#endif
 
 AudioBase::AudioBase() {
 	DecodingBuffer = new uint8_t[AVCODEC_MAX_AUDIO_FRAME_SIZE * 10];

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;

FFmpegSource2/ffvideosource.cpp

@@ -21,6 +21,10 @@
 #include "ffvideosource.h"
 #include <errno.h>
 
+#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;

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 <libavformat/avformat.h>
 #include <libavcodec/avcodec.h>

FFmpegSource2/utils.cpp

@@ -25,6 +25,12 @@
 #	include <intrin.h>
 #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;

aegisub/VideoSink.cpp

@@ -6,6 +6,8 @@
  */
 
 
+#include "config.h"
+
 #ifdef WITH_DIRECTSHOW
 #include <windows.h>
 #ifdef __WXDEBUG__

aegisub/aegisublocale.cpp

@@ -36,6 +36,8 @@
 
 ///////////
 // Headers
+#include "config.h"
+
 #include <wx/wxprec.h>
 #include <wx/intl.h>
 #include <locale.h>

aegisub/ass_attachment.cpp

@@ -36,6 +36,8 @@
 
 ////////////
 // Includes
+#include "config.h"
+
 #include <wx/wfstream.h>
 #include <wx/filename.h>
 #include "ass_attachment.h"

aegisub/ass_dialogue.cpp

@@ -36,6 +36,8 @@
 
 ////////////
 // Includes
+#include "config.h"
+
 #include <fstream>
 #include <wx/tokenzr.h>
 #include <wx/regex.h>

aegisub/ass_entry.cpp

@@ -36,6 +36,8 @@
 
 ///////////
 // Headers
+#include "config.h"
+
 #include "ass_dialogue.h"
 #include "ass_style.h"
 #include "ass_attachment.h"

aegisub/ass_export_filter.cpp

@@ -36,6 +36,8 @@
 
 ///////////
 // Headers
+#include "config.h"
+
 #include "ass_export_filter.h"
 #include "ass_file.h"
 

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"

aegisub/ass_file.cpp

@@ -36,6 +36,8 @@
 
 ////////////
 // Includes
+#include "config.h"
+
 #include <list>
 #include <fstream>
 #include <wx/filename.h>

aegisub/ass_karaoke.cpp

@@ -34,6 +34,8 @@
 //
 
 
+#include "config.h"
+
 #include "ass_karaoke.h"
 #include "ass_override.h"
 

aegisub/ass_override.cpp

@@ -36,6 +36,8 @@
 
 ////////////
 // Includes
+#include "config.h"
+
 #include "ass_dialogue.h"
 #include "ass_override.h"
 #include <wx/tokenzr.h>

aegisub/ass_style.cpp

@@ -35,6 +35,8 @@
 
 ////////////
 // Includes
+#include "config.h"
+
 #include <wx/tokenzr.h>
 #include <wx/intl.h>
 #include "ass_style.h"

aegisub/ass_style_storage.cpp

@@ -36,6 +36,8 @@
 
 ////////////
 // Includes
+#include "config.h"
+
 #include <fstream>
 #include "ass_style_storage.h"
 #include "ass_style.h"

aegisub/ass_time.cpp

@@ -36,6 +36,8 @@
 
 ////////////
 // Includes
+#include "config.h"
+
 #include <fstream>
 #include <algorithm>
 #include "ass_time.h"

aegisub/audio_box.cpp

@@ -36,6 +36,8 @@
 
 ///////////
 // Headers
+#include "config.h"
+
 #include <math.h>
 #include <wx/tglbtn.h>
 #include <wx/statline.h>

aegisub/audio_display.cpp

@@ -36,6 +36,8 @@
 
 ///////////
 // Headers
+#include "config.h"
+
 #include <wx/tglbtn.h>
 #include <wx/filename.h>
 #include <math.h>

aegisub/audio_karaoke.cpp

@@ -36,6 +36,8 @@
 
 ///////////
 // Headers
+#include "config.h"
+
 #include "audio_karaoke.h"
 #include "audio_display.h"
 #include "audio_box.h"

aegisub/audio_player.cpp

@@ -36,6 +36,8 @@
 
 ///////////
 // Headers
+#include "config.h"
+
 #include <wx/wxprec.h>
 #include "audio_player_manager.h"
 #include "options.h"

aegisub/audio_player_alsa.cpp

@@ -34,6 +34,8 @@
 //
 
 
+#include "config.h"
+
 #ifdef WITH_ALSA
 
 

aegisub/audio_player_dsound.cpp

@@ -36,6 +36,8 @@
 
 ///////////
 // Headers
+#include "config.h"
+
 #ifdef WITH_DIRECTSOUND
 
 #include <wx/wxprec.h>

aegisub/audio_player_dsound2.cpp

@@ -36,6 +36,8 @@
 
 ///////////
 // Headers
+#include "config.h"
+
 #ifdef WITH_DIRECTSOUND
 
 #include <wx/wxprec.h>

aegisub/audio_player_openal.cpp

@@ -34,6 +34,8 @@
 //
 
 
+#include "config.h"
+
 #ifdef WITH_OPENAL
 
 

aegisub/audio_player_portaudio.cpp

@@ -34,6 +34,8 @@
 //
 
 
+#include "config.h"
+
 #ifdef WITH_PORTAUDIO
 
 

aegisub/audio_player_pulse.cpp

@@ -34,6 +34,8 @@
 //
 
 
+#include "config.h"
+
 #ifdef WITH_PULSEAUDIO
 
 

aegisub/audio_provider.cpp

@@ -36,6 +36,8 @@
 
 ///////////
 // Headers
+#include "config.h"
+
 #include <wx/wxprec.h>
 #include <wx/thread.h>
 #include "audio_provider_ram.h"

aegisub/audio_provider_avs.cpp

@@ -36,6 +36,8 @@
 
 ///////////
 // Headers
+#include "config.h"
+
 #include <wx/wxprec.h>
 #ifdef WITH_AVISYNTH
 #include <wx/filename.h>

aegisub/audio_provider_convert.cpp

@@ -36,6 +36,8 @@
 
 ///////////
 // Headers
+#include "config.h"
+
 #include "audio_provider_convert.h"
 #include "audio_provider_downmix.h"
 

aegisub/audio_provider_downmix.cpp

@@ -35,6 +35,8 @@
 
 //////////////////
 // Headers
+#include "config.h"
+
 #include "audio_provider_downmix.h"
 
 

aegisub/audio_provider_dummy.cpp

@@ -36,6 +36,8 @@
 
 ///////////
 // Headers
+#include "config.h"
+
 #include "audio_provider_dummy.h"
 #include "utils.h"
 

aegisub/audio_provider_ffmpegsource.cpp

@@ -33,6 +33,8 @@
 // Contact: mailto:zeratul@cellosoft.com
 //
 
+#include "config.h"
+
 #ifdef WITH_FFMPEGSOURCE
 
 ///////////

aegisub/audio_provider_hd.cpp

@@ -36,6 +36,8 @@
 
 ///////////
 // Headers
+#include "config.h"
+
 #include <wx/filename.h>
 #include <wx/file.h>
 #include <wx/filefn.h>

aegisub/audio_provider_lavc.cpp

@@ -36,6 +36,8 @@
 
 ///////////
 // Headers
+#include "config.h"
+
 #ifdef WITH_FFMPEG
 
 #ifdef WIN32

aegisub/audio_provider_pcm.cpp

@@ -34,6 +34,8 @@
 //
 
 
+#include "config.h"
+
 #include <wx/filename.h>
 #include <wx/file.h>
 #include "audio_provider_pcm.h"

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"

aegisub/audio_provider_stream.cpp

@@ -36,6 +36,8 @@
 
 ///////////
 // Headers
+#include "config.h"
+
 #include "audio_provider_stream.h"
 #include "utils.h"
 

aegisub/audio_spectrum.cpp

@@ -34,6 +34,8 @@
 // Contact: mailto:zeratul@cellosoft.com
 //
 
+#include "config.h"
+
 #include <assert.h>
 #include <vector>
 #include <list>

aegisub/auto4_auto3.cpp

@@ -34,6 +34,8 @@
 //
 
 
+#include "config.h"
+
 #ifdef WITH_AUTOMATION
 #ifdef WITH_AUTO3
 

aegisub/auto4_base.cpp

@@ -34,6 +34,8 @@
 //
 
 
+#include "config.h"
+
 #ifdef WITH_AUTOMATION
 
 #include "auto4_base.h"

aegisub/auto4_lua.cpp

@@ -33,6 +33,8 @@
 // Contact: mailto:jiifurusu@gmail.com
 //
 
+#include "config.h"
+
 #ifdef WITH_AUTO4_LUA
 
 #include "auto4_lua.h"

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"

aegisub/auto4_lua_dialog.cpp

@@ -34,6 +34,8 @@
 //
 
 
+#include "config.h"
+
 #ifdef WITH_AUTO4_LUA
 
 #include "auto4_lua.h"

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"

aegisub/auto4_perl.cpp

@@ -34,6 +34,8 @@
 //
 
 
+#include "config.h"
+
 #ifdef WITH_PERL
 
 

aegisub/auto4_perl_ass.cpp

@@ -34,6 +34,8 @@
 //
 
 
+#include "config.h"
+
 #ifdef WITH_PERL
 
 

aegisub/auto4_perl_console.cpp

@@ -34,6 +34,8 @@
 //
 
 
+#include "config.h"
+
 #ifdef WITH_PERL
 #ifdef WITH_PERLCONSOLE
 

aegisub/auto4_perl_dialogs.cpp

@@ -34,6 +34,8 @@
 //
 
 
+#include "config.h"
+
 #ifdef WITH_PERL
 
 

aegisub/auto4_perl_script.cpp

@@ -34,6 +34,8 @@
 //
 
 
+#include "config.h"
+
 #ifdef WITH_PERL
 
 

aegisub/auto4_ruby.cpp

@@ -33,6 +33,8 @@
 // Contact: mailto:pomyk@go2.pl
 //
 
+#include "config.h"
+
 #ifdef WITH_RUBY
 
 #ifdef _MSC_VER

aegisub/auto4_ruby_assfile.cpp

@@ -33,6 +33,8 @@
 // Contact: mailto:pomyk@go2.pl
 //
 
+#include "config.h"
+
 #ifdef WITH_RUBY
 
 #ifdef _MSC_VER

aegisub/auto4_ruby_dialog.cpp

@@ -34,6 +34,8 @@
 //
 
 
+#include "config.h"
+
 #ifdef WITH_RUBY
 #include "auto4_ruby.h"
 #include <ruby.h>

aegisub/avisynth_wrap.cpp

@@ -37,6 +37,8 @@
 ////////////
 // Includes
 
+#include "config.h"
+
 #ifdef WITH_AVISYNTH
 #include "avisynth_wrap.h"
 #include "options.h"

aegisub/base_grid.cpp

@@ -36,6 +36,8 @@
 
 ////////////
 // Includes
+#include "config.h"
+
 #include "base_grid.h"
 #include "utils.h"
 #include "ass_file.h"

aegisub/browse_button.cpp

@@ -36,6 +36,8 @@
 
 ///////////
 // Headers
+#include "config.h"
+
 #include <wx/dirdlg.h>
 #include <wx/filedlg.h>
 #include <wx/fontdlg.h>

aegisub/charset_detect.cpp

@@ -36,6 +36,8 @@
 
 ///////////
 // Headers
+#include "config.h"
+
 #ifdef WITH_UNIVCHARDET
 #include <wx/wxprec.h>
 #include "text_file_reader.h"

aegisub/colorspace.cpp

@@ -33,6 +33,8 @@
 // Contact: mailto:zeratul@cellosoft.com
 //
 
+#include "config.h"
+
 #include "colorspace.h"
 #include "utils.h"
 

aegisub/colour_button.cpp

@@ -36,6 +36,8 @@
 
 ////////////
 // Includes
+#include "config.h"
+
 #include <wx/dcmemory.h>
 #include "colour_button.h"
 #include "dialog_colorpicker.h"

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__

aegisub/dialog_about.cpp

@@ -36,6 +36,8 @@
 
 ////////////
 // Includes
+#include "config.h"
+
 #include <wx/statline.h>
 #include <wx/stattext.h>
 #include <wx/sizer.h>

aegisub/dialog_associations.cpp

@@ -36,6 +36,8 @@
 
 ///////////
 // Headers
+#include "config.h"
+
 #include <wx/sizer.h>
 #include <wx/button.h>
 #include <wx/config.h>

aegisub/dialog_attachments.cpp

@@ -36,6 +36,8 @@
 
 ///////////
 // Headers
+#include "config.h"
+
 #include <wx/listctrl.h>
 #include <wx/dirdlg.h>
 #include <wx/filedlg.h>

aegisub/dialog_automation.cpp

@@ -34,6 +34,8 @@
 //
 
 
+#include "config.h"
+
 #ifdef WITH_AUTOMATION
 
 #include "main.h"

aegisub/dialog_colorpicker.cpp

@@ -33,6 +33,8 @@
 // Contact: mailto:zeratul@cellosoft.com
 //
 
+#include "config.h"
+
 #include <wx/image.h>
 #include <wx/statbox.h>
 #include <wx/stattext.h>

aegisub/dialog_detached_video.cpp

@@ -36,6 +36,8 @@
 
 ///////////
 // Headers
+#include "config.h"
+
 #include <wx/wxprec.h>
 #include <wx/filename.h>
 #include "dialog_detached_video.h"

aegisub/dialog_dummy_video.cpp

@@ -34,6 +34,8 @@
 //
 
 
+#include "config.h"
+
 #include "dialog_dummy_video.h"
 #include <wx/datetime.h>
 #include <wx/sizer.h>

aegisub/dialog_export.cpp

@@ -36,6 +36,8 @@
 
 ///////////
 // Headers
+#include "config.h"
+
 #include <wx/tokenzr.h>
 #include <wx/button.h>
 #include <wx/stattext.h>

aegisub/dialog_fonts_collector.cpp

@@ -36,6 +36,8 @@
 
 ////////////
 // Includes
+#include "config.h"
+
 #include <wx/config.h>
 #include <wx/filename.h>
 #include <wx/wfstream.h>

aegisub/dialog_jumpto.cpp

@@ -36,6 +36,8 @@
 
 ///////////
 // Headers
+#include "config.h"
+
 #include <wx/dialog.h>
 #include <wx/stattext.h>
 #include <wx/textctrl.h>

aegisub/dialog_kanji_timer.cpp

@@ -43,6 +43,8 @@
 
 ///////////
 // Headers
+#include "config.h"
+
 #include <vector>
 #include "dialog_kanji_timer.h"
 #include "ass_file.h"

aegisub/dialog_options.cpp

@@ -36,6 +36,8 @@
 
 ///////////
 // Headers
+#include "config.h"
+
 #include "dialog_options.h"
 #if wxUSE_TREEBOOK && !__WXMAC__
 #include <wx/treebook.h>

aegisub/dialog_paste_over.cpp

@@ -36,6 +36,8 @@
 
 ///////////
 // Headers
+#include "config.h"
+
 #include <wx/config.h>
 #include <wx/stattext.h>
 #include <wx/sizer.h>

aegisub/dialog_progress.cpp

@@ -36,6 +36,8 @@
 
 ///////////
 // Headers
+#include "config.h"
+
 #include <wx/button.h>
 #include <wx/sizer.h>
 #include "dialog_progress.h"

aegisub/dialog_properties.cpp

@@ -36,6 +36,8 @@
 
 ///////////
 // Headers
+#include "config.h"
+
 #include <wx/dialog.h>
 #include <wx/stattext.h>
 #include <wx/sizer.h>

aegisub/dialog_resample.cpp

@@ -36,6 +36,8 @@
 
 ///////////
 // Headers
+#include "config.h"
+
 #include "dialog_resample.h"
 #include "ass_file.h"
 #include "ass_dialogue.h"

aegisub/dialog_search_replace.cpp

@@ -36,6 +36,8 @@
 
 ///////////
 // Headers
+#include "config.h"
+
 #include <wx/wxprec.h>
 #include <wx/string.h>
 #include <wx/regex.h>

aegisub/dialog_selection.cpp

@@ -36,6 +36,8 @@
 
 ///////////
 // Headers
+#include "config.h"
+
 #include <wx/wxprec.h>
 #include <wx/string.h>
 #include <wx/regex.h>

aegisub/dialog_shift_times.cpp

@@ -36,6 +36,8 @@
 
 ///////////
 // Headers
+#include "config.h"
+
 #include <fstream>
 #include <algorithm>
 #include <string>

aegisub/dialog_spellchecker.cpp

@@ -35,6 +35,8 @@
 
 ///////////
 // Headers
+#include "config.h"
+
 #include <wx/intl.h>
 #include "dialog_spellchecker.h"
 #include "spellchecker_manager.h"

aegisub/dialog_splash.cpp

@@ -36,6 +36,8 @@
 
 ////////////
 // Includes
+#include "config.h"
+
 #include <wx/wxprec.h>
 #include <wx/display.h>
 #include <wx/dcclient.h>

aegisub/dialog_style_editor.cpp

@@ -36,6 +36,8 @@
 
 ////////////
 // Includes
+#include "config.h"
+
 #include <wx/fontdlg.h>
 #include <wx/colordlg.h>
 #include <wx/fontenum.h>

aegisub/dialog_style_manager.cpp

@@ -36,6 +36,8 @@
 
 ////////////
 // Includes
+#include "config.h"
+
 #include <wx/filename.h>
 #include <wx/filedlg.h>
 #include <wx/choicdlg.h>

aegisub/dialog_styling_assistant.cpp

@@ -36,6 +36,8 @@
 
 ///////////
 // Headers
+#include "config.h"
+
 #include <wx/recguard.h>
 #include "dialog_styling_assistant.h"
 #include "subs_grid.h"

aegisub/dialog_text_import.cpp

@@ -36,6 +36,8 @@
 
 ///////////
 // Headers
+#include "config.h"
+
 #include "dialog_text_import.h"
 #include <wx/sizer.h>
 #include <wx/stattext.h>

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"

aegisub/dialog_tip.cpp

@@ -36,6 +36,8 @@
 
 ///////////
 // Headers
+#include "config.h"
+
 #include <wx/wxprec.h>
 #include <wx/window.h>
 #include <wx/msgdlg.h>

aegisub/dialog_translation.cpp

@@ -36,6 +36,8 @@
 
 ///////////
 // Headers
+#include "config.h"
+
 #include <wx/wxprec.h>
 #include <wx/settings.h>
 #include "dialog_translation.h"

aegisub/dialog_version_check.cpp

@@ -36,6 +36,8 @@
 
 ///////////
 // Headers
+#include "config.h"
+
 #include <wx/filesys.h>
 #include <wx/fs_inet.h>
 #include <wx/txtstrm.h>

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"

aegisub/drop.cpp

@@ -36,6 +36,8 @@
 
 ///////////
 // Headers
+#include "config.h"
+
 #include "drop.h"
 #include "frame_main.h"
 #include <wx/filename.h>

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"

aegisub/export_fixstyle.cpp

@@ -36,6 +36,8 @@
 
 ///////////
 // Headers
+#include "config.h"
+
 #include "export_fixstyle.h"
 #include "ass_file.h"
 #include "ass_dialogue.h"

aegisub/export_framerate.cpp

@@ -36,6 +36,8 @@
 
 ///////////
 // Headers
+#include "config.h"
+
 #include "export_framerate.h"
 #include "vfr.h"
 #include "ass_file.h"

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"

aegisub/ffmpegsource_common.cpp

@@ -33,6 +33,8 @@
 // Contact: mailto:zeratul@cellosoft.com
 //
 
+#include "config.h"
+
 #ifdef WITH_FFMPEGSOURCE
 
 ///////////

aegisub/fft.cpp

@@ -42,6 +42,8 @@
 
 ///////////
 // Headers
+#include "config.h"
+
 #include "fft.h"
 #include <math.h>