diff --git a/aegisub/audio_provider_avs.cpp b/aegisub/audio_provider_avs.cpp index a0a8df7c476e62602949e21be847649cd1f9dc6b..2643e5462f1b281d7af9874f640d4837d54ca203 100644 --- a/aegisub/audio_provider_avs.cpp +++ b/aegisub/audio_provider_avs.cpp @@ -37,7 +37,7 @@ /////////// // Headers #include <wx/wxprec.h> -#ifdef __WINDOWS__ +#ifdef WITH_AVISYNTH #include <wx/filename.h> #include <Mmreg.h> #include <time.h> diff --git a/aegisub/avisynth_wrap.cpp b/aegisub/avisynth_wrap.cpp index 0aec549dbbba35a480865ca03cbb5550658e7c90..a80650d5efc84235177eaa505ea864bdda379e5d 100644 --- a/aegisub/avisynth_wrap.cpp +++ b/aegisub/avisynth_wrap.cpp @@ -36,9 +36,9 @@ //////////// // Includes -#include "avisynth_wrap.h" -#ifdef __WINDOWS__ +#ifdef WITH_AVISYNTH +#include "avisynth_wrap.h" #include "options.h" #ifdef DEBUG_AVISYNTH_CODE diff --git a/aegisub/frame_main.cpp b/aegisub/frame_main.cpp index 76f8d0dd269958b8105928ace15817789e09f10f..d99517beadac560af0b4b676d20a41d6747ea56f 100644 --- a/aegisub/frame_main.cpp +++ b/aegisub/frame_main.cpp @@ -46,7 +46,9 @@ #include "subs_grid.h" #include "frame_main.h" +#ifdef WITH_AVISYNTH #include "avisynth_wrap.h" +#endif #include "video_display.h" #include "video_provider.h" #include "video_slider.h" @@ -1104,7 +1106,7 @@ void FrameMain::LoadAudio(wxString filename,bool FromVideo) { wxString err(error); wxMessageBox(err, _T("Error opening audio file"), wxOK | wxICON_ERROR, this); } - #ifdef __WINDOWS__ + #ifdef WITH_AVISYNTH catch (AvisynthError err) { wxMessageBox (wxString(_T("AviSynth error: ")) + wxString(err.msg,wxConvUTF8), _T("Error loading audio"), wxOK | wxICON_ERROR); return; diff --git a/aegisub/video_provider_avs.cpp b/aegisub/video_provider_avs.cpp index 9e40077c7e9a84ab95ff2d964a8d2d9f277cb79b..b5300c2b019d6074b7703e5a8188976117f9cca5 100644 --- a/aegisub/video_provider_avs.cpp +++ b/aegisub/video_provider_avs.cpp @@ -37,7 +37,7 @@ /////////// // Headers #include <wx/wxprec.h> -#ifdef __WINDOWS__ +#ifdef WITH_AVISYNTH #include <wx/filename.h> #include <wx/msw/registry.h> #include <wx/filename.h> diff --git a/aegisub/win32/config0.h b/aegisub/win32/config0.h index 0a5cd4968fb01db970fad76e9b6a74c319992c64..0ba0fa4cc4fd4085fa350ba90d190df77cfca64a 100644 --- a/aegisub/win32/config0.h +++ b/aegisub/win32/config0.h @@ -60,6 +60,11 @@ //#define WITH_DIRECTSOUND +// Enable Avisynth +// Requires: nothing (just the avisynth dlls) +//#define WITH_AVISYNTH + + ///////////// MEDIUM PRIORITY ////////////