From e37d701bc0b6b4a16f6f1531d4af513533b8aa9f Mon Sep 17 00:00:00 2001 From: Paul Licameli Date: Fri, 29 Sep 2017 11:53:56 -0400 Subject: [PATCH] WXINTL_NO_GETTEXT_MACRO defined in compiler options... ... so even if you neglect to include Audacity.h, it applies --- lib-src/FileDialog/mac/FileDialogPrivate.mm | 2 ++ mac/Audacity.xcodeproj/project.pbxproj | 2 ++ src/Audacity.h | 2 +- src/Makefile.am | 1 + src/widgets/numformatter.cpp | 1 + win/Projects/Audacity/Audacity.vcxproj | 4 ++-- 6 files changed, 9 insertions(+), 3 deletions(-) diff --git a/lib-src/FileDialog/mac/FileDialogPrivate.mm b/lib-src/FileDialog/mac/FileDialogPrivate.mm index 508d8b800..d893f74d5 100644 --- a/lib-src/FileDialog/mac/FileDialogPrivate.mm +++ b/lib-src/FileDialog/mac/FileDialogPrivate.mm @@ -19,6 +19,8 @@ // headers // ---------------------------------------------------------------------------- +#undef WXINTL_NO_GETTEXT_MACRO + // For compilers that support precompilation, includes "wx.h". #include diff --git a/mac/Audacity.xcodeproj/project.pbxproj b/mac/Audacity.xcodeproj/project.pbxproj index f7602f7be..8af30eec1 100644 --- a/mac/Audacity.xcodeproj/project.pbxproj +++ b/mac/Audacity.xcodeproj/project.pbxproj @@ -8488,6 +8488,7 @@ OTHER_CPLUSPLUSFLAGS = ( "$(WX_CXXFLAGS)", "$(FFMPEG_CXXFLAGS)", + "-DWXINTL_NO_GETTEXT_MACRO", ); OTHER_LDFLAGS = ( "$(WX_LDFLAGS)", @@ -8816,6 +8817,7 @@ OTHER_CPLUSPLUSFLAGS = ( "$(WX_CXXFLAGS)", "$(FFMPEG_CXXFLAGS)", + "-DWXINTL_NO_GETTEXT_MACRO", ); OTHER_LDFLAGS = ( "$(WX_LDFLAGS)", diff --git a/src/Audacity.h b/src/Audacity.h index 11b33c3c5..fa37e3f18 100644 --- a/src/Audacity.h +++ b/src/Audacity.h @@ -227,7 +227,7 @@ extern const wxString& GetCustomSubstitution(const wxString& str1 ); #define _TS( s ) GetCustomSubstitution( s ) -#define WXINTL_NO_GETTEXT_MACRO +//#define WXINTL_NO_GETTEXT_MACRO #ifdef wxPLURAL #undef wxPLURAL diff --git a/src/Makefile.am b/src/Makefile.am index 8ff73a503..172fe77aa 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -52,6 +52,7 @@ audacity_CPPFLAGS = \ -std=c++11 \ -Wno-deprecated-declarations \ -D__STDC_CONSTANT_MACROS \ + -DWXINTL_NO_GETTEXT_MACRO \ -DLIBDIR=\"$(libdir)\" \ $(EXPAT_CFLAGS) \ $(FILEDIALOG_CFLAGS) \ diff --git a/src/widgets/numformatter.cpp b/src/widgets/numformatter.cpp index d2838cb9a..2792f5f54 100644 --- a/src/widgets/numformatter.cpp +++ b/src/widgets/numformatter.cpp @@ -28,6 +28,7 @@ #endif +#include "../Audacity.h" #include "numformatter.h" #include diff --git a/win/Projects/Audacity/Audacity.vcxproj b/win/Projects/Audacity/Audacity.vcxproj index d72b2669a..c0b95742b 100755 --- a/win/Projects/Audacity/Audacity.vcxproj +++ b/win/Projects/Audacity/Audacity.vcxproj @@ -56,7 +56,7 @@ MaxSpeed $(WXWIN)\lib\vc_dll\mswu;$(WXWIN)\include;..\..;..\..\..\include;..\..\..\lib-src\expat\lib;..\..\..\lib-src\FileDialog;..\..\..\lib-src\FileDialog\win;..\..\..\lib-src\ffmpeg\win32;..\..\..\lib-src\ffmpeg;..\..\..\lib-src\lib-widget-extra;..\..\..\lib-src\libflac\include;..\..\..\lib-src\libid3tag;..\..\..\lib-src\libmad\msvc++;..\..\..\lib-src\libmad;..\..\..\lib-src\libnyquist;..\..\..\lib-src\libogg\include;..\..\..\lib-src\libscorealign;..\libsndfile;..\..\..\lib-src\libsoxr\src;..\..\..\lib-src\libvamp;..\..\..\lib-src\libvorbis\include;..\..\..\lib-src\portaudio-v19\include;..\..\..\lib-src\portmixer\include;..\..\..\lib-src\portsmf;..\..\..\lib-src\sbsms\include;..\..\..\lib-src\soundtouch\include;..\..\..\lib-src\twolame\libtwolame;..\..\..\lib-src\portmidi\pm_common;..\..\..\lib-src\portmidi\pm_win;..\..\..\lib-src\portmidi\porttime;..\..\..\lib-src\lv2\lilv;..\..\..\lib-src\lv2\lv2;..\..\..\lib-src\lv2\suil;..\..\..\lib-src\lame;$(GSTREAMER_SDK)\include\gstreamer-1.0;$(GSTREAMER_SDK)\include\glib-2.0;$(GSTREAMER_SDK)\lib\glib-2.0\include;%(AdditionalIncludeDirectories) - BUILDING_AUDACITY;FLAC__NO_DLL;XML_STATIC;__STDC_CONSTANT_MACROS;WXUSINGDLL;__WXMSW__;wxDEBUG_LEVEL=0;NDEBUG;WIN32;STRICT;%(PreprocessorDefinitions) + BUILDING_AUDACITY;FLAC__NO_DLL;XML_STATIC;__STDC_CONSTANT_MACROS;WXINTL_NO_GETTEXT_MACRO;WXUSINGDLL;__WXMSW__;wxDEBUG_LEVEL=0;NDEBUG;WIN32;STRICT;%(PreprocessorDefinitions) true MultiThreadedDLL true @@ -87,7 +87,7 @@ Disabled $(WXWIN)\lib\vc_dll\mswud;$(WXWIN)\include;..\..;..\..\..\include;..\..\..\lib-src\expat\lib;..\..\..\lib-src\FileDialog;..\..\..\lib-src\FileDialog\win;..\..\..\lib-src\lib-widget-extra;..\..\..\lib-src\libflac\include;..\..\..\lib-src\libid3tag;..\..\..\lib-src\libmad\msvc++;..\..\..\lib-src\libmad;..\..\..\lib-src\libnyquist;..\..\..\lib-src\libogg\include;..\..\..\lib-src\libscorealign;..\libsndfile;..\..\..\lib-src\libsoxr\src;..\..\..\lib-src\libvamp;..\..\..\lib-src\libvorbis\include;..\..\..\lib-src\portaudio-v19\include;..\..\..\lib-src\portmixer\include;..\..\..\lib-src\portsmf;..\..\..\lib-src\sbsms\include;..\..\..\lib-src\soundtouch\include;..\..\..\lib-src\twolame\libtwolame;..\..\..\lib-src\portmidi\pm_common;..\..\..\lib-src\portmidi\pm_win;..\..\..\lib-src\portmidi\porttime;..\..\..\lib-src\ffmpeg\win32;..\..\..\lib-src\ffmpeg;..\..\..\lib-src\lv2\lilv;..\..\..\lib-src\lv2\lv2;..\..\..\lib-src\lv2\suil;..\..\..\lib-src\lame;"$(GSTREAMER_SDK)\include\gstreamer-1.0;$(GSTREAMER_SDK)\include\glib-2.0;$(GSTREAMER_SDK)\lib\gstreamer-1.0\include;$(GSTREAMER_SDK)\lib\glib-2.0\include;%(AdditionalIncludeDirectories) - BUILDING_AUDACITY;FLAC__NO_DLL;XML_STATIC;__STDC_CONSTANT_MACROS;WXUSINGDLL;__WXMSW__;__WXDEBUG__;_DEBUG;WIN32;STRICT;%(PreprocessorDefinitions) + BUILDING_AUDACITY;FLAC__NO_DLL;XML_STATIC;__STDC_CONSTANT_MACROS;WXINTL_NO_GETTEXT_MACRO;WXUSINGDLL;__WXMSW__;__WXDEBUG__;_DEBUG;WIN32;STRICT;%(PreprocessorDefinitions) true EnableFastChecks MultiThreadedDebugDLL