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

Added Rez support to wx-config for MacOS X

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@12004 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robert Roebling
2001-10-15 10:06:24 +00:00
parent c641b1d20d
commit 2baaf735f4
3 changed files with 328 additions and 326 deletions
Download Patch File Download Diff File Expand all files Collapse all files

647
configure vendored
View File

File diff suppressed because it is too large Load Diff

2
configure.in
View File

@@ -2320,6 +2320,7 @@ if test "$wxUSE_MAC" = 1; then
AC_CHECK_PROG(DEREZ, Derez, Derez, /Developer/Tools/Derez) AC_CHECK_PROG(DEREZ, Derez, Derez, /Developer/Tools/Derez)
LIBWXMACRES="\$(top_builddir)/lib/lib${WX_LIBRARY}.r" LIBWXMACRES="\$(top_builddir)/lib/lib${WX_LIBRARY}.r"
LIBWXMACRESCOMP="\$(RESCOMP) Carbon.r -t APPL ${LIBWXMACRES} -o \$(BIN_PROGRAM)" LIBWXMACRESCOMP="\$(RESCOMP) Carbon.r -t APPL ${LIBWXMACRES} -o \$(BIN_PROGRAM)"
LIBWXMACRESWXCONFIG="${RESCOMP} Carbon.r -t APPL ${LIBWXMACRES} -o"
fi fi
dnl ------------------------------------------------------------------------ dnl ------------------------------------------------------------------------
@@ -4586,6 +4587,7 @@ dnl additional for Mac OS X
AC_SUBST(DEREZ) AC_SUBST(DEREZ)
AC_SUBST(LIBWXMACRES) AC_SUBST(LIBWXMACRES)
AC_SUBST(LIBWXMACRESCOMP) AC_SUBST(LIBWXMACRESCOMP)
AC_SUBST(LIBWXMACRESWXCONFIG)
dnl These seem to be missing dnl These seem to be missing
AC_SUBST(DLLTOOL) AC_SUBST(DLLTOOL)

5
wx-config.in
View File

@@ -12,7 +12,7 @@ usage()
{ {
cat <<EOF cat <<EOF
Usage: wx-config [--prefix[=DIR]] [--exec-prefix[=DIR]] [--version] 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] [--cc] [--cxx] [--ld]
wx-config returns configuration information about the installed wx-config returns configuration information about the installed
@@ -76,6 +76,9 @@ while test $# -gt 0; do
--cxxflags) --cxxflags)
echo `cppflags` @CODE_GEN_FLAGS@ @CODE_GEN_FLAGS_CXX@ echo `cppflags` @CODE_GEN_FLAGS@ @CODE_GEN_FLAGS_CXX@
;; ;;
--rezflags)
echo @LIBWXMACRESWXCONFIG@
;;
--libs) --libs)
if test "${cross_compiling}" != "yes" \ if test "${cross_compiling}" != "yes" \
-a @libdir@ != /usr/lib ; -a @libdir@ != /usr/lib ;