10 files changed, 43 insertions, 25 deletions
diff --git a/win32/include/common.h b/win32/include/common.h
index bc9406c69..271641d41 100644
--- a/win32/include/common.h
+++ b/win32/include/common.h
@@ -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
  *
- * $Id: common.h,v 1.1 2003/04/20 16:42:09 guenter Exp $
+ * $Id: common.h,v 1.2 2004/01/02 22:42:03 valtri Exp $
  *
  */
 
@@ -29,9 +29,9 @@
 #endif
 
 #include <xine.h>
+#if 0
 #include <xineutils.h>
 
-#if (0)
 #include "Imlib-light/Imlib.h"
 
 #include "xitk.h"
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 <elon@altavista.com>
  */
 
@@ -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 <elon@altavista.com>
  */
 
@@ -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 <elon@altavista.com>
  */
 
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 <elon@altavista.com>
  */
 
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 <elon@altavista.com>
  */
 
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 <elon@altavista.com>
  */
 
-#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 <xine/configfile.h>
+#  include <xine.h>
+#endif
 
 #include <windows.h>
 #include <windowsx.h>
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 <elon@altavista.com>
  */
 
-#include <xinesuppt.h>
 #include "xineui.h"
 
-#include <pthread.h> /* pthread_mutex_init() */
+#ifdef _MSC_VER
+#  include <xinesuppt.h>
+#else
+#  include <sys/stat.h>
+#endif
+#include <pthread.h>
 
 /*
 #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 <elon@altavista.com>
  */
 
+#ifdef __CYGWIN32__
+#  define _WIN32_IE 0xFFFF
+#endif
+
 #include <windows.h>
 #include <commctrl.h>
 #include <stdio.h>
 #include <math.h>
-#include <ddraw.h>
+#ifdef _MSC_VER
+#  include <ddraw.h>
+#endif
 
-#include "xine.h"
+#include <xine.h>
 #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 <xine/video_out.h>
+#  include <xine/audio_out.h>
+#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
diff --git a/win32/xineui.dsp b/win32/xineui.dsp
index aa4480f43..0983239c3 100644
--- a/win32/xineui.dsp
+++ b/win32/xineui.dsp
@@ -53,7 +53,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib uuid.lib comctl32.lib ddraw.lib /nologo /subsystem:windows /machine:I386 /out:"Release/bin/xineui.exe"
+# ADD LINK32 user32.lib gdi32.lib comdlg32.lib comctl32.lib /nologo /subsystem:windows /machine:I386 /out:"Release/bin/xineui.exe"
 
 !ELSEIF  "$(CFG)" == "xineui - Win32 Debug"