Added Rez support to wx-config for MacOS X
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@12004 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
		@@ -2320,6 +2320,7 @@ if test "$wxUSE_MAC" = 1; then
 | 
			
		||||
    AC_CHECK_PROG(DEREZ, Derez, Derez, /Developer/Tools/Derez)
 | 
			
		||||
    LIBWXMACRES="\$(top_builddir)/lib/lib${WX_LIBRARY}.r"
 | 
			
		||||
    LIBWXMACRESCOMP="\$(RESCOMP) Carbon.r -t APPL ${LIBWXMACRES} -o \$(BIN_PROGRAM)"
 | 
			
		||||
    LIBWXMACRESWXCONFIG="${RESCOMP} Carbon.r -t APPL ${LIBWXMACRES} -o"
 | 
			
		||||
fi
 | 
			
		||||
 | 
			
		||||
dnl ------------------------------------------------------------------------
 | 
			
		||||
@@ -4586,6 +4587,7 @@ dnl additional for Mac OS X
 | 
			
		||||
AC_SUBST(DEREZ)
 | 
			
		||||
AC_SUBST(LIBWXMACRES)
 | 
			
		||||
AC_SUBST(LIBWXMACRESCOMP)
 | 
			
		||||
AC_SUBST(LIBWXMACRESWXCONFIG)
 | 
			
		||||
 | 
			
		||||
dnl These seem to be missing
 | 
			
		||||
AC_SUBST(DLLTOOL)
 | 
			
		||||
 
 | 
			
		||||
@@ -12,7 +12,7 @@ usage()
 | 
			
		||||
{
 | 
			
		||||
    cat <<EOF
 | 
			
		||||
Usage: wx-config [--prefix[=DIR]] [--exec-prefix[=DIR]] [--version]
 | 
			
		||||
                 [--libs] [--gl-libs] [--cppflags] [--cflags] [--cxxflags]
 | 
			
		||||
                 [--libs] [--gl-libs] [--cppflags] [--cflags] [--cxxflags] [--rezflags]
 | 
			
		||||
                 [--cc] [--cxx] [--ld]
 | 
			
		||||
 | 
			
		||||
wx-config returns configuration information about the installed
 | 
			
		||||
@@ -76,6 +76,9 @@ while test $# -gt 0; do
 | 
			
		||||
    --cxxflags)
 | 
			
		||||
      echo `cppflags` @CODE_GEN_FLAGS@ @CODE_GEN_FLAGS_CXX@
 | 
			
		||||
      ;;
 | 
			
		||||
    --rezflags)
 | 
			
		||||
      echo @LIBWXMACRESWXCONFIG@
 | 
			
		||||
      ;;
 | 
			
		||||
    --libs)
 | 
			
		||||
      if test "${cross_compiling}" != "yes" \
 | 
			
		||||
              -a @libdir@ != /usr/lib ;
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user