From 17bfa0f4657219b84b65c413237da5ec67f574a7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Franti=C5=A1ek=20Dvo=C5=99=C3=A1k?= Date: Fri, 2 Jan 2004 22:42:03 +0000 Subject: Prepare compilation of win32 xineui under cygwin. Minor MSVC changes and "Xine" typos. CVS patchset: 5977 CVS date: 2004/01/02 22:42:03 --- win32/source/main.cpp | 6 +++--- win32/source/wnd.ctrl.cpp | 4 ++-- win32/source/wnd.panel.cpp | 2 +- win32/source/wnd.playlist.cpp | 2 +- win32/source/wnd.video.cpp | 2 +- win32/source/xineint.h | 12 ++++++++---- win32/source/xineui.cpp | 10 +++++++--- win32/source/xineui.h | 24 +++++++++++++++++------- 8 files changed, 40 insertions(+), 22 deletions(-) (limited to 'win32/source') diff --git a/win32/source/main.cpp b/win32/source/main.cpp index c53175a97..9cbb601c1 100644 --- a/win32/source/main.cpp +++ b/win32/source/main.cpp @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA * - * Xine win32 UI + * xine win32 UI * by Matthew Grooms */ @@ -33,6 +33,7 @@ gGui_t *gGui; void RedirectIOToConsole() { +#if !defined (__MINGW32__) && !defined (__CYGWIN32__) int hConHandle; long lStdHandle; CONSOLE_SCREEN_BUFFER_INFO coninfo; @@ -91,6 +92,7 @@ void RedirectIOToConsole() // make cout, wcout, cin, wcin, wcerr, cerr, wclog and clog // point to console as well /*ios::sync_with_stdio();*/ +#endif } int WINAPI WinMain( HINSTANCE hinst, HINSTANCE hprevinst, LPSTR cmdline, int ncmdshow ) @@ -98,10 +100,8 @@ int WINAPI WinMain( HINSTANCE hinst, HINSTANCE hprevinst, LPSTR cmdline, int ncm XINE_UI xine_ui; -#if !defined (__MINGW32__) /* We only need the output window for MSVC */ RedirectIOToConsole(); -#endif // prepair our mrl(s) and add them // to our playlist diff --git a/win32/source/wnd.ctrl.cpp b/win32/source/wnd.ctrl.cpp index ea229ca87..6dc8bdca0 100644 --- a/win32/source/wnd.ctrl.cpp +++ b/win32/source/wnd.ctrl.cpp @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA * - * Xine win32 UI + * xine win32 UI * by Matthew Grooms */ @@ -437,4 +437,4 @@ DWORD XINE_UI::UpdateLoop() CreateThread( 0, 0, &update_loop_helper, ( void * ) this, 0, &panel_loop_id ); return 0; -} \ No newline at end of file +} diff --git a/win32/source/wnd.panel.cpp b/win32/source/wnd.panel.cpp index 8063f5e73..5b7132a5c 100644 --- a/win32/source/wnd.panel.cpp +++ b/win32/source/wnd.panel.cpp @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA * - * Xine win32 UI + * xine win32 UI * by Matthew Grooms */ diff --git a/win32/source/wnd.playlist.cpp b/win32/source/wnd.playlist.cpp index 1593144b0..09ed2f097 100644 --- a/win32/source/wnd.playlist.cpp +++ b/win32/source/wnd.playlist.cpp @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA * - * Xine win32 UI + * xine win32 UI * by Matthew Grooms */ diff --git a/win32/source/wnd.video.cpp b/win32/source/wnd.video.cpp index 72c2856bb..e754980ff 100644 --- a/win32/source/wnd.video.cpp +++ b/win32/source/wnd.video.cpp @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA * - * Xine win32 UI + * xine win32 UI * by Matthew Grooms */ diff --git a/win32/source/xineint.h b/win32/source/xineint.h index 88166a7b6..b2071cf78 100644 --- a/win32/source/xineint.h +++ b/win32/source/xineint.h @@ -17,14 +17,18 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA * - * Xine win32 UI + * xine win32 UI * by Matthew Grooms */ -#include "configfile.h" -#include "xine.h" -#include "xineutils.h" #include "video_out_win32.h" +#ifdef XINE_COMPILE +# include "configfile.h" +# include "xine.h" +#else +# include +# include +#endif #include #include diff --git a/win32/source/xineui.cpp b/win32/source/xineui.cpp index 79b74c229..30ecfd89a 100644 --- a/win32/source/xineui.cpp +++ b/win32/source/xineui.cpp @@ -17,14 +17,18 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA * - * Xine win32 UI + * xine win32 UI * by Matthew Grooms */ -#include #include "xineui.h" -#include /* pthread_mutex_init() */ +#ifdef _MSC_VER +# include +#else +# include +#endif +#include /* #define LOG 1 diff --git a/win32/source/xineui.h b/win32/source/xineui.h index 73a23c9c8..d0e851e34 100644 --- a/win32/source/xineui.h +++ b/win32/source/xineui.h @@ -17,26 +17,36 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA * - * Xine win32 UI + * xine win32 UI * by Matthew Grooms */ +#ifdef __CYGWIN32__ +# define _WIN32_IE 0xFFFF +#endif + #include #include #include #include -#include +#ifdef _MSC_VER +# include +#endif -#include "xine.h" +#include #include "xineint.h" #include "resource.h" #include "common.h" -#include "video_out.h" -#include "audio_out.h" +#ifdef XINE_COMPILE +# include "video_out.h" +# include "audio_out.h" +#else +# include +# include +#endif -#include "video_out_win32.h" #ifndef _XINEUI_H_ #define _XINEUI_H_ @@ -160,4 +170,4 @@ typedef class _XINE_UI extern gGui_t *gGui; -#endif \ No newline at end of file +#endif -- cgit v1.2.3