remove tests for Mac Rez and SetFile which are also already done by bakefile; restore assignment to RESCOMP which was removed by last commit but which bakefile doesn't set
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@47919 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
parent
ebda9490d0
commit
ecac5b81f8
257
configure
vendored
257
configure
vendored
@ -1,5 +1,5 @@
|
||||
#! /bin/sh
|
||||
# From configure.in Id: configure.in 47822 2007-07-29 19:08:51Z VZ .
|
||||
# From configure.in Id: configure.in 47918 2007-08-07 01:23:34Z VZ .
|
||||
# Guess values for system-dependent variables and create Makefiles.
|
||||
# Generated by GNU Autoconf 2.61 for wxWidgets 2.9.0.
|
||||
#
|
||||
@ -700,9 +700,6 @@ PANGOXFT_CFLAGS
|
||||
PANGOXFT_LIBS
|
||||
CFLAGS_VISIBILITY
|
||||
CXXFLAGS_VISIBILITY
|
||||
REZ
|
||||
DEREZ
|
||||
SETFILE
|
||||
LIBICONV
|
||||
SDL_CONFIG
|
||||
SDL_CFLAGS
|
||||
@ -804,6 +801,8 @@ SONAME_FLAG
|
||||
DEPS_TRACKING
|
||||
BK_DEPS
|
||||
WINDRES
|
||||
REZ
|
||||
SETFILE
|
||||
GCC_PCH
|
||||
ICC_PCH
|
||||
BK_MAKE_PCH
|
||||
@ -976,6 +975,7 @@ COND_WXUSE_LIBTIFF_BUILTIN
|
||||
COND_WXUSE_ODBC_BUILTIN
|
||||
COND_WXUSE_REGEX_BUILTIN
|
||||
COND_WXUSE_ZLIB_BUILTIN
|
||||
DEREZ
|
||||
SHARED
|
||||
WX_LIBRARY_BASENAME_NOGUI
|
||||
WX_LIBRARY_BASENAME_GUI
|
||||
@ -36632,154 +36632,6 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
|
||||
|
||||
fi
|
||||
|
||||
if test "$wxUSE_MAC" = 1 -o "$wxUSE_COCOA" = 1; then
|
||||
WX_RESOURCES_MACOSX_ASCII="libwx_${TOOLCHAIN_NAME}.${wx_release_number}.r"
|
||||
WX_RESOURCES_MACOSX_DATA="libwx_${TOOLCHAIN_NAME}.${wx_release_number}.rsrc"
|
||||
|
||||
LIBWXMACRES="\$(wx_top_builddir)/lib/${WX_RESOURCES_MACOSX_ASCII}"
|
||||
|
||||
# Extract the first word of "Rez", so it can be a program name with args.
|
||||
set dummy Rez; ac_word=$2
|
||||
{ echo "$as_me:$LINENO: checking for $ac_word" >&5
|
||||
echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
|
||||
if test "${ac_cv_prog_REZ+set}" = set; then
|
||||
echo $ECHO_N "(cached) $ECHO_C" >&6
|
||||
else
|
||||
if test -n "$REZ"; then
|
||||
ac_cv_prog_REZ="$REZ" # Let the user override the test.
|
||||
else
|
||||
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
|
||||
for as_dir in $PATH
|
||||
do
|
||||
IFS=$as_save_IFS
|
||||
test -z "$as_dir" && as_dir=.
|
||||
for ac_exec_ext in '' $ac_executable_extensions; do
|
||||
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
|
||||
ac_cv_prog_REZ="Rez"
|
||||
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
|
||||
break 2
|
||||
fi
|
||||
done
|
||||
done
|
||||
IFS=$as_save_IFS
|
||||
|
||||
test -z "$ac_cv_prog_REZ" && ac_cv_prog_REZ="/Developer/Tools/Rez"
|
||||
fi
|
||||
fi
|
||||
REZ=$ac_cv_prog_REZ
|
||||
if test -n "$REZ"; then
|
||||
{ echo "$as_me:$LINENO: result: $REZ" >&5
|
||||
echo "${ECHO_T}$REZ" >&6; }
|
||||
else
|
||||
{ echo "$as_me:$LINENO: result: no" >&5
|
||||
echo "${ECHO_T}no" >&6; }
|
||||
fi
|
||||
|
||||
|
||||
# Extract the first word of "DeRez", so it can be a program name with args.
|
||||
set dummy DeRez; ac_word=$2
|
||||
{ echo "$as_me:$LINENO: checking for $ac_word" >&5
|
||||
echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
|
||||
if test "${ac_cv_prog_DEREZ+set}" = set; then
|
||||
echo $ECHO_N "(cached) $ECHO_C" >&6
|
||||
else
|
||||
if test -n "$DEREZ"; then
|
||||
ac_cv_prog_DEREZ="$DEREZ" # Let the user override the test.
|
||||
else
|
||||
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
|
||||
for as_dir in $PATH
|
||||
do
|
||||
IFS=$as_save_IFS
|
||||
test -z "$as_dir" && as_dir=.
|
||||
for ac_exec_ext in '' $ac_executable_extensions; do
|
||||
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
|
||||
ac_cv_prog_DEREZ="DeRez"
|
||||
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
|
||||
break 2
|
||||
fi
|
||||
done
|
||||
done
|
||||
IFS=$as_save_IFS
|
||||
|
||||
test -z "$ac_cv_prog_DEREZ" && ac_cv_prog_DEREZ="/Developer/Tools/DeRez"
|
||||
fi
|
||||
fi
|
||||
DEREZ=$ac_cv_prog_DEREZ
|
||||
if test -n "$DEREZ"; then
|
||||
{ echo "$as_me:$LINENO: result: $DEREZ" >&5
|
||||
echo "${ECHO_T}$DEREZ" >&6; }
|
||||
else
|
||||
{ echo "$as_me:$LINENO: result: no" >&5
|
||||
echo "${ECHO_T}no" >&6; }
|
||||
fi
|
||||
|
||||
|
||||
# Extract the first word of "SetFile", so it can be a program name with args.
|
||||
set dummy SetFile; ac_word=$2
|
||||
{ echo "$as_me:$LINENO: checking for $ac_word" >&5
|
||||
echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
|
||||
if test "${ac_cv_prog_SETFILE+set}" = set; then
|
||||
echo $ECHO_N "(cached) $ECHO_C" >&6
|
||||
else
|
||||
if test -n "$SETFILE"; then
|
||||
ac_cv_prog_SETFILE="$SETFILE" # Let the user override the test.
|
||||
else
|
||||
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
|
||||
for as_dir in $PATH
|
||||
do
|
||||
IFS=$as_save_IFS
|
||||
test -z "$as_dir" && as_dir=.
|
||||
for ac_exec_ext in '' $ac_executable_extensions; do
|
||||
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
|
||||
ac_cv_prog_SETFILE="SetFile"
|
||||
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
|
||||
break 2
|
||||
fi
|
||||
done
|
||||
done
|
||||
IFS=$as_save_IFS
|
||||
|
||||
test -z "$ac_cv_prog_SETFILE" && ac_cv_prog_SETFILE="/Developer/Tools/SetFile"
|
||||
fi
|
||||
fi
|
||||
SETFILE=$ac_cv_prog_SETFILE
|
||||
if test -n "$SETFILE"; then
|
||||
{ echo "$as_me:$LINENO: result: $SETFILE" >&5
|
||||
echo "${ECHO_T}$SETFILE" >&6; }
|
||||
else
|
||||
{ echo "$as_me:$LINENO: result: no" >&5
|
||||
echo "${ECHO_T}no" >&6; }
|
||||
fi
|
||||
|
||||
|
||||
|
||||
MACSETFILE="\$(SETFILE)"
|
||||
|
||||
if test "$wxUSE_MAC" = 1; then
|
||||
POSTLINK_COMMAND="\$(REZ) -d __DARWIN__ -t APPL Carbon.r -o"
|
||||
RESCOMP="$REZ"
|
||||
WXCONFIG_RESFLAGS="-d __DARWIN__ -t APPL Carbon.r -o"
|
||||
else
|
||||
POSTLINK_COMMAND="cat /dev/null | \$(REZ) -d __DARWIN__ -t APPL ${LIBWXMACRES}"
|
||||
RESCOMP="cat /dev/null \| $REZ"
|
||||
WXCONFIG_RESFLAGS="-d __DARWIN__ -t APPL \$libdir/$WX_RESOURCES_MACOSX_ASCII"
|
||||
fi
|
||||
|
||||
else
|
||||
MACSETFILE="@true"
|
||||
|
||||
if test "$wxUSE_PM" = 1; then
|
||||
RESCOMP="emxbind"
|
||||
WXCONFIG_RESFLAGS="-ep"
|
||||
|
||||
POSTLINK_COMMAND="$RESCOMP $WXCONFIG_RESFLAGS"
|
||||
else
|
||||
POSTLINK_COMMAND="@true"
|
||||
fi
|
||||
|
||||
fi
|
||||
|
||||
|
||||
|
||||
{ echo "$as_me:$LINENO: checking for mode_t" >&5
|
||||
echo $ECHO_N "checking for mode_t... $ECHO_C" >&6; }
|
||||
@ -52793,6 +52645,91 @@ case ${INSTALL} in
|
||||
INSTALL=`pwd`/${INSTALL} ;;
|
||||
esac
|
||||
|
||||
if test "$wxUSE_GUI" = "yes"; then
|
||||
|
||||
if test "$wxUSE_MSW" = 1 ; then
|
||||
if test "x$WINDRES" = "x"; then
|
||||
{ { echo "$as_me:$LINENO: error: Required windres program not found" >&5
|
||||
echo "$as_me: error: Required windres program not found" >&2;}
|
||||
{ (exit 1); exit 1; }; }
|
||||
fi
|
||||
|
||||
RESCOMP="$WINDRES"
|
||||
fi
|
||||
|
||||
if test "$wxUSE_MAC" = 1 -o "$wxUSE_COCOA" = 1; then
|
||||
WX_RESOURCES_MACOSX_ASCII="libwx_${TOOLCHAIN_NAME}.${wx_release_number}.r"
|
||||
WX_RESOURCES_MACOSX_DATA="libwx_${TOOLCHAIN_NAME}.${wx_release_number}.rsrc"
|
||||
|
||||
LIBWXMACRES="\$(wx_top_builddir)/lib/${WX_RESOURCES_MACOSX_ASCII}"
|
||||
|
||||
# Extract the first word of "DeRez", so it can be a program name with args.
|
||||
set dummy DeRez; ac_word=$2
|
||||
{ echo "$as_me:$LINENO: checking for $ac_word" >&5
|
||||
echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
|
||||
if test "${ac_cv_prog_DEREZ+set}" = set; then
|
||||
echo $ECHO_N "(cached) $ECHO_C" >&6
|
||||
else
|
||||
if test -n "$DEREZ"; then
|
||||
ac_cv_prog_DEREZ="$DEREZ" # Let the user override the test.
|
||||
else
|
||||
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
|
||||
for as_dir in $PATH
|
||||
do
|
||||
IFS=$as_save_IFS
|
||||
test -z "$as_dir" && as_dir=.
|
||||
for ac_exec_ext in '' $ac_executable_extensions; do
|
||||
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
|
||||
ac_cv_prog_DEREZ="DeRez"
|
||||
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
|
||||
break 2
|
||||
fi
|
||||
done
|
||||
done
|
||||
IFS=$as_save_IFS
|
||||
|
||||
test -z "$ac_cv_prog_DEREZ" && ac_cv_prog_DEREZ="/Developer/Tools/DeRez"
|
||||
fi
|
||||
fi
|
||||
DEREZ=$ac_cv_prog_DEREZ
|
||||
if test -n "$DEREZ"; then
|
||||
{ echo "$as_me:$LINENO: result: $DEREZ" >&5
|
||||
echo "${ECHO_T}$DEREZ" >&6; }
|
||||
else
|
||||
{ echo "$as_me:$LINENO: result: no" >&5
|
||||
echo "${ECHO_T}no" >&6; }
|
||||
fi
|
||||
|
||||
|
||||
|
||||
MACSETFILE="\$(SETFILE)"
|
||||
|
||||
if test "$wxUSE_MAC" = 1; then
|
||||
POSTLINK_COMMAND="\$(REZ) -d __DARWIN__ -t APPL Carbon.r -o"
|
||||
RESCOMP="$REZ"
|
||||
WXCONFIG_RESFLAGS="-d __DARWIN__ -t APPL Carbon.r -o"
|
||||
else
|
||||
POSTLINK_COMMAND="cat /dev/null | \$(REZ) -d __DARWIN__ -t APPL ${LIBWXMACRES}"
|
||||
RESCOMP="cat /dev/null \| $REZ"
|
||||
WXCONFIG_RESFLAGS="-d __DARWIN__ -t APPL \$libdir/$WX_RESOURCES_MACOSX_ASCII"
|
||||
fi
|
||||
|
||||
else
|
||||
MACSETFILE="@true"
|
||||
|
||||
if test "$wxUSE_PM" = 1; then
|
||||
RESCOMP="emxbind"
|
||||
WXCONFIG_RESFLAGS="-ep"
|
||||
|
||||
POSTLINK_COMMAND="$RESCOMP $WXCONFIG_RESFLAGS"
|
||||
else
|
||||
POSTLINK_COMMAND="@true"
|
||||
fi
|
||||
fi
|
||||
|
||||
fi
|
||||
|
||||
|
||||
if test $GCC_PCH = 1
|
||||
then
|
||||
if test "$wx_cv_gcc_pch_bug" = yes; then
|
||||
@ -53890,9 +53827,6 @@ PANGOXFT_CFLAGS!$PANGOXFT_CFLAGS$ac_delim
|
||||
PANGOXFT_LIBS!$PANGOXFT_LIBS$ac_delim
|
||||
CFLAGS_VISIBILITY!$CFLAGS_VISIBILITY$ac_delim
|
||||
CXXFLAGS_VISIBILITY!$CXXFLAGS_VISIBILITY$ac_delim
|
||||
REZ!$REZ$ac_delim
|
||||
DEREZ!$DEREZ$ac_delim
|
||||
SETFILE!$SETFILE$ac_delim
|
||||
LIBICONV!$LIBICONV$ac_delim
|
||||
SDL_CONFIG!$SDL_CONFIG$ac_delim
|
||||
SDL_CFLAGS!$SDL_CFLAGS$ac_delim
|
||||
@ -53903,6 +53837,9 @@ GNOMEVFS_CFLAGS!$GNOMEVFS_CFLAGS$ac_delim
|
||||
GNOMEVFS_LIBS!$GNOMEVFS_LIBS$ac_delim
|
||||
HILDON_CFLAGS!$HILDON_CFLAGS$ac_delim
|
||||
HILDON_LIBS!$HILDON_LIBS$ac_delim
|
||||
CAIRO_CFLAGS!$CAIRO_CFLAGS$ac_delim
|
||||
CAIRO_LIBS!$CAIRO_LIBS$ac_delim
|
||||
GST_CFLAGS!$GST_CFLAGS$ac_delim
|
||||
_ACEOF
|
||||
|
||||
if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
|
||||
@ -53944,9 +53881,6 @@ _ACEOF
|
||||
ac_delim='%!_!# '
|
||||
for ac_last_try in false false false false false :; do
|
||||
cat >conf$$subs.sed <<_ACEOF
|
||||
CAIRO_CFLAGS!$CAIRO_CFLAGS$ac_delim
|
||||
CAIRO_LIBS!$CAIRO_LIBS$ac_delim
|
||||
GST_CFLAGS!$GST_CFLAGS$ac_delim
|
||||
GST_LIBS!$GST_LIBS$ac_delim
|
||||
ALL_WX_LIBS!$ALL_WX_LIBS$ac_delim
|
||||
BUILT_WX_LIBS!$BUILT_WX_LIBS$ac_delim
|
||||
@ -54035,12 +53969,15 @@ SONAME_FLAG!$SONAME_FLAG$ac_delim
|
||||
DEPS_TRACKING!$DEPS_TRACKING$ac_delim
|
||||
BK_DEPS!$BK_DEPS$ac_delim
|
||||
WINDRES!$WINDRES$ac_delim
|
||||
REZ!$REZ$ac_delim
|
||||
SETFILE!$SETFILE$ac_delim
|
||||
GCC_PCH!$GCC_PCH$ac_delim
|
||||
ICC_PCH!$ICC_PCH$ac_delim
|
||||
BK_MAKE_PCH!$BK_MAKE_PCH$ac_delim
|
||||
COND_BUILD_DEBUG!$COND_BUILD_DEBUG$ac_delim
|
||||
COND_BUILD_DEBUG_DEBUG_FLAG_DEFAULT!$COND_BUILD_DEBUG_DEBUG_FLAG_DEFAULT$ac_delim
|
||||
COND_BUILD_DEBUG_DEBUG_INFO_DEFAULT!$COND_BUILD_DEBUG_DEBUG_INFO_DEFAULT$ac_delim
|
||||
COND_BUILD_DEBUG_UNICODE_0!$COND_BUILD_DEBUG_UNICODE_0$ac_delim
|
||||
_ACEOF
|
||||
|
||||
if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
|
||||
@ -54082,7 +54019,6 @@ _ACEOF
|
||||
ac_delim='%!_!# '
|
||||
for ac_last_try in false false false false false :; do
|
||||
cat >conf$$subs.sed <<_ACEOF
|
||||
COND_BUILD_DEBUG_UNICODE_0!$COND_BUILD_DEBUG_UNICODE_0$ac_delim
|
||||
COND_BUILD_DEBUG_UNICODE_1!$COND_BUILD_DEBUG_UNICODE_1$ac_delim
|
||||
COND_BUILD_RELEASE!$COND_BUILD_RELEASE$ac_delim
|
||||
COND_BUILD_RELEASE_DEBUG_INFO_DEFAULT!$COND_BUILD_RELEASE_DEBUG_INFO_DEFAULT$ac_delim
|
||||
@ -54179,6 +54115,7 @@ COND_SHARED_1_USE_XRC_1!$COND_SHARED_1_USE_XRC_1$ac_delim
|
||||
COND_TOOLKIT_!$COND_TOOLKIT_$ac_delim
|
||||
COND_TOOLKIT_COCOA!$COND_TOOLKIT_COCOA$ac_delim
|
||||
COND_TOOLKIT_COCOA_USE_GUI_1!$COND_TOOLKIT_COCOA_USE_GUI_1$ac_delim
|
||||
COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0!$COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0$ac_delim
|
||||
_ACEOF
|
||||
|
||||
if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
|
||||
@ -54220,7 +54157,6 @@ _ACEOF
|
||||
ac_delim='%!_!# '
|
||||
for ac_last_try in false false false false false :; do
|
||||
cat >conf$$subs.sed <<_ACEOF
|
||||
COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0!$COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0$ac_delim
|
||||
COND_TOOLKIT_DFB!$COND_TOOLKIT_DFB$ac_delim
|
||||
COND_TOOLKIT_DFB_USE_GUI_1!$COND_TOOLKIT_DFB_USE_GUI_1$ac_delim
|
||||
COND_TOOLKIT_GTK!$COND_TOOLKIT_GTK$ac_delim
|
||||
@ -54289,6 +54225,7 @@ COND_WXUSE_LIBTIFF_BUILTIN!$COND_WXUSE_LIBTIFF_BUILTIN$ac_delim
|
||||
COND_WXUSE_ODBC_BUILTIN!$COND_WXUSE_ODBC_BUILTIN$ac_delim
|
||||
COND_WXUSE_REGEX_BUILTIN!$COND_WXUSE_REGEX_BUILTIN$ac_delim
|
||||
COND_WXUSE_ZLIB_BUILTIN!$COND_WXUSE_ZLIB_BUILTIN$ac_delim
|
||||
DEREZ!$DEREZ$ac_delim
|
||||
SHARED!$SHARED$ac_delim
|
||||
WX_LIBRARY_BASENAME_NOGUI!$WX_LIBRARY_BASENAME_NOGUI$ac_delim
|
||||
WX_LIBRARY_BASENAME_GUI!$WX_LIBRARY_BASENAME_GUI$ac_delim
|
||||
|
||||
98
configure.in
98
configure.in
@ -3946,50 +3946,6 @@ dnl to not typedef Point and thus fix the problem.
|
||||
AC_LANG_RESTORE
|
||||
fi
|
||||
|
||||
if test "$wxUSE_MAC" = 1 -o "$wxUSE_COCOA" = 1; then
|
||||
dnl base name of the resource file for wxMac must be the same
|
||||
dnl as library installation base name (-install_name)
|
||||
WX_RESOURCES_MACOSX_ASCII="libwx_${TOOLCHAIN_NAME}.${wx_release_number}.r"
|
||||
WX_RESOURCES_MACOSX_DATA="libwx_${TOOLCHAIN_NAME}.${wx_release_number}.rsrc"
|
||||
|
||||
dnl add the resources target for wxMac
|
||||
LIBWXMACRES="\$(wx_top_builddir)/lib/${WX_RESOURCES_MACOSX_ASCII}"
|
||||
|
||||
AC_CHECK_PROG(REZ, Rez, Rez, /Developer/Tools/Rez)
|
||||
AC_CHECK_PROG(DEREZ, DeRez, DeRez, /Developer/Tools/DeRez)
|
||||
AC_CHECK_PROG(SETFILE, SetFile, SetFile, /Developer/Tools/SetFile)
|
||||
|
||||
MACSETFILE="\$(SETFILE)"
|
||||
|
||||
dnl resources are bundled both with shared library and applications
|
||||
dnl since the carb resource *must* be included in the application
|
||||
if test "$wxUSE_MAC" = 1; then
|
||||
POSTLINK_COMMAND="\$(REZ) -d __DARWIN__ -t APPL Carbon.r -o"
|
||||
RESCOMP="$REZ"
|
||||
WXCONFIG_RESFLAGS="-d __DARWIN__ -t APPL Carbon.r -o"
|
||||
else
|
||||
POSTLINK_COMMAND="cat /dev/null | \$(REZ) -d __DARWIN__ -t APPL ${LIBWXMACRES}"
|
||||
RESCOMP="cat /dev/null \| $REZ"
|
||||
WXCONFIG_RESFLAGS="-d __DARWIN__ -t APPL \$libdir/$WX_RESOURCES_MACOSX_ASCII"
|
||||
fi
|
||||
|
||||
else
|
||||
dnl default value is to (silently) do nothing in the makefile
|
||||
MACSETFILE="@true"
|
||||
|
||||
if test "$wxUSE_PM" = 1; then
|
||||
RESCOMP="emxbind"
|
||||
WXCONFIG_RESFLAGS="-ep"
|
||||
|
||||
dnl Is this one really used anywhere for pm?
|
||||
POSTLINK_COMMAND="$RESCOMP $WXCONFIG_RESFLAGS"
|
||||
else
|
||||
POSTLINK_COMMAND="@true"
|
||||
fi
|
||||
|
||||
fi
|
||||
|
||||
|
||||
dnl ---------------------------------------------------------------------------
|
||||
dnl Checks for typedefs
|
||||
dnl ---------------------------------------------------------------------------
|
||||
@ -7676,6 +7632,60 @@ case ${INSTALL} in
|
||||
INSTALL=`pwd`/${INSTALL} ;;
|
||||
esac
|
||||
|
||||
if test "$wxUSE_GUI" = "yes"; then
|
||||
|
||||
if test "$wxUSE_MSW" = 1 ; then
|
||||
if test "x$WINDRES" = "x"; then
|
||||
AC_MSG_ERROR([Required windres program not found])
|
||||
fi
|
||||
|
||||
RESCOMP="$WINDRES"
|
||||
fi
|
||||
|
||||
if test "$wxUSE_MAC" = 1 -o "$wxUSE_COCOA" = 1; then
|
||||
dnl base name of the resource file for wxMac must be the same
|
||||
dnl as library installation base name (-install_name)
|
||||
WX_RESOURCES_MACOSX_ASCII="libwx_${TOOLCHAIN_NAME}.${wx_release_number}.r"
|
||||
WX_RESOURCES_MACOSX_DATA="libwx_${TOOLCHAIN_NAME}.${wx_release_number}.rsrc"
|
||||
|
||||
dnl add the resources target for wxMac
|
||||
LIBWXMACRES="\$(wx_top_builddir)/lib/${WX_RESOURCES_MACOSX_ASCII}"
|
||||
|
||||
AC_CHECK_PROG(DEREZ, DeRez, DeRez, /Developer/Tools/DeRez)
|
||||
|
||||
MACSETFILE="\$(SETFILE)"
|
||||
|
||||
dnl resources are bundled both with shared library and applications
|
||||
dnl since the carb resource *must* be included in the application
|
||||
if test "$wxUSE_MAC" = 1; then
|
||||
POSTLINK_COMMAND="\$(REZ) -d __DARWIN__ -t APPL Carbon.r -o"
|
||||
RESCOMP="$REZ"
|
||||
WXCONFIG_RESFLAGS="-d __DARWIN__ -t APPL Carbon.r -o"
|
||||
else
|
||||
POSTLINK_COMMAND="cat /dev/null | \$(REZ) -d __DARWIN__ -t APPL ${LIBWXMACRES}"
|
||||
RESCOMP="cat /dev/null \| $REZ"
|
||||
WXCONFIG_RESFLAGS="-d __DARWIN__ -t APPL \$libdir/$WX_RESOURCES_MACOSX_ASCII"
|
||||
fi
|
||||
|
||||
else
|
||||
dnl default value is to (silently) do nothing in the makefile
|
||||
MACSETFILE="@true"
|
||||
|
||||
if test "$wxUSE_PM" = 1; then
|
||||
RESCOMP="emxbind"
|
||||
WXCONFIG_RESFLAGS="-ep"
|
||||
|
||||
dnl Is this one really used anywhere for pm?
|
||||
POSTLINK_COMMAND="$RESCOMP $WXCONFIG_RESFLAGS"
|
||||
else
|
||||
POSTLINK_COMMAND="@true"
|
||||
fi
|
||||
fi
|
||||
|
||||
fi
|
||||
dnl wxUSE_GUI = 1
|
||||
|
||||
|
||||
dnl find out if the compiler supports PCH
|
||||
dnl
|
||||
dnl TODO: this should be in bakefile
|
||||
|
||||
Loading…
Reference in New Issue
Block a user