diff options
| author | John Emmas <johne53@tiscali.co.uk> | 2014-04-14 15:54:32 +0100 |
|---|---|---|
| committer | John Emmas <johne53@tiscali.co.uk> | 2014-04-14 16:14:06 +0100 |
| commit | 4336f75d3b82ca7ef7043cc96bc3b68f9a607662 (patch) | |
| tree | 203d301d11a15594b6dfb7b67bc1465d0b498e4e /gtk2_ardour/main.cc | |
| parent | 09d5d7f26b3778c22806366ef97223b193eaa65b (diff) | |
Make sure that when building with MSVC, a Release build will launch without an annoying, floating console window
Diffstat (limited to 'gtk2_ardour/main.cc')
| -rw-r--r-- | gtk2_ardour/main.cc | 21 |
1 files changed, 10 insertions, 11 deletions
diff --git a/gtk2_ardour/main.cc b/gtk2_ardour/main.cc index 4b9136626a..9c2036290c 100644 --- a/gtk2_ardour/main.cc +++ b/gtk2_ardour/main.cc @@ -138,24 +138,26 @@ sigpipe_handler (int /*signal*/) } } -#ifdef WINDOWS_VST_SUPPORT -#ifndef PLATFORM_WINDOWS +#if (defined(LXVST_SUPPORT) || (defined(COMPILER_MSVC) && defined(NDEBUG) && !defined(RDC_BUILD))) + +#ifdef LXVST_SUPPORT extern int windows_vst_gui_init (int* argc, char** argv[]); -#endif /* this is called from the entry point of a wine-compiled executable that is linked against gtk2_ardour built as a shared library. */ extern "C" { +#endif int ardour_main (int argc, char *argv[]) + #else int main (int argc, char *argv[]) #endif { fixup_bundle_environment (argc, argv, &localedir); - load_custom_fonts(); /* needs to happend before any gtk and pango init calls */ + load_custom_fonts(); /* needs to happen before any gtk and pango init calls */ if (!Glib::thread_supported()) { Glib::thread_init(); @@ -165,17 +167,15 @@ int main (int argc, char *argv[]) gtk_set_locale (); #endif -#ifdef WINDOWS_VST_SUPPORT -#ifndef PLATFORM_WINDOWS +#ifdef LXVST_SUPPORT /* this does some magic that is needed to make GTK and Wine's own X11 client interact properly. */ windows_vst_gui_init (&argc, &argv); #endif -#endif #ifdef ENABLE_NLS - cerr << "bnd txt domain [" << PACKAGE << "] to " << localedir << endl; + cerr << "bind txt domain [" << PACKAGE << "] to " << localedir << endl; (void) bindtextdomain (PACKAGE, localedir); /* our i18n translations are all in UTF-8, so make sure @@ -263,7 +263,6 @@ int main (int argc, char *argv[]) return 0; } -#ifdef WINDOWS_VST_SUPPORT -} // end of extern C block +#ifdef LXVST_SUPPORT +} // end of extern "C" block #endif - |