Commit bab22111 authored by Gildas Bazin's avatar Gildas Bazin

* modules/gui/skins/src/*: compilation fixes under win32.
parent bb5c0f97
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* skin-main.cpp: skins plugin for VLC * skin-main.cpp: skins plugin for VLC
***************************************************************************** *****************************************************************************
* Copyright (C) 2003 VideoLAN * Copyright (C) 2003 VideoLAN
* $Id: skin_main.cpp,v 1.24 2003/05/02 15:53:32 gbazin Exp $ * $Id: skin_main.cpp,v 1.25 2003/05/05 12:15:25 gbazin Exp $
* *
* Authors: Olivier Teulire <ipkiss@via.ecp.fr> * Authors: Olivier Teulire <ipkiss@via.ecp.fr>
* Emmanuel Puig <karibu@via.ecp.fr> * Emmanuel Puig <karibu@via.ecp.fr>
...@@ -30,6 +30,12 @@ ...@@ -30,6 +30,12 @@
//--- GENERAL --------------------------------------------------------------- //--- GENERAL ---------------------------------------------------------------
#ifndef BASIC_SKINS #ifndef BASIC_SKINS
#ifdef WIN32 /* mingw32 hack */
# undef Yield
# undef CreateDialog
#endif
/* Let vlc take care of the i18n stuff */
#define WXINTL_NO_GETTEXT_MACRO
#include <wx/wx.h> #include <wx/wx.h>
#endif #endif
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* vlcproc.cpp: VlcProc class * vlcproc.cpp: VlcProc class
***************************************************************************** *****************************************************************************
* Copyright (C) 2003 VideoLAN * Copyright (C) 2003 VideoLAN
* $Id: vlcproc.cpp,v 1.18 2003/05/02 15:53:32 gbazin Exp $ * $Id: vlcproc.cpp,v 1.19 2003/05/05 12:15:25 gbazin Exp $
* *
* Authors: Olivier Teulire <ipkiss@via.ecp.fr> * Authors: Olivier Teulire <ipkiss@via.ecp.fr>
* Emmanuel Puig <karibu@via.ecp.fr> * Emmanuel Puig <karibu@via.ecp.fr>
...@@ -30,6 +30,12 @@ ...@@ -30,6 +30,12 @@
#include <vlc/vout.h> #include <vlc/vout.h>
#ifndef BASIC_SKINS #ifndef BASIC_SKINS
#ifdef WIN32 /* mingw32 hack */
# undef Yield
# undef CreateDialog
#endif
/* Let vlc take care of the i18n stuff */
#define WXINTL_NO_GETTEXT_MACRO
#include <wx/wx.h> #include <wx/wx.h>
#endif #endif
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* win32_run.cpp: * win32_run.cpp:
***************************************************************************** *****************************************************************************
* Copyright (C) 2003 VideoLAN * Copyright (C) 2003 VideoLAN
* $Id: win32_run.cpp,v 1.14 2003/05/02 15:53:32 gbazin Exp $ * $Id: win32_run.cpp,v 1.15 2003/05/05 12:15:25 gbazin Exp $
* *
* Authors: Olivier Teulire <ipkiss@via.ecp.fr> * Authors: Olivier Teulire <ipkiss@via.ecp.fr>
* Emmanuel Puig <karibu@via.ecp.fr> * Emmanuel Puig <karibu@via.ecp.fr>
...@@ -31,8 +31,15 @@ ...@@ -31,8 +31,15 @@
//--- GENERAL --------------------------------------------------------------- //--- GENERAL ---------------------------------------------------------------
#ifndef BASIC_SKINS #ifndef BASIC_SKINS
#ifdef WIN32 /* mingw32 hack */
# undef Yield
# undef CreateDialog
#endif
/* Let vlc take care of the i18n stuff */
#define WXINTL_NO_GETTEXT_MACRO
#include <wx/wx.h> #include <wx/wx.h>
#endif #endif
#include <windows.h> #include <windows.h>
//--- SKIN ------------------------------------------------------------------ //--- SKIN ------------------------------------------------------------------
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment