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.
This commit is contained in:
Amar Takhar 2009-01-04 06:31:48 +00:00
parent eb328262c3
commit 0763541848
189 changed files with 403 additions and 407 deletions

View file

@ -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];

View file

@ -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;

View file

@ -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;
@ -792,4 +796,4 @@ AVFrameLite *HaaliTSVideoSource::GetFrame(int n, char *ErrorMsg, unsigned MsgSiz
return OutputFrame(DecodeFrame);
}
#endif // HAALITS
#endif // HAALITS

View file

@ -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>

View file

@ -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;

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

14
aegisub/config.h Normal file
View file

@ -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__

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

@ -35,6 +35,8 @@
////////////
// Includes
#include "config.h"
#include "dialog_timing_processor.h"
#include "subs_grid.h"
#include "ass_file.h"

View file

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

View file

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

View file

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

View file

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