AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Minimal implementation of --rescomp option for wx-config,

Browse Source 
required for building windows resource files.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36230 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Ron Lee 2005-11-23 05:10:09 +00:00
parent bc6ee4ae7f
commit 370d2fd7cc
3 changed files with 22 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
configure vendored
View File

File diff suppressed because one or more lines are too long

6
configure.in
View File

@ -2721,9 +2721,13 @@ if test "$USE_WIN32" = 1 ; then
fi
dnl We might want to abort here if wxUSE_ODBC="builtin" isn't supported on msw.
dnl This one is still used by some sample makefiles.
RESFLAGS="--include-dir \$(top_srcdir)/include --include-dir \$(top_srcdir)/\$(program_dir) --define __WIN32__ --define __WIN95__ --define __GNUWIN32__"
RESPROGRAMOBJ="\$(PROGRAM)_resources.o"
dnl This one we export to wx-config.
WXCONFIG_RESFLAGS="--include-dir \$includedir --define __WIN32__ --define __WIN95__ --define __GNUWIN32__"
dnl install Win32-specific files in "make install"
WIN32INSTALL=win32install
fi
@ -7186,6 +7190,7 @@ fi
dnl TOOLCHAIN_DEFS should be used for both wx and client code
WXCONFIG_CPPFLAGS="$WXCONFIG_CPPFLAGS $TOOLCHAIN_DEFS"
WXCONFIG_RESCOMP="$RESCOMP $WXCONFIG_RESFLAGS"
dnl for convenience, sort the samples in alphabetical order
dnl
@ -7243,6 +7248,7 @@ AC_SUBST(WXCONFIG_CXXFLAGS)
AC_SUBST(WXCONFIG_LIBS)
AC_SUBST(WXCONFIG_RPATH)
AC_SUBST(WXCONFIG_LDFLAGS_GUI)
AC_SUBST(WXCONFIG_RESCOMP)
AC_SUBST(EXE_LINKER)
dnl distribution vars

6
wx-config.in
View File

@ -64,7 +64,7 @@ usage()
[--list] [--host=HOST] [--toolkit=TOOLKIT] [--universal[=yes|no]]
[--unicode[=yes|no]] [--debug[=yes|no]] [--static[=yes|no]]
[--version[=VERSION]] [--basename] [--cc] [--cppflags] [--cflags]
[--cxxflags] [--rezflags] [--libs] [--cxx] [--ld] [--linkdeps]
[--cxxflags] [--rescomp] [--libs] [--cxx] [--ld] [--linkdeps]
[--utility=UTIL] [LIB ...]
wx-config returns information about the wxWidgets libraries available
@ -131,7 +131,7 @@ wxconfig_output_options="prefix exec_prefix
release version version_full
basename
cppflags cflags cxxflags
rezflags
rescomp
libs
linkdeps
cc cxx ld
@ -880,7 +880,7 @@ bindir="@bindir@"
[ -z "$output_option_version" ] || echo "@WX_VERSION@"
[ -z "$output_option_version_full" ] || echo "@WX_SUBVERSION@"
[ -z "$output_option_basename" ] || echo "@WX_LIBRARY_BASENAME_GUI@"
[ -z "$output_option_rezflags" ] || echo $(eval echo "@MACRESWXCONFIG@")
[ -z "$output_option_rescomp" ] || echo "@WXCONFIG_RESCOMP@"
[ -z "$output_option_cc" ] || echo "@CC@"
[ -z "$output_option_cxx" ] || echo "@CXX@"
[ -z "$output_option_ld" ] || echo "@EXE_LINKER@"