From b762d2fb0f5cb5333e77df1ab3be52f6ce752cce Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Tue, 21 Jul 2020 15:16:03 +0200 Subject: [PATCH] Restore -DWXUSINGDLL in wx-config output This has been broken by the wrong test added in 13b0981eb9 (Get rid of WXCONFIG_ONLY_CPPFLAGS variable in configure, 2020-02-02), which was always false because it tested literal "SHARED" instead of the value of the variable with this name. This went unnoticed because WXUSINGDLL is not really necessary anyhow under Unix, but it broke the build of any project building MSW binaries using wx-config. --- configure | 2 +- configure.in | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/configure b/configure index 568533f824..7d6f0e69df 100755 --- a/configure +++ b/configure @@ -37994,7 +37994,7 @@ CXXFLAGS=`echo $WXCONFIG_CXXFLAGS $CXXWARNINGS $C_AND_CXX_FLAGS $CXXFLAGS ` OBJCFLAGS=`echo $WXCONFIG_CFLAGS $CWARNINGS $C_AND_CXX_FLAGS $OBJCFLAGS ` OBJCXXFLAGS=`echo $WXCONFIG_CXXFLAGS $C_AND_CXX_FLAGS $OBJCXXFLAGS ` -if test "SHARED" = 1; then +if test "$SHARED" = 1; then WXCONFIG_CPPFLAGS="$WXCONFIG_CPPFLAGS -DWXUSINGDLL" fi diff --git a/configure.in b/configure.in index 3ff854e79d..a86ee9f33e 100644 --- a/configure.in +++ b/configure.in @@ -8105,7 +8105,7 @@ OBJCXXFLAGS=`echo $WXCONFIG_CXXFLAGS $C_AND_CXX_FLAGS $OBJCXXFLAGS ` dnl now that we added WXCONFIG_CPPFLAGS to CPPFLAGS we can add the wx-config dnl only stuff to it -if test "SHARED" = 1; then +if test "$SHARED" = 1; then WXCONFIG_CPPFLAGS="$WXCONFIG_CPPFLAGS -DWXUSINGDLL" fi