Download-Tools/mkvtoolnix
1
0
Fork 0
mirror of https://gitlab.com/mbunkus/mkvtoolnix.git synced 2025-02-26 08:22:31 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix compilation on mingw

Browse Source
This commit is contained in:
Moritz Bunkus 2011-11-05 15:06:57 +01:00
parent 8298aec4f8
commit 1589171e13
5 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/common/wx.h
View File

@ -69,9 +69,17 @@ wxU(const wxString &s) {
#define wxMB(s) ((const char *)(s).mb_str(wxConvUTF8))
/* i18n stuff */
#if !defined Z
# define Z(s) wxU(Y(s))
# define NZ(s_singular, s_plural, count) wxU(NY(s))
#if defined(HAVE_LIBINTL_H)
# include <libintl.h>
# if !defined Z
# define Z(s) wxU(gettext(s))
# define NZ(s_singular, s_plural, count) wxU(ngettext(s_singular, s_plural, count))
# endif
#else /* HAVE_LIBINTL_H */
# if !defined Y
# define Z(s) (s)
# define NZ(s_singular, s_plural, count) (s_singular)
# endif
#endif
// Use wxComboBox on non-Windows builds with wxWidgets 2.8.0 and newer

2
src/mmg/cli_options_dlg.cpp
View File

@ -11,7 +11,7 @@
Written by Moritz Bunkus <moritz@bunkus.org>.
*/
#include "common/common_pch.h"
#include "common/os.h"
#include <wx/wx.h>
#include <wx/statline.h>

2
src/mmg/message_dialog.cpp
View File

@ -11,7 +11,7 @@
Written by Moritz Bunkus <moritz@bunkus.org>.
*/
#include "common/common_pch.h"
#include "common/os.h"
#include <wx/wx.h>
#include <wx/statline.h>

2
src/mmg/mmg.cpp
View File

@ -11,7 +11,7 @@
Written by Moritz Bunkus <moritz@bunkus.org>.
*/
#include "common/common_pch.h"
#include "common/os.h"
#include <wx/wx.h>
#include <wx/config.h>

2
src/mmg/update_checker.cpp
View File

@ -11,7 +11,7 @@
Written by Moritz Bunkus <moritz@bunkus.org>.
*/
#include "common/common_pch.h"
#include "common/os.h"
#if defined(HAVE_CURL_EASY_H)