Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

autumn cleanup of configure:

Browse Source 
1. we now consistently use WXCONFIG_C[PP|XX]_FLAGS instead of a mix of CODE_GEN_FLAGS
   plus tons of ad hoc variables (TOOLCHAIN_DEFS, WX_LARGEFILE_FLAGS, WXDEBUG_DEFINE
   and so on) which could all be simply removed now

2. output more stuff which used to be in CFLAGS only in wx-config output:
 a) pthread options (they are needed for user code compilation too)
 b) -D__STDC__EXT needed under HP-UX, this should finally fix the build there

3. also removed GCC_PRAGMA_FLAGS which is unused any more

4. use consitent naming for a couple of other variables


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36220 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2005-11-22 02:06:16 +00:00
parent 4647fc0833
commit 5ff751d600
3 changed files with 538 additions and 884 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
wx-config.in
View File

@@ -946,7 +946,7 @@ fi
# Additional configuration for individual library components.
ldflags_gl="@LDFLAGS_GL@"
ldlibs_base="@WXCONFIG_EXTRALIBS@"
ldlibs_base="@WXCONFIG_LIBS@"
ldlibs_core="@EXTRALIBS_GUI@"
ldlibs_gl="@OPENGL_LIBS@"
ldlibs_html="@EXTRALIBS_HTML@"
@@ -1143,12 +1143,12 @@ else
_include_cppflags="-I${includedir} -I${prefix}/contrib/include"
fi
_cppflags=$(echo "-I${libdir}/wx/include/@TOOLCHAIN_FULLNAME@" $_include_cppflags "@WXDEBUG_DEFINE@" "@TOOLCHAIN_DEFS@" "@TOOLCHAIN_DLL_DEFS@" $_gui_cppflags "@WXCONFIG_INCLUDE@" "@WX_LARGEFILE_FLAGS@" "@GCC_PRAGMA_FLAGS@")
_cppflags=$(echo "-I${libdir}/wx/include/@TOOLCHAIN_FULLNAME@" $_include_cppflags "@WXCONFIG_CPPFLAGS@" $_gui_cppflags)
# now without further ado, we can answer these too.
[ -z "$output_option_cppflags" ] || echo $_cppflags
[ -z "$output_option_cflags" ] || echo $_cppflags "@CODE_GEN_FLAGS@"
[ -z "$output_option_cxxflags" ] || echo $_cppflags "@CODE_GEN_FLAGS@" "@CODE_GEN_FLAGS_CXX@"
[ -z "$output_option_cflags" ] || echo $_cppflags "@WXCONFIG_CFLAGS@"
[ -z "$output_option_cxxflags" ] || echo $_cppflags "@WXCONFIG_CXXFLAGS@"
[ -z "$output_option_gl_libs" ] || echo $(lib_flags_for gl)
[ -z "$output_option_linkdeps" ] || echo $link_deps