From a574d9e7e4bcfd4a7fae2a3654e81c9babb46914 Mon Sep 17 00:00:00 2001 From: Matthew Flatt Date: Mon, 31 May 2010 15:18:42 -0600 Subject: [PATCH] C source and build changes to drop wx frm GRacket --- src/configure | 2861 +---------------------------- src/gracket/Makefile.in | 192 +- src/gracket/gc2/Makefile.in | 1313 +------------ src/gracket/grmain.c | 565 ++++++ src/gracket/grmain.cxx | 93 +- src/mac/cw/MrStarter.r | 196 -- src/mac/osx_appl.rkt | 22 - src/racket/cmdline.inc | 13 +- src/racket/configure.ac | 371 +--- src/racket/include/scheme.h | 12 +- src/racket/main.c | 77 +- src/racket/src/error.c | 2 + src/racket/src/port.c | 9 + src/worksp/gc2/make.rkt | 174 +- src/worksp/gracket/gracket.rc | 1 - src/worksp/gracket/gracket.sln | 48 +- src/worksp/gracket/gracket.vcproj | 14 +- 17 files changed, 759 insertions(+), 5204 deletions(-) create mode 100644 src/gracket/grmain.c diff --git a/src/configure b/src/configure index e0f5b99ba1..7de81fd2d3 100755 --- a/src/configure +++ b/src/configure @@ -659,10 +659,6 @@ ac_ct_CC EXEEXT OBJEXT CPP -CXX -CXXFLAGS -ac_ct_CXX -CXXCPP RANLIB PERL XMKMF @@ -709,7 +705,6 @@ INSTALL_ORIG_TREE EXE_SUFFIX MZRT_CGC_FLAGS LIBATOM -GRACKETLINKER LIBSFX WXLIBS WXVARIANT @@ -724,11 +719,6 @@ WXPRECOMP USE_WXPRECOMP INCLUDEDEP WX_MMD_FLAG -JPEG_A -JPEG_INC -ZLIB_A -ZLIB_INC -PNG_A OSKHOME EXTRA_OSK_LIBS FOREIGN_IF_USED @@ -764,15 +754,9 @@ LDFLAGS LIBS CPPFLAGS CPP -CXX -CXXFLAGS -CCC -CXXCPP XMKMF' ac_subdirs_all='racket/gc/libatomic_ops -foreign/libffi -wxcommon/jpeg -wxxt/src/x/wbuild ' +foreign/libffi ' # Initialize some variables set by options. ac_init_help= @@ -1339,12 +1323,6 @@ Optional Features: --enable-FEATURE[=ARG] include FEATURE [ARG=yes] --enable-gracket compile GRacket as well as Racket (enabled by default) --enable-docs build docs on install (enabled by default) - --enable-gl use OpenGL when available (enabled by default) - --enable-xrender use Xrender when available (enabled by default) - --enable-xft use Xft when available (enabled by default) - --enable-cairo use Cairo when available (enabled by default) - --enable-libpng use libpng instead of building (enabled by default) - --enable-libjpeg use libjpeg instead of building (enabled by default) --enable-shared create shared libraries --enable-dynlib same as --enable-shared --enable-lt= use instead of bundled libtool @@ -1393,9 +1371,6 @@ Some influential environment variables: CPPFLAGS C/C++/Objective C preprocessor flags, e.g. -I if you have headers in a nonstandard directory CPP C preprocessor - CXX C++ compiler command - CXXFLAGS C++ compiler flags - CXXCPP C++ preprocessor XMKMF Path to xmkmf, Makefile generator for X Window System Use these variables to override the choices made by `configure' or to help @@ -1831,7 +1806,6 @@ else enable_gracket=yes fi - # Check whether --enable-docs was given. if test "${enable_docs+set}" = set; then enableval=$enable_docs; @@ -1839,38 +1813,6 @@ else enable_docs=yes fi - -# Check whether --enable-gl was given. -if test "${enable_gl+set}" = set; then - enableval=$enable_gl; -fi - -# Check whether --enable-xrender was given. -if test "${enable_xrender+set}" = set; then - enableval=$enable_xrender; -fi - -# Check whether --enable-xft was given. -if test "${enable_xft+set}" = set; then - enableval=$enable_xft; -fi - -# Check whether --enable-cairo was given. -if test "${enable_cairo+set}" = set; then - enableval=$enable_cairo; -fi - -# Check whether --enable-libpng was given. -if test "${enable_libpng+set}" = set; then - enableval=$enable_libpng; -fi - -# Check whether --enable-libjpeg was given. -if test "${enable_libjpeg+set}" = set; then - enableval=$enable_libjpeg; -fi - - # Check whether --enable-shared was given. if test "${enable_shared+set}" = set; then enableval=$enable_shared; @@ -2229,16 +2171,6 @@ if test "${enable_gracket}" = "yes" ; then fi fi -if test "${enable_gracket}" = "no" ; then - enable_wbuild=no - enable_xrender=no - enable_cairo=no - enable_libpng=no - enable_libjpeg=no - enable_gl=no - enable_pthread=no -fi - ###### Tell user what flags we have ####### show_explicitly_disabled() @@ -2263,14 +2195,6 @@ show_explicitly_enabled "${enable_xonx}" "X-on-X" show_explicitly_enabled "${enable_shared}" "Shared libraries" show_explicitly_disabled "${enable_gracket}" GRacket -if test "${enable_gracket}" != "no" ; then - show_explicitly_disabled "${enable_gl}" OpenGL - show_explicitly_disabled "${enable_xrender}" Xrender - show_explicitly_disabled "${enable_xft}" Xft - show_explicitly_disabled "${enable_cairo}" Cairo - show_explicitly_disabled "${enable_libpng}" "Use-existing-libpng" - show_explicitly_disabled "${enable_libjpeg}" "Use-existing-libjpeg" -fi if test "$LIBTOOLPROG" != "" ; then echo "=== Libtool program: $LIBTOOLPROG" @@ -2334,14 +2258,6 @@ MROPTIONS= INCLUDEDEP="#" WX_MMD_FLAG= -JPEG_A='$(JPEG_A)' -JPEG_INC='$(JPEG_INC)' - -ZLIB_A='$(ZLIB_A)' -ZLIB_INC='$(ZLIB_INC)' - -PNG_A='$(PNG_A)' - PREFLAGS="$CPPFLAGS" MZRT_CGC_FLAGS="" LIBATOM="LIBATOM_NONE" @@ -2349,9 +2265,6 @@ LIBATOM="LIBATOM_NONE" ar_libtool_no_undefined="" LIBRACKET_DEP="" -XFT_EXTRA_FLAGS= -XFT_EXTRA_LIBS= - EXE_SUFFIX= MMM=3m @@ -2419,8 +2332,6 @@ COMPFLAGS="" ORIG_CC="${CC}" ORIG_CPP="${CPP}" -ORIG_CXX="${CXX}" -ORIG_CXXCPP="${CXXCPP}" SUB_CONFIGURE_EXTRAS="" if test "${enable_oskit}" = "no" ; then @@ -3567,596 +3478,6 @@ See \`config.log' for more details." >&2;} { (exit 1); exit 1; }; } fi -ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu - - ac_ext=cpp -ac_cpp='$CXXCPP $CPPFLAGS' -ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_cxx_compiler_gnu -if test -z "$CXX"; then - if test -n "$CCC"; then - CXX=$CCC - else - if test -n "$ac_tool_prefix"; then - for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC - do - # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. -set dummy $ac_tool_prefix$ac_prog; 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_CXX+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test -n "$CXX"; then - ac_cv_prog_CXX="$CXX" # 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_CXX="$ac_tool_prefix$ac_prog" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS - -fi -fi -CXX=$ac_cv_prog_CXX -if test -n "$CXX"; then - { echo "$as_me:$LINENO: result: $CXX" >&5 -echo "${ECHO_T}$CXX" >&6; } -else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } -fi - - - test -n "$CXX" && break - done -fi -if test -z "$CXX"; then - ac_ct_CXX=$CXX - for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC -do - # Extract the first word of "$ac_prog", so it can be a program name with args. -set dummy $ac_prog; 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_ac_ct_CXX+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test -n "$ac_ct_CXX"; then - ac_cv_prog_ac_ct_CXX="$ac_ct_CXX" # 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_ac_ct_CXX="$ac_prog" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS - -fi -fi -ac_ct_CXX=$ac_cv_prog_ac_ct_CXX -if test -n "$ac_ct_CXX"; then - { echo "$as_me:$LINENO: result: $ac_ct_CXX" >&5 -echo "${ECHO_T}$ac_ct_CXX" >&6; } -else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } -fi - - - test -n "$ac_ct_CXX" && break -done - - if test "x$ac_ct_CXX" = x; then - CXX="g++" - else - case $cross_compiling:$ac_tool_warned in -yes:) -{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools -whose name does not start with the host triplet. If you think this -configuration is useful to you, please write to autoconf@gnu.org." >&5 -echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools -whose name does not start with the host triplet. If you think this -configuration is useful to you, please write to autoconf@gnu.org." >&2;} -ac_tool_warned=yes ;; -esac - CXX=$ac_ct_CXX - fi -fi - - fi -fi -# Provide some information about the compiler. -echo "$as_me:$LINENO: checking for C++ compiler version" >&5 -ac_compiler=`set X $ac_compile; echo $2` -{ (ac_try="$ac_compiler --version >&5" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compiler --version >&5") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } -{ (ac_try="$ac_compiler -v >&5" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compiler -v >&5") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } -{ (ac_try="$ac_compiler -V >&5" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compiler -V >&5") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } - -{ echo "$as_me:$LINENO: checking whether we are using the GNU C++ compiler" >&5 -echo $ECHO_N "checking whether we are using the GNU C++ compiler... $ECHO_C" >&6; } -if test "${ac_cv_cxx_compiler_gnu+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -int -main () -{ -#ifndef __GNUC__ - choke me -#endif - - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_cxx_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_compiler_gnu=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_compiler_gnu=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -ac_cv_cxx_compiler_gnu=$ac_compiler_gnu - -fi -{ echo "$as_me:$LINENO: result: $ac_cv_cxx_compiler_gnu" >&5 -echo "${ECHO_T}$ac_cv_cxx_compiler_gnu" >&6; } -GXX=`test $ac_compiler_gnu = yes && echo yes` -ac_test_CXXFLAGS=${CXXFLAGS+set} -ac_save_CXXFLAGS=$CXXFLAGS -{ echo "$as_me:$LINENO: checking whether $CXX accepts -g" >&5 -echo $ECHO_N "checking whether $CXX accepts -g... $ECHO_C" >&6; } -if test "${ac_cv_prog_cxx_g+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_save_cxx_werror_flag=$ac_cxx_werror_flag - ac_cxx_werror_flag=yes - ac_cv_prog_cxx_g=no - CXXFLAGS="-g" - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -int -main () -{ - - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_cxx_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_cv_prog_cxx_g=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - CXXFLAGS="" - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -int -main () -{ - - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_cxx_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - : -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cxx_werror_flag=$ac_save_cxx_werror_flag - CXXFLAGS="-g" - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -int -main () -{ - - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_cxx_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_cv_prog_cxx_g=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - ac_cxx_werror_flag=$ac_save_cxx_werror_flag -fi -{ echo "$as_me:$LINENO: result: $ac_cv_prog_cxx_g" >&5 -echo "${ECHO_T}$ac_cv_prog_cxx_g" >&6; } -if test "$ac_test_CXXFLAGS" = set; then - CXXFLAGS=$ac_save_CXXFLAGS -elif test $ac_cv_prog_cxx_g = yes; then - if test "$GXX" = yes; then - CXXFLAGS="-g -O2" - else - CXXFLAGS="-g" - fi -else - if test "$GXX" = yes; then - CXXFLAGS="-O2" - else - CXXFLAGS= - fi -fi -ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu - - ac_ext=cpp -ac_cpp='$CXXCPP $CPPFLAGS' -ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_cxx_compiler_gnu -{ echo "$as_me:$LINENO: checking how to run the C++ preprocessor" >&5 -echo $ECHO_N "checking how to run the C++ preprocessor... $ECHO_C" >&6; } -if test -z "$CXXCPP"; then - if test "${ac_cv_prog_CXXCPP+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - # Double quotes because CXXCPP needs to be expanded - for CXXCPP in "$CXX -E" "/lib/cpp" - do - ac_preproc_ok=false -for ac_cxx_preproc_warn_flag in '' yes -do - # Use a header file that comes with gcc, so configuring glibc - # with a fresh cross-compiler works. - # Prefer to if __STDC__ is defined, since - # exists even on freestanding compilers. - # On the NeXT, cc -E runs the code through the compiler's parser, - # not just through cpp. "Syntax error" is here to catch this case. - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#ifdef __STDC__ -# include -#else -# include -#endif - Syntax error -_ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" || - test ! -s conftest.err - }; then - : -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - # Broken: fails on valid input. -continue -fi - -rm -f conftest.err conftest.$ac_ext - - # OK, works on sane cases. Now check whether nonexistent headers - # can be detected and how. - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include -_ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" || - test ! -s conftest.err - }; then - # Broken: success on invalid input. -continue -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - # Passes both tests. -ac_preproc_ok=: -break -fi - -rm -f conftest.err conftest.$ac_ext - -done -# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. -rm -f conftest.err conftest.$ac_ext -if $ac_preproc_ok; then - break -fi - - done - ac_cv_prog_CXXCPP=$CXXCPP - -fi - CXXCPP=$ac_cv_prog_CXXCPP -else - ac_cv_prog_CXXCPP=$CXXCPP -fi -{ echo "$as_me:$LINENO: result: $CXXCPP" >&5 -echo "${ECHO_T}$CXXCPP" >&6; } -ac_preproc_ok=false -for ac_cxx_preproc_warn_flag in '' yes -do - # Use a header file that comes with gcc, so configuring glibc - # with a fresh cross-compiler works. - # Prefer to if __STDC__ is defined, since - # exists even on freestanding compilers. - # On the NeXT, cc -E runs the code through the compiler's parser, - # not just through cpp. "Syntax error" is here to catch this case. - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#ifdef __STDC__ -# include -#else -# include -#endif - Syntax error -_ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" || - test ! -s conftest.err - }; then - : -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - # Broken: fails on valid input. -continue -fi - -rm -f conftest.err conftest.$ac_ext - - # OK, works on sane cases. Now check whether nonexistent headers - # can be detected and how. - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include -_ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" || - test ! -s conftest.err - }; then - # Broken: success on invalid input. -continue -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - # Passes both tests. -ac_preproc_ok=: -break -fi - -rm -f conftest.err conftest.$ac_ext - -done -# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. -rm -f conftest.err conftest.$ac_ext -if $ac_preproc_ok; then - : -else - { { echo "$as_me:$LINENO: error: C++ preprocessor \"$CXXCPP\" fails sanity check -See \`config.log' for more details." >&5 -echo "$as_me: error: C++ preprocessor \"$CXXCPP\" fails sanity check -See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; } -fi - ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -5821,17 +5142,6 @@ if test "${enable_gcov}" = "yes" ; then PROFFLAGS="$PROFFLAGS -fprofile-arcs -ftest-coverage" fi -if test "${enable_wbuild}" = "yes" ; then - MAKE_WBUILD=wb - WBUILD="x/wbuild/src/wbuild" - WBUILD="$WBUILD --no-init-file --no-lines -i \$(srcdir)/XWidgets" - WBUILD="$WBUILD -c \$(srcdir)/XWidgets -d \$(srcdir)/XWidgets" - WBUILD="$WBUILD -p . \$(srcdir)/x/wbuild/wbuild.cfg" -else - MAKE_WBUILD= - WBUILD="sh \$(PLTSRCDIR)/wxxt/src/XWidgets/dummy.wbuild" -fi - ORIG_CC_FOR_BUILD="${CC_FOR_BUILD}" if test "$CC_FOR_BUILD" = "" ; then CC_FOR_BUILD="$CC" @@ -5844,7 +5154,6 @@ EXTRALIBS= # for gmp assembly: EXTRA_GMP_OBJ= -EXTRA_GMP_DEP= # For Racket targets: OSX=".osx" @@ -5893,24 +5202,16 @@ case $OS in DYN_CFLAGS="-fPIC" GC_THREADS_FLAG="-DGC_LINUX_THREADS" STRIP_DEBUG="strip -S" - # PPC: X11 librares are not found case `$UNAME -m` in #Required for CentOS 4.6 x86_64) enable_futures_by_default=yes CGC_X86_64="1" - if test -d /usr/X11R6/lib64 ; then - X_LIBS="$X_LIBS -L/usr/X11R6/lib64" - fi ;; ppc) - if test -d /usr/X11R6/lib ; then - X_LIBS="$X_LIBS -L/usr/X11R6/lib" - fi ;; alpha) EXTRA_GMP_OBJ="gmp_alpha_gcc.o" - EXTRA_GMP_DEP='$(EXTRA_GMP_DEP_FILE)' ;; i386|i486|i586|i686) enable_futures_by_default=yes @@ -5925,7 +5226,6 @@ case $OS in COMPFLAGS="$COMPFLAGS -ieee_with_inexact -assume noaligned_objects" elif test "$CC" = "gcc" ; then EXTRA_GMP_OBJ="gmp_alpha_gcc.o" - EXTRA_GMP_DEP='$(EXTRA_GMP_DEP_FILE)' fi ;; HP-UX) @@ -5940,9 +5240,6 @@ case $OS in MZOPTIONS="$MZOPTIONS +e" fi LIBS="$LIBS -Wl,-E" - # For Xaw and Xmu: - X_CFLAGS="-I/usr/contrib/X11R6/include/ $X_CFLAGS" - X_LIBS="-L/usr/contrib/X11R6/lib/ $X_LIBS" ;; CYGWIN*) enable_cgcdefault="yes" @@ -5964,6 +5261,7 @@ case $OS in ;; Darwin) + # Check for libraries that X11R6 Xt/Xaw programs need. if test "${enable_sdk}" != "" ; then PREFLAGS="$PREFLAGS -isysroot ${enable_sdk} -mmacosx-version-min=10.4 -DEXTRA_EXCEPTION_STUBS" LDFLAGS="$LDFLAGS -isysroot ${enable_sdk} -mmacosx-version-min=10.4" @@ -6011,7 +5309,6 @@ case $OS in fi else # gcc 3.x - CXXFLAGS="$CXXFLAGS -fno-rtti" if test "${enable_quartz}" = "yes" ; then gcc_vers_three_one=`${CC} -v 2>&1 | grep "version 3[.]1"` if test "$gcc_vers_three_one" = "" ; then @@ -6038,14 +5335,6 @@ case $OS in CPP="${CPP} -m32" SUB_CONFIGURE_EXTRAS="${SUB_CONFIGURE_EXTRAS} CPP="'"'"${CPP}"'"' fi - if test "${ORIG_CXX}" = "" ; then - CXX="${CXX} -m32" - SUB_CONFIGURE_EXTRAS="${SUB_CONFIGURE_EXTRAS} CXX="'"'"${CXX}"'"' - fi - if test "${ORIG_CXXCPP}" = "" ; then - CXXCPP="${CXXCPP} -m32" - SUB_CONFIGURE_EXTRAS="${SUB_CONFIGURE_EXTRAS} CPPCXX="'"'"${CPPCXX}"'"' - fi if test "${ORIG_CC_FOR_BUILD}" = "" ; then CC_FOR_BUILD="${CC_FOR_BUILD} -m32" fi @@ -6080,12 +5369,6 @@ case $OS in fi else PREFLAGS="$PREFLAGS -DXONX " - X_EXTRA_LIBS="$X_EXTRA_LIBS -lz" - X_LIBS="$X_LIBS -L/usr/X11R6/lib" - - # need help finding fontconfig and freetype headers: - XFT_EXTRA_FLAGS="-I/usr/X11R6/include -I/usr/X11R6/include/freetype2" - XFT_EXTRA_LIBS="-lfontconfig" fi ;; *) @@ -9709,871 +8992,11 @@ echo "${ECHO_T}$linker_dash_e" >&6; } fi -############## C++ grunge ################ - -if test "${enable_gracket}" = "yes" ; then - CPPFLAGS="$CPPFLAGS $X_CFLAGS" - ac_ext=cpp -ac_cpp='$CXXCPP $CPPFLAGS' -ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_cxx_compiler_gnu - - - { echo "$as_me:$LINENO: checking whether C++ compiler works" >&5 -echo $ECHO_N "checking whether C++ compiler works... $ECHO_C" >&6; } - -if test "$cross_compiling" = yes; then - cplusplusworks=yes -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -int main() { return 0; } -_ACEOF -rm -f conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - cplusplusworks=yes -else - echo "$as_me: program exited with status $ac_status" >&5 -echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -( exit $ac_status ) -cplusplusworks=no -fi -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext -fi - - - { echo "$as_me:$LINENO: result: $cplusplusworks" >&5 -echo "${ECHO_T}$cplusplusworks" >&6; } - if test "$cplusplusworks" = "no" ; then - MROPTIONS="$MROPTIONS -DOPERATOR_NEW_ARRAY" - echo "***************************************************" - echo configure: C++ compiler/linker ${CXX} does not work - echo "***************************************************" - echo configure aborted - exit 1 - fi - - msg="whether new and new[] are different" - { echo "$as_me:$LINENO: checking $msg" >&5 -echo $ECHO_N "checking $msg... $ECHO_C" >&6; } - if test "$cross_compiling" = yes; then - different=yes -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - #include - inline void *operator new(size_t size) { return (void *)0x1; } - inline void *operator new[](size_t size) { return (void *)0x2; } - class C { int x; }; - int main() { - return (new C) == (new C[10]); - } -_ACEOF -rm -f conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - different=yes -else - echo "$as_me: program exited with status $ac_status" >&5 -echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -( exit $ac_status ) -different=no -fi -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext -fi - - - if test "$different" = "yes" ; then - MROPTIONS="$MROPTIONS -DOPERATOR_NEW_ARRAY" - fi - { echo "$as_me:$LINENO: result: $different" >&5 -echo "${ECHO_T}$different" >&6; } - - if test "$enable_quartz" = "no" ; then - - # If we're using gcc and including X11/Intrinsic doesn't work - # then try adding -fpermissive - if test "$CC" = "gcc" ; then - { echo "$as_me:$LINENO: checking whether need to use -fpermissive" >&5 -echo $ECHO_N "checking whether need to use -fpermissive... $ECHO_C" >&6; } - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include "X11/Intrinsic.h" -int -main () -{ - - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_cxx_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - addperm=no -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - addperm=yes -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - if test "$addperm" = "yes" ; then - CXXFLAGS="$CXXFLAGS -fpermissive" - fi - { echo "$as_me:$LINENO: result: $addperm" >&5 -echo "${ECHO_T}$addperm" >&6; } - fi - - # X11 headers present? - xmissing="" - -if test "${ac_cv_header_X11_Xlib_h+set}" = set; then - { echo "$as_me:$LINENO: checking for X11/Xlib.h" >&5 -echo $ECHO_N "checking for X11/Xlib.h... $ECHO_C" >&6; } -if test "${ac_cv_header_X11_Xlib_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_X11_Xlib_h" >&5 -echo "${ECHO_T}$ac_cv_header_X11_Xlib_h" >&6; } -else - # Is the header compilable? -{ echo "$as_me:$LINENO: checking X11/Xlib.h usability" >&5 -echo $ECHO_N "checking X11/Xlib.h usability... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -#include -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_cxx_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_header_compiler=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_compiler=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6; } - -# Is the header present? -{ echo "$as_me:$LINENO: checking X11/Xlib.h presence" >&5 -echo $ECHO_N "checking X11/Xlib.h presence... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include -_ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" || - test ! -s conftest.err - }; then - ac_header_preproc=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_preproc=no -fi - -rm -f conftest.err conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6; } - -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in - yes:no: ) - { echo "$as_me:$LINENO: WARNING: X11/Xlib.h: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: X11/Xlib.h: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: X11/Xlib.h: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: X11/Xlib.h: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { echo "$as_me:$LINENO: WARNING: X11/Xlib.h: present but cannot be compiled" >&5 -echo "$as_me: WARNING: X11/Xlib.h: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: X11/Xlib.h: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: X11/Xlib.h: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: X11/Xlib.h: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: X11/Xlib.h: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: X11/Xlib.h: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: X11/Xlib.h: section \"Present But Cannot Be Compiled\"" >&2;} - { echo "$as_me:$LINENO: WARNING: X11/Xlib.h: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: X11/Xlib.h: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: X11/Xlib.h: in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: X11/Xlib.h: in the future, the compiler will take precedence" >&2;} - - ;; -esac -{ echo "$as_me:$LINENO: checking for X11/Xlib.h" >&5 -echo $ECHO_N "checking for X11/Xlib.h... $ECHO_C" >&6; } -if test "${ac_cv_header_X11_Xlib_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_cv_header_X11_Xlib_h=$ac_header_preproc -fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_X11_Xlib_h" >&5 -echo "${ECHO_T}$ac_cv_header_X11_Xlib_h" >&6; } - -fi -if test $ac_cv_header_X11_Xlib_h = yes; then - : -else - xmissing="$xmissing X11/Xlib.h" -fi - - - if test "${ac_cv_header_X11_Intrinsic_h+set}" = set; then - { echo "$as_me:$LINENO: checking for X11/Intrinsic.h" >&5 -echo $ECHO_N "checking for X11/Intrinsic.h... $ECHO_C" >&6; } -if test "${ac_cv_header_X11_Intrinsic_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_X11_Intrinsic_h" >&5 -echo "${ECHO_T}$ac_cv_header_X11_Intrinsic_h" >&6; } -else - # Is the header compilable? -{ echo "$as_me:$LINENO: checking X11/Intrinsic.h usability" >&5 -echo $ECHO_N "checking X11/Intrinsic.h usability... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -#include -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_cxx_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_header_compiler=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_compiler=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6; } - -# Is the header present? -{ echo "$as_me:$LINENO: checking X11/Intrinsic.h presence" >&5 -echo $ECHO_N "checking X11/Intrinsic.h presence... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include -_ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" || - test ! -s conftest.err - }; then - ac_header_preproc=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_preproc=no -fi - -rm -f conftest.err conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6; } - -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in - yes:no: ) - { echo "$as_me:$LINENO: WARNING: X11/Intrinsic.h: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: X11/Intrinsic.h: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: X11/Intrinsic.h: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: X11/Intrinsic.h: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { echo "$as_me:$LINENO: WARNING: X11/Intrinsic.h: present but cannot be compiled" >&5 -echo "$as_me: WARNING: X11/Intrinsic.h: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: X11/Intrinsic.h: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: X11/Intrinsic.h: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: X11/Intrinsic.h: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: X11/Intrinsic.h: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: X11/Intrinsic.h: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: X11/Intrinsic.h: section \"Present But Cannot Be Compiled\"" >&2;} - { echo "$as_me:$LINENO: WARNING: X11/Intrinsic.h: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: X11/Intrinsic.h: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: X11/Intrinsic.h: in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: X11/Intrinsic.h: in the future, the compiler will take precedence" >&2;} - - ;; -esac -{ echo "$as_me:$LINENO: checking for X11/Intrinsic.h" >&5 -echo $ECHO_N "checking for X11/Intrinsic.h... $ECHO_C" >&6; } -if test "${ac_cv_header_X11_Intrinsic_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_cv_header_X11_Intrinsic_h=$ac_header_preproc -fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_X11_Intrinsic_h" >&5 -echo "${ECHO_T}$ac_cv_header_X11_Intrinsic_h" >&6; } - -fi -if test $ac_cv_header_X11_Intrinsic_h = yes; then - : -else - xmissing="$xmissing X11/XIntrinsic.h" -fi - - - { echo "$as_me:$LINENO: checking for XFlush in -lX11" >&5 -echo $ECHO_N "checking for XFlush in -lX11... $ECHO_C" >&6; } -if test "${ac_cv_lib_X11_XFlush+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lX11 $X_LIBS $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char XFlush (); -int -main () -{ -return XFlush (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_cxx_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then - ac_cv_lib_X11_XFlush=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_X11_XFlush=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -{ echo "$as_me:$LINENO: result: $ac_cv_lib_X11_XFlush" >&5 -echo "${ECHO_T}$ac_cv_lib_X11_XFlush" >&6; } -if test $ac_cv_lib_X11_XFlush = yes; then - : -else - xmissing="$xmissing libX11" -fi - - { echo "$as_me:$LINENO: checking for XSyncQueryExtension in -lXext" >&5 -echo $ECHO_N "checking for XSyncQueryExtension in -lXext... $ECHO_C" >&6; } -if test "${ac_cv_lib_Xext_XSyncQueryExtension+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lXext $X_LIBS -lX11 $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char XSyncQueryExtension (); -int -main () -{ -return XSyncQueryExtension (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_cxx_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then - ac_cv_lib_Xext_XSyncQueryExtension=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_Xext_XSyncQueryExtension=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -{ echo "$as_me:$LINENO: result: $ac_cv_lib_Xext_XSyncQueryExtension" >&5 -echo "${ECHO_T}$ac_cv_lib_Xext_XSyncQueryExtension" >&6; } -if test $ac_cv_lib_Xext_XSyncQueryExtension = yes; then - : -else - xmissing="$xmissing libXext" -fi - - { echo "$as_me:$LINENO: checking for XtDestroyWidget in -lXt" >&5 -echo $ECHO_N "checking for XtDestroyWidget in -lXt... $ECHO_C" >&6; } -if test "${ac_cv_lib_Xt_XtDestroyWidget+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lXt $X_LIBS -lX11 -lXext $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char XtDestroyWidget (); -int -main () -{ -return XtDestroyWidget (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_cxx_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then - ac_cv_lib_Xt_XtDestroyWidget=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_Xt_XtDestroyWidget=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -{ echo "$as_me:$LINENO: result: $ac_cv_lib_Xt_XtDestroyWidget" >&5 -echo "${ECHO_T}$ac_cv_lib_Xt_XtDestroyWidget" >&6; } -if test $ac_cv_lib_Xt_XtDestroyWidget = yes; then - : -else - xmissing="$xmissing libXt" -fi - - { echo "$as_me:$LINENO: checking for XmuInternAtom in -lXmu" >&5 -echo $ECHO_N "checking for XmuInternAtom in -lXmu... $ECHO_C" >&6; } -if test "${ac_cv_lib_Xmu_XmuInternAtom+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lXmu $X_LIBS -lXt -lX11 -lXext $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char XmuInternAtom (); -int -main () -{ -return XmuInternAtom (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_cxx_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then - ac_cv_lib_Xmu_XmuInternAtom=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_Xmu_XmuInternAtom=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -{ echo "$as_me:$LINENO: result: $ac_cv_lib_Xmu_XmuInternAtom" >&5 -echo "${ECHO_T}$ac_cv_lib_Xmu_XmuInternAtom" >&6; } -if test $ac_cv_lib_Xmu_XmuInternAtom = yes; then - : -else - xmissing="$xmissing libXmu" -fi - - { echo "$as_me:$LINENO: checking for vendorShellClassRec in -lXaw" >&5 -echo $ECHO_N "checking for vendorShellClassRec in -lXaw... $ECHO_C" >&6; } -if test "${ac_cv_lib_Xaw_vendorShellClassRec+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lXaw $X_LIBS -lXmu -lXt -lX11 -lXext $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char vendorShellClassRec (); -int -main () -{ -return vendorShellClassRec (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_cxx_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then - ac_cv_lib_Xaw_vendorShellClassRec=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_Xaw_vendorShellClassRec=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -{ echo "$as_me:$LINENO: result: $ac_cv_lib_Xaw_vendorShellClassRec" >&5 -echo "${ECHO_T}$ac_cv_lib_Xaw_vendorShellClassRec" >&6; } -if test $ac_cv_lib_Xaw_vendorShellClassRec = yes; then - : -else - xmissing="$xmissing libXaw" -fi - - if test "$xmissing" = "" ; then - : - else - echo "******************************************************" - echo "configure: cannot find X11 development files that are" - echo " needed to compile GRacket:" - echo "$xmissing" - echo "******************************************************" - echo configure aborted - exit 1 - fi - - # Can we make auto-repeat detectable? - msg="whether X11/XKBlib.h is available" - { echo "$as_me:$LINENO: checking $msg" >&5 -echo $ECHO_N "checking $msg... $ECHO_C" >&6; } - if test "$cross_compiling" = yes; then - xkbavail=no -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - #include - #include - int main() { - return 0; - } -_ACEOF -rm -f conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - xkbavail=yes -else - echo "$as_me: program exited with status $ac_status" >&5 -echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -( exit $ac_status ) -xkbavail=no -fi -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext -fi - - - if test "$xkbavail" = "no" ; then - MROPTIONS="$MROPTIONS -DNO_XKB_LIB_PRESENT" - fi - { echo "$as_me:$LINENO: result: $xkbavail" >&5 -echo "${ECHO_T}$xkbavail" >&6; } - - fi # non-quartz - -fi - ############## drop optimization flags ################ if test "${enable_noopt}" = "yes" ; then AWKPRG='BEGIN { FS = "(^| )-O(0|1|2|3|4|5|6|7|8|9|())( |$)" } /.*/ { for (i = 1; i < NF; i++) printf "%s ", $i; print $NF }' CFLAGS=`echo "$CFLAGS" | awk "$AWKPRG"` - CXXFLAGS=`echo "$CXXFLAGS" | awk "$AWKPRG"` fi ################### JIT #################### @@ -10625,7 +9048,7 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { - test -z "$ac_cxx_werror_flag" || + test -z "$ac_c_werror_flag" || test ! -s conftest.err } && test -s conftest.$ac_objext; then ac_header_compiler=yes @@ -10664,7 +9087,7 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null && { - test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" || + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || test ! -s conftest.err }; then ac_header_preproc=yes @@ -10680,7 +9103,7 @@ rm -f conftest.err conftest.$ac_ext echo "${ECHO_T}$ac_header_preproc" >&6; } # So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in +case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in yes:no: ) { echo "$as_me:$LINENO: WARNING: GL/glx.h: accepted by the compiler, rejected by the preprocessor!" >&5 echo "$as_me: WARNING: GL/glx.h: accepted by the compiler, rejected by the preprocessor!" >&2;} @@ -10772,7 +9195,7 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { - test -z "$ac_cxx_werror_flag" || + test -z "$ac_c_werror_flag" || test ! -s conftest.err } && test -s conftest$ac_exeext && $as_test_x conftest$ac_exeext; then @@ -10840,7 +9263,7 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { - test -z "$ac_cxx_werror_flag" || + test -z "$ac_c_werror_flag" || test ! -s conftest.err } && test -s conftest$ac_exeext && $as_test_x conftest$ac_exeext; then @@ -10882,1139 +9305,6 @@ if test "${enable_gl}" = "yes" ; then MROPTIONS="$MROPTIONS -DUSE_GL" fi -################ Xrender ################## - -if test "${enable_xrender}" = "" ; then - enable_xrender=yes -fi - -if test "${enable_xrender}" = "yes" ; then - if test "${ac_cv_header_X11_extensions_Xrender_h+set}" = set; then - { echo "$as_me:$LINENO: checking for X11/extensions/Xrender.h" >&5 -echo $ECHO_N "checking for X11/extensions/Xrender.h... $ECHO_C" >&6; } -if test "${ac_cv_header_X11_extensions_Xrender_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_X11_extensions_Xrender_h" >&5 -echo "${ECHO_T}$ac_cv_header_X11_extensions_Xrender_h" >&6; } -else - # Is the header compilable? -{ echo "$as_me:$LINENO: checking X11/extensions/Xrender.h usability" >&5 -echo $ECHO_N "checking X11/extensions/Xrender.h usability... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -#include -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_cxx_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_header_compiler=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_compiler=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6; } - -# Is the header present? -{ echo "$as_me:$LINENO: checking X11/extensions/Xrender.h presence" >&5 -echo $ECHO_N "checking X11/extensions/Xrender.h presence... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include -_ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" || - test ! -s conftest.err - }; then - ac_header_preproc=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_preproc=no -fi - -rm -f conftest.err conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6; } - -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in - yes:no: ) - { echo "$as_me:$LINENO: WARNING: X11/extensions/Xrender.h: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: X11/extensions/Xrender.h: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: X11/extensions/Xrender.h: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: X11/extensions/Xrender.h: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { echo "$as_me:$LINENO: WARNING: X11/extensions/Xrender.h: present but cannot be compiled" >&5 -echo "$as_me: WARNING: X11/extensions/Xrender.h: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: X11/extensions/Xrender.h: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: X11/extensions/Xrender.h: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: X11/extensions/Xrender.h: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: X11/extensions/Xrender.h: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: X11/extensions/Xrender.h: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: X11/extensions/Xrender.h: section \"Present But Cannot Be Compiled\"" >&2;} - { echo "$as_me:$LINENO: WARNING: X11/extensions/Xrender.h: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: X11/extensions/Xrender.h: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: X11/extensions/Xrender.h: in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: X11/extensions/Xrender.h: in the future, the compiler will take precedence" >&2;} - - ;; -esac -{ echo "$as_me:$LINENO: checking for X11/extensions/Xrender.h" >&5 -echo $ECHO_N "checking for X11/extensions/Xrender.h... $ECHO_C" >&6; } -if test "${ac_cv_header_X11_extensions_Xrender_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_cv_header_X11_extensions_Xrender_h=$ac_header_preproc -fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_X11_extensions_Xrender_h" >&5 -echo "${ECHO_T}$ac_cv_header_X11_extensions_Xrender_h" >&6; } - -fi -if test $ac_cv_header_X11_extensions_Xrender_h = yes; then - enable_xrender=yes -else - enable_xrender=no -fi - - - if test "${enable_xrender}" = "yes" ; then - { echo "$as_me:$LINENO: checking for XRenderQueryExtension in -lXrender" >&5 -echo $ECHO_N "checking for XRenderQueryExtension in -lXrender... $ECHO_C" >&6; } -if test "${ac_cv_lib_Xrender_XRenderQueryExtension+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lXrender $X_LIBS -lX11 -lXext -lXrender $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char XRenderQueryExtension (); -int -main () -{ -return XRenderQueryExtension (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_cxx_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then - ac_cv_lib_Xrender_XRenderQueryExtension=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_Xrender_XRenderQueryExtension=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -{ echo "$as_me:$LINENO: result: $ac_cv_lib_Xrender_XRenderQueryExtension" >&5 -echo "${ECHO_T}$ac_cv_lib_Xrender_XRenderQueryExtension" >&6; } -if test $ac_cv_lib_Xrender_XRenderQueryExtension = yes; then - enable_xrender="yes" -else - enable_xrender="no" -fi - - if test "${enable_xrender}" = "yes" ; then - MROPTIONS="$MROPTIONS -DWX_USE_XRENDER" - X_EXTRA_LIBS="$X_EXTRA_LIBS -lXrender" - else - echo "no Xrender libs; Xrender support disabled" - fi - else - echo "no Xrender headers; Xrender support disabled" - fi -fi - -################ Xft ################## - -if test "${enable_xft}" = "" ; then - if test "${enable_xrender}" = "yes" ; then - enable_xft=yes - else - enable_xft=no - fi -fi - -if test "${enable_xft}" = "yes" ; then - xft_config_prog="pkg-config xft" - xft_config_ok=`$xft_config_prog --cflags 2> /dev/null` - if test "$?" != 0 ; then - xft_config_prog="xft-config" - xft_config_ok=`$xft_config_prog --cflags 2> /dev/null` - fi - if test "$?" != 0 ; then - save_cpp_flags="$CPPFLAGS" - CPPFLAGS="$CPPFLAGS $XFT_EXTRA_FLAGS $X_CFLAGS" - if test "${ac_cv_header_X11_Xft_Xft_h+set}" = set; then - { echo "$as_me:$LINENO: checking for X11/Xft/Xft.h" >&5 -echo $ECHO_N "checking for X11/Xft/Xft.h... $ECHO_C" >&6; } -if test "${ac_cv_header_X11_Xft_Xft_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_X11_Xft_Xft_h" >&5 -echo "${ECHO_T}$ac_cv_header_X11_Xft_Xft_h" >&6; } -else - # Is the header compilable? -{ echo "$as_me:$LINENO: checking X11/Xft/Xft.h usability" >&5 -echo $ECHO_N "checking X11/Xft/Xft.h usability... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -#include -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_cxx_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_header_compiler=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_compiler=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6; } - -# Is the header present? -{ echo "$as_me:$LINENO: checking X11/Xft/Xft.h presence" >&5 -echo $ECHO_N "checking X11/Xft/Xft.h presence... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include -_ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" || - test ! -s conftest.err - }; then - ac_header_preproc=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_preproc=no -fi - -rm -f conftest.err conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6; } - -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in - yes:no: ) - { echo "$as_me:$LINENO: WARNING: X11/Xft/Xft.h: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: X11/Xft/Xft.h: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: X11/Xft/Xft.h: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: X11/Xft/Xft.h: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { echo "$as_me:$LINENO: WARNING: X11/Xft/Xft.h: present but cannot be compiled" >&5 -echo "$as_me: WARNING: X11/Xft/Xft.h: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: X11/Xft/Xft.h: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: X11/Xft/Xft.h: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: X11/Xft/Xft.h: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: X11/Xft/Xft.h: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: X11/Xft/Xft.h: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: X11/Xft/Xft.h: section \"Present But Cannot Be Compiled\"" >&2;} - { echo "$as_me:$LINENO: WARNING: X11/Xft/Xft.h: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: X11/Xft/Xft.h: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: X11/Xft/Xft.h: in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: X11/Xft/Xft.h: in the future, the compiler will take precedence" >&2;} - - ;; -esac -{ echo "$as_me:$LINENO: checking for X11/Xft/Xft.h" >&5 -echo $ECHO_N "checking for X11/Xft/Xft.h... $ECHO_C" >&6; } -if test "${ac_cv_header_X11_Xft_Xft_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_cv_header_X11_Xft_Xft_h=$ac_header_preproc -fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_X11_Xft_Xft_h" >&5 -echo "${ECHO_T}$ac_cv_header_X11_Xft_Xft_h" >&6; } - -fi -if test $ac_cv_header_X11_Xft_Xft_h = yes; then - enable_xft=yes -else - enable_xft=no -fi - - - if test "${enable_xft}" = "yes" ; then - { echo "$as_me:$LINENO: checking for XftTextExtents8 in -lXft" >&5 -echo $ECHO_N "checking for XftTextExtents8 in -lXft... $ECHO_C" >&6; } -if test "${ac_cv_lib_Xft_XftTextExtents8+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lXft $X_LIBS -lX11 -lXext -Xrender -lXft $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char XftTextExtents8 (); -int -main () -{ -return XftTextExtents8 (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_cxx_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then - ac_cv_lib_Xft_XftTextExtents8=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_Xft_XftTextExtents8=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -{ echo "$as_me:$LINENO: result: $ac_cv_lib_Xft_XftTextExtents8" >&5 -echo "${ECHO_T}$ac_cv_lib_Xft_XftTextExtents8" >&6; } -if test $ac_cv_lib_Xft_XftTextExtents8 = yes; then - enable_xft="yes" -else - enable_xft="no" -fi - - if test "${enable_xft}" = "yes" ; then - MROPTIONS="$MROPTIONS $XFT_EXTRA_FLAGS -DWX_USE_XFT" - X_EXTRA_LIBS="$X_EXTRA_LIBS $XFT_EXTRA_LIBS -lXft" - else - echo "no Xft libs; Xft support disabled" - fi - else - echo "no Xft headers; Xft support disabled" - fi - CPPFLAGS="$save_cpp_flags" - else - echo "Using $xft_config_prog..." - xft_cflags=`$xft_config_prog --cflags` - xft_libs=`$xft_config_prog --libs` - echo "Xft flags: $xft_cflags" - echo "Xft libs: $xft_libs" - MROPTIONS="$MROPTIONS -DWX_USE_XFT" - X_CFLAGS="$X_CFLAGS $xft_cflags" - X_EXTRA_LIBS="$X_EXTRA_LIBS $xft_libs" - fi -fi - -################ Cairo ################## - -if test "${enable_cairo}" = "" ; then - enable_cairo=yes -fi - -if test "${enable_cairo}" = "yes" ; then - cairo_config_ok=`pkg-config --cflags cairo 2> /dev/null` - if test "$?" != 0 ; then - echo "no information from pkg-config; Cairo support disabled" - else - echo "Using pkg-config for Cairo..." - cairo_cflags=`pkg-config --cflags cairo` - cairo_libs=`pkg-config --libs cairo` - echo "Cairo flags: $cairo_cflags" - echo "Cairo libs: $cairo_libs" - { echo "$as_me:$LINENO: checking for cairo_create in -lcairo" >&5 -echo $ECHO_N "checking for cairo_create in -lcairo... $ECHO_C" >&6; } -if test "${ac_cv_lib_cairo_cairo_create+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lcairo $X_LIBS $X_EXTRA_LIBS $cairo_libs $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char cairo_create (); -int -main () -{ -return cairo_create (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_cxx_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then - ac_cv_lib_cairo_cairo_create=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_cairo_cairo_create=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -{ echo "$as_me:$LINENO: result: $ac_cv_lib_cairo_cairo_create" >&5 -echo "${ECHO_T}$ac_cv_lib_cairo_cairo_create" >&6; } -if test $ac_cv_lib_cairo_cairo_create = yes; then - enable_cairo="yes" -else - enable_xrender="no" -fi - - if test "${enable_cairo}" = "yes" ; then - MROPTIONS="$MROPTIONS -DWX_USE_CAIRO" - X_CFLAGS="$X_CFLAGS $cairo_cflags" - X_EXTRA_LIBS="$X_EXTRA_LIBS $cairo_libs" - - CPPFLAGS="$CPPFLAGS $cairo_cflags" - if test "${ac_cv_header_cairo_xlib_h+set}" = set; then - { echo "$as_me:$LINENO: checking for cairo-xlib.h" >&5 -echo $ECHO_N "checking for cairo-xlib.h... $ECHO_C" >&6; } -if test "${ac_cv_header_cairo_xlib_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_cairo_xlib_h" >&5 -echo "${ECHO_T}$ac_cv_header_cairo_xlib_h" >&6; } -else - # Is the header compilable? -{ echo "$as_me:$LINENO: checking cairo-xlib.h usability" >&5 -echo $ECHO_N "checking cairo-xlib.h usability... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -#include -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_cxx_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_header_compiler=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_compiler=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6; } - -# Is the header present? -{ echo "$as_me:$LINENO: checking cairo-xlib.h presence" >&5 -echo $ECHO_N "checking cairo-xlib.h presence... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include -_ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" || - test ! -s conftest.err - }; then - ac_header_preproc=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_preproc=no -fi - -rm -f conftest.err conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6; } - -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in - yes:no: ) - { echo "$as_me:$LINENO: WARNING: cairo-xlib.h: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: cairo-xlib.h: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: cairo-xlib.h: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: cairo-xlib.h: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { echo "$as_me:$LINENO: WARNING: cairo-xlib.h: present but cannot be compiled" >&5 -echo "$as_me: WARNING: cairo-xlib.h: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: cairo-xlib.h: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: cairo-xlib.h: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: cairo-xlib.h: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: cairo-xlib.h: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: cairo-xlib.h: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: cairo-xlib.h: section \"Present But Cannot Be Compiled\"" >&2;} - { echo "$as_me:$LINENO: WARNING: cairo-xlib.h: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: cairo-xlib.h: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: cairo-xlib.h: in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: cairo-xlib.h: in the future, the compiler will take precedence" >&2;} - - ;; -esac -{ echo "$as_me:$LINENO: checking for cairo-xlib.h" >&5 -echo $ECHO_N "checking for cairo-xlib.h... $ECHO_C" >&6; } -if test "${ac_cv_header_cairo_xlib_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_cv_header_cairo_xlib_h=$ac_header_preproc -fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_cairo_xlib_h" >&5 -echo "${ECHO_T}$ac_cv_header_cairo_xlib_h" >&6; } - -fi -if test $ac_cv_header_cairo_xlib_h = yes; then - havecairoxlib=yes -else - havecairoxlib=no -fi - - - if test "${havecairoxlib}" = "no" ; then - MROPTIONS="$MROPTIONS -DWX_CAIRO_NO_XLIBH" - fi - else - echo "no Cairo libs; Cairo support disabled" - fi - fi -fi - -################ libpng ################## - -if test "${enable_libpng}" = "" ; then - enable_libpng=yes -fi - -if test "${enable_libpng}" = "yes" ; then - if test "${ac_cv_header_png_h+set}" = set; then - { echo "$as_me:$LINENO: checking for png.h" >&5 -echo $ECHO_N "checking for png.h... $ECHO_C" >&6; } -if test "${ac_cv_header_png_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_png_h" >&5 -echo "${ECHO_T}$ac_cv_header_png_h" >&6; } -else - # Is the header compilable? -{ echo "$as_me:$LINENO: checking png.h usability" >&5 -echo $ECHO_N "checking png.h usability... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -#include -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_cxx_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_header_compiler=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_compiler=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6; } - -# Is the header present? -{ echo "$as_me:$LINENO: checking png.h presence" >&5 -echo $ECHO_N "checking png.h presence... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include -_ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" || - test ! -s conftest.err - }; then - ac_header_preproc=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_preproc=no -fi - -rm -f conftest.err conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6; } - -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in - yes:no: ) - { echo "$as_me:$LINENO: WARNING: png.h: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: png.h: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: png.h: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: png.h: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { echo "$as_me:$LINENO: WARNING: png.h: present but cannot be compiled" >&5 -echo "$as_me: WARNING: png.h: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: png.h: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: png.h: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: png.h: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: png.h: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: png.h: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: png.h: section \"Present But Cannot Be Compiled\"" >&2;} - { echo "$as_me:$LINENO: WARNING: png.h: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: png.h: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: png.h: in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: png.h: in the future, the compiler will take precedence" >&2;} - - ;; -esac -{ echo "$as_me:$LINENO: checking for png.h" >&5 -echo $ECHO_N "checking for png.h... $ECHO_C" >&6; } -if test "${ac_cv_header_png_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_cv_header_png_h=$ac_header_preproc -fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_png_h" >&5 -echo "${ECHO_T}$ac_cv_header_png_h" >&6; } - -fi -if test $ac_cv_header_png_h = yes; then - enable_libpng=yes -else - enable_libpng=no -fi - - - if test "${enable_libpng}" = "yes" ; then - { echo "$as_me:$LINENO: checking for png_read_info in -lpng" >&5 -echo $ECHO_N "checking for png_read_info in -lpng... $ECHO_C" >&6; } -if test "${ac_cv_lib_png_png_read_info+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lpng -lpng -lz $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char png_read_info (); -int -main () -{ -return png_read_info (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_cxx_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then - ac_cv_lib_png_png_read_info=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_png_png_read_info=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -{ echo "$as_me:$LINENO: result: $ac_cv_lib_png_png_read_info" >&5 -echo "${ECHO_T}$ac_cv_lib_png_png_read_info" >&6; } -if test $ac_cv_lib_png_png_read_info = yes; then - enable_libpng="yes" -else - enable_libpng="no" -fi - - if test "${enable_libpng}" = "yes" ; then - PNG_A="" - PNG_INC="" - ZLIB_A="" - ZLIB_INC="" - X_EXTRA_LIBS="$X_EXTRA_LIBS -lpng -lz" - MROPTIONS="$MROPTIONS -DWX_USE_LIBPNG" - else - echo "no libpng installed; building static version" - fi - else - echo "no libpng headers installed; building from PLT copy" - fi -fi - -################ libjpeg ################## - -if test "${enable_libjpeg}" = "" ; then - enable_libjpeg=yes -fi - -if test "${enable_libjpeg}" = "yes" ; then - if test "${ac_cv_header_jpeglib_h+set}" = set; then - { echo "$as_me:$LINENO: checking for jpeglib.h" >&5 -echo $ECHO_N "checking for jpeglib.h... $ECHO_C" >&6; } -if test "${ac_cv_header_jpeglib_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_jpeglib_h" >&5 -echo "${ECHO_T}$ac_cv_header_jpeglib_h" >&6; } -else - # Is the header compilable? -{ echo "$as_me:$LINENO: checking jpeglib.h usability" >&5 -echo $ECHO_N "checking jpeglib.h usability... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -#include -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_cxx_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_header_compiler=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_compiler=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6; } - -# Is the header present? -{ echo "$as_me:$LINENO: checking jpeglib.h presence" >&5 -echo $ECHO_N "checking jpeglib.h presence... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include -_ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" || - test ! -s conftest.err - }; then - ac_header_preproc=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_preproc=no -fi - -rm -f conftest.err conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6; } - -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in - yes:no: ) - { echo "$as_me:$LINENO: WARNING: jpeglib.h: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: jpeglib.h: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: jpeglib.h: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: jpeglib.h: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { echo "$as_me:$LINENO: WARNING: jpeglib.h: present but cannot be compiled" >&5 -echo "$as_me: WARNING: jpeglib.h: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: jpeglib.h: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: jpeglib.h: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: jpeglib.h: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: jpeglib.h: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: jpeglib.h: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: jpeglib.h: section \"Present But Cannot Be Compiled\"" >&2;} - { echo "$as_me:$LINENO: WARNING: jpeglib.h: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: jpeglib.h: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: jpeglib.h: in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: jpeglib.h: in the future, the compiler will take precedence" >&2;} - - ;; -esac -{ echo "$as_me:$LINENO: checking for jpeglib.h" >&5 -echo $ECHO_N "checking for jpeglib.h... $ECHO_C" >&6; } -if test "${ac_cv_header_jpeglib_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_cv_header_jpeglib_h=$ac_header_preproc -fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_jpeglib_h" >&5 -echo "${ECHO_T}$ac_cv_header_jpeglib_h" >&6; } - -fi -if test $ac_cv_header_jpeglib_h = yes; then - enable_libjpeg=yes -else - enable_libjpeg=no -fi - - - if test "${enable_libjpeg}" = "yes" ; then - { echo "$as_me:$LINENO: checking for jpeg_start_decompress in -ljpeg" >&5 -echo $ECHO_N "checking for jpeg_start_decompress in -ljpeg... $ECHO_C" >&6; } -if test "${ac_cv_lib_jpeg_jpeg_start_decompress+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-ljpeg -ljpeg $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char jpeg_start_decompress (); -int -main () -{ -return jpeg_start_decompress (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_cxx_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then - ac_cv_lib_jpeg_jpeg_start_decompress=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_jpeg_jpeg_start_decompress=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -{ echo "$as_me:$LINENO: result: $ac_cv_lib_jpeg_jpeg_start_decompress" >&5 -echo "${ECHO_T}$ac_cv_lib_jpeg_jpeg_start_decompress" >&6; } -if test $ac_cv_lib_jpeg_jpeg_start_decompress = yes; then - enable_libjpeg="yes" -else - enable_libjpeg="no" -fi - - if test "${enable_libjpeg}" = "yes" ; then - JPEG_A="" - JPEG_INC="" - X_EXTRA_LIBS="$X_EXTRA_LIBS -ljpeg" - MROPTIONS="$MROPTIONS -DWX_USE_LIBJPEG" - else - echo "no libjpeg installed; building static version" - fi - else - echo "no libjpeg headers installed; building from PLT copy" - fi -fi - - ############## docs ################ if test "${enable_docs}" = "no" ; then @@ -12068,10 +9358,8 @@ if test "${enable_shared}" = "yes" ; then ARFLAGS="" RANLIB=":" MZLINKER="${LIBTOOLPROG} --mode=link --tag=CC $CC${need_gcc_static_libgcc} -rpath ${abslibdir}" - GRACKETLINKER="${LIBTOOLPROG} --mode=link --tag=CXX $CXX${need_gcc_static_libgcc} -rpath ${abslibdir}" PLAIN_CC="$CC" CC="${LIBTOOLPROG} --mode=compile --tag=CC $CC" - CXX="${LIBTOOLPROG} --mode=compile --tag=CXX $CXX" AS="${LIBTOOLPROG} --mode=compile $AS" LIBSFX=la WXLIBS=WXLIBSDYN @@ -12085,7 +9373,6 @@ if test "${enable_shared}" = "yes" ; then MZOPTIONS="$MZOPTIONS -DMZ_USES_SHARED_LIB" else LIBSFX=a - GRACKETLINKER='$(CXX)' WXLIBS=WXLIBSNORM ICP=cp MRLIBINSTALL="install-no-lib" @@ -12187,17 +9474,6 @@ LIBS="$LIBS $EXTRALIBS" - - - - - - - - - - - @@ -12279,108 +9555,9 @@ makefiles="$makefiles foreign/Makefile" ac_configure_args="$ac_configure_args$SUB_CONFIGURE_EXTRAS" if test "${enable_gracket}" = "yes" ; then - if test "${enable_quartz}" = "yes" ; then - mk_needed_dir wxmac - mk_needed_dir wxmac/src - else - mk_needed_dir wxxt - mk_needed_dir wxxt/utils - mk_needed_dir wxxt/utils/image - mk_needed_dir wxxt/contrib - mk_needed_dir wxxt/contrib/xpm - fi - makefiles="$makefiles gracket/Makefile - gracket/wxs/Makefile gracket/gc2/Makefile" - - if test "${enable_libpng}" != "yes" ; then - makefiles="$makefiles - wxcommon/libpng/Makefile wxcommon/zlib/Makefile" - fi - - if test "${enable_quartz}" = "yes" ; then - makefiles="$makefiles - wxmac/src/Makefile" - else - makefiles="$makefiles - wxxt/src/Makefile wxxt/src/x/Makefile - wxxt/utils/image/src/Makefile - wxxt/contrib/xpm/lib/Makefile" - fi - - if test "${enable_libjpeg}" = "no" ; then - ac_aux_dir= -for ac_dir in wxcommon/jpeg "$srcdir"/wxcommon/jpeg ; do - if test -f "$ac_dir/install-sh"; then - ac_aux_dir=$ac_dir - ac_install_sh="$ac_aux_dir/install-sh -c" - break - elif test -f "$ac_dir/install.sh"; then - ac_aux_dir=$ac_dir - ac_install_sh="$ac_aux_dir/install.sh -c" - break - elif test -f "$ac_dir/shtool"; then - ac_aux_dir=$ac_dir - ac_install_sh="$ac_aux_dir/shtool install -c" - break - fi -done -if test -z "$ac_aux_dir"; then - { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in wxcommon/jpeg \"$srcdir\"/wxcommon/jpeg " >&5 -echo "$as_me: error: cannot find install-sh or install.sh in wxcommon/jpeg \"$srcdir\"/wxcommon/jpeg " >&2;} - { (exit 1); exit 1; }; } -fi - -# These three variables are undocumented and unsupported, -# and are intended to be withdrawn in a future Autoconf release. -# They can cause serious problems if a builder's source tree is in a directory -# whose full name contains unusual characters. -ac_config_guess="$SHELL $ac_aux_dir/config.guess" # Please don't use this var. -ac_config_sub="$SHELL $ac_aux_dir/config.sub" # Please don't use this var. -ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var. - - - subdirs="$subdirs wxcommon/jpeg" - - fi -fi - -if test "${enable_wbuild}" = "yes" ; then - ac_aux_dir= -for ac_dir in wxxt/src/x/wbuild "$srcdir"/wxxt/src/x/wbuild ; do - if test -f "$ac_dir/install-sh"; then - ac_aux_dir=$ac_dir - ac_install_sh="$ac_aux_dir/install-sh -c" - break - elif test -f "$ac_dir/install.sh"; then - ac_aux_dir=$ac_dir - ac_install_sh="$ac_aux_dir/install.sh -c" - break - elif test -f "$ac_dir/shtool"; then - ac_aux_dir=$ac_dir - ac_install_sh="$ac_aux_dir/shtool install -c" - break - fi -done -if test -z "$ac_aux_dir"; then - { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in wxxt/src/x/wbuild \"$srcdir\"/wxxt/src/x/wbuild " >&5 -echo "$as_me: error: cannot find install-sh or install.sh in wxxt/src/x/wbuild \"$srcdir\"/wxxt/src/x/wbuild " >&2;} - { (exit 1); exit 1; }; } -fi - -# These three variables are undocumented and unsupported, -# and are intended to be withdrawn in a future Autoconf release. -# They can cause serious problems if a builder's source tree is in a directory -# whose full name contains unusual characters. -ac_config_guess="$SHELL $ac_aux_dir/config.guess" # Please don't use this var. -ac_config_sub="$SHELL $ac_aux_dir/config.sub" # Please don't use this var. -ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var. - - - subdirs="$subdirs wxxt/src/x/wbuild" - fi ac_config_files="$ac_config_files $makefiles" @@ -13045,10 +10222,6 @@ ac_ct_CC!$ac_ct_CC$ac_delim EXEEXT!$EXEEXT$ac_delim OBJEXT!$OBJEXT$ac_delim CPP!$CPP$ac_delim -CXX!$CXX$ac_delim -CXXFLAGS!$CXXFLAGS$ac_delim -ac_ct_CXX!$ac_ct_CXX$ac_delim -CXXCPP!$CXXCPP$ac_delim RANLIB!$RANLIB$ac_delim PERL!$PERL$ac_delim XMKMF!$XMKMF$ac_delim @@ -13095,8 +10268,13 @@ INSTALL_ORIG_TREE!$INSTALL_ORIG_TREE$ac_delim EXE_SUFFIX!$EXE_SUFFIX$ac_delim MZRT_CGC_FLAGS!$MZRT_CGC_FLAGS$ac_delim LIBATOM!$LIBATOM$ac_delim -GRACKETLINKER!$GRACKETLINKER$ac_delim LIBSFX!$LIBSFX$ac_delim +WXLIBS!$WXLIBS$ac_delim +WXVARIANT!$WXVARIANT$ac_delim +ICP!$ICP$ac_delim +MRLIBINSTALL!$MRLIBINSTALL$ac_delim +LIBFINISH!$LIBFINISH$ac_delim +MAKE_GRACKET!$MAKE_GRACKET$ac_delim _ACEOF if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then @@ -13138,12 +10316,6 @@ _ACEOF ac_delim='%!_!# ' for ac_last_try in false false false false false :; do cat >conf$$subs.sed <<_ACEOF -WXLIBS!$WXLIBS$ac_delim -WXVARIANT!$WXVARIANT$ac_delim -ICP!$ICP$ac_delim -MRLIBINSTALL!$MRLIBINSTALL$ac_delim -LIBFINISH!$LIBFINISH$ac_delim -MAKE_GRACKET!$MAKE_GRACKET$ac_delim MAKE_WBUILD!$MAKE_WBUILD$ac_delim MAKE_COPYTREE!$MAKE_COPYTREE$ac_delim MAKE_FINISH!$MAKE_FINISH$ac_delim @@ -13151,11 +10323,6 @@ WXPRECOMP!$WXPRECOMP$ac_delim USE_WXPRECOMP!$USE_WXPRECOMP$ac_delim INCLUDEDEP!$INCLUDEDEP$ac_delim WX_MMD_FLAG!$WX_MMD_FLAG$ac_delim -JPEG_A!$JPEG_A$ac_delim -JPEG_INC!$JPEG_INC$ac_delim -ZLIB_A!$ZLIB_A$ac_delim -ZLIB_INC!$ZLIB_INC$ac_delim -PNG_A!$PNG_A$ac_delim OSKHOME!$OSKHOME$ac_delim EXTRA_OSK_LIBS!$EXTRA_OSK_LIBS$ac_delim FOREIGN_IF_USED!$FOREIGN_IF_USED$ac_delim @@ -13183,7 +10350,7 @@ LIBOBJS!$LIBOBJS$ac_delim LTLIBOBJS!$LTLIBOBJS$ac_delim _ACEOF - if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 43; then + if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 32; then break elif $ac_last_try; then { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 diff --git a/src/gracket/Makefile.in b/src/gracket/Makefile.in index e97b759b69..7d5cd7d6aa 100644 --- a/src/gracket/Makefile.in +++ b/src/gracket/Makefile.in @@ -26,52 +26,28 @@ NOOP = : # Common Macros # ########################### CC = @CC@ -CXX = @CXX@ -LINKER = $(CXX) +LINKER = $(CC) PERL = @PERL@ RANLIB = @RANLIB@ AR = @AR@ ARFLAGS = @ARFLAGS@ OPTIONS = @OPTIONS@ @MROPTIONS@ -XINCLUDE = @X_CFLAGS@ XLIB = @X_LIBS@ -LDLIBS = @X_PRE_LIBS@ -lXaw -lXmu -lXt -lX11 -lXext @X_EXTRA_LIBS@ @LIBS@ +LDLIBS = @LIBS@ GCDIRECTORY = @GCDIR@ WBUILD = @WBUILD@ WXVARIANT = @WXVARIANT@ -WXINC_wx_xt = -I$(PLTSRCDIR)/wxxt/src/AIAI-include -I$(PLTSRCDIR)/wxxt/src -WXINC_wx_mac = -I$(PLTSRCDIR)/wxmac/include/base -I$(PLTSRCDIR)/wxmac/include/mac -I$(PLTSRCDIR)/wxcommon -I$(PLTSRCDIR)/a-list/c-headers/ - -WXINC = $(WXINC_@WXVARIANT@) NOGCINC = $(WXINC) -I$(PLTBUILDDIR)/racket/ -I$(PLTSRCDIR)/racket/include/ INC = -I$(PLTSRCDIR)/racket/$(GCDIRECTORY) $(NOGCINC) -CXXFLAGS = $(INC) $(XINCLUDE) $(OPTIONS) -D$(WXVARIANT) @COMPFLAGS@ @PROFFLAGS@ @CXXFLAGS@ @PREFLAGS@ -CFLAGS = $(INC) $(XINCLUDE) $(OPTIONS) -D$(WXVARIANT) @COMPFLAGS@ @PROFFLAGS@ @CFLAGS@ @PREFLAGS@ -LDFLAGS = @LDFLAGS@ $(XLIB) +CFLAGS = $(INC) $(OPTIONS) -D$(WXVARIANT) @COMPFLAGS@ @PROFFLAGS@ @CFLAGS@ @PREFLAGS@ +LDFLAGS = @LDFLAGS@ ARLIBFLAGS = $(LDFLAGS) $(LDLIBS) ########################### -GRACKETLINKER = @GRACKETLINKER@ +GRACKETLINKER = @MZLINKER@ -JPEG_A = ../wxcommon/jpeg/libjpeg.@LIBSFX@ -JPEG_INC = -I../wxcommon/jpeg -I$(srcdir)/../wxcommon/jpeg -ZLIB_A = ../wxcommon/zlib/libz.@LIBSFX@ -ZLIB_INC = -I$(srcdir)/../wxcommon/zlib -PNG_A = ../wxcommon/libpng/libpng.@LIBSFX@ - -EXTRALDFLAGS_wx_xt = -EXTRALDFLAGS_wx_mac = -framework Carbon -framework Cocoa -framework QuickTime -framework AGL -framework OpenGL -lz -GRACKETLDFLAGS = $(LDFLAGS) $(EXTRALDFLAGS_@WXVARIANT@) -WXLIBS_wx_xt = ../wxxt/src/libwx_xt.@LIBSFX@ ../wxxt/contrib/xpm/lib/libXpm.@LIBSFX@ ../wxxt/utils/image/src/libimage_xt.@LIBSFX@ -GRACKETX_wx_xt = gracketx.@LTO@ -WXLIBS_wx_mac = ../wxmac/src/libwxmac.@LIBSFX@ -GRACKETX_wx_mac = gracketmac.@LTO@ simpledrop.@LTO@ -WXLIBSNORM = gracket.@LTO@ $(GRACKETX_@WXVARIANT@) wxGC.@LTO@ wxJPEG.@LTO@ wxs/libwxscheme.@LIBSFX@ $(WXLIBS_@WXVARIANT@) @JPEG_A@ @PNG_A@ @ZLIB_A@ -WXLIBSDYN = libgracket.@LIBSFX@ -GUILIBS_wx_xt = $(LDLIBS) -GUILIBS_wx_mac = @LIBS@ -GRACKETLDLIBS = ../racket/libracket.@LIBSFX@ ../racket/libmzgc.@LIBSFX@ $(@WXLIBS@) $(GUILIBS_@WXVARIANT@) +GRACKETLDLIBS = ../racket/libracket.@LIBSFX@ ../racket/libmzgc.@LIBSFX@ $(LDLIBS) LOCALFLAGS_wx_xt = @WX_MMD_FLAG@ LOCALFLAGS_wx_mac = -I$(srcdir)/../mac/racket -MMD -DWX_CARBON @@ -80,18 +56,12 @@ LOCALFLAGS = $(LOCALFLAGS_@WXVARIANT@) GRACKETOBJECTS = grmain.@LTO@ RACKETDEPS = ../racket/libracket.@LIBSFX@ ../racket/libmzgc.@LIBSFX@ -WXSCHEME = wxs/libwxscheme.@LIBSFX@ INSTALLDEST=/home/scheme/plt MRSTATIC = MRSTATIC_STUB = -WXINCDEP_wx_xt = $(WXDIR)/src/Windows/Window.h $(WXDIR)/src/Windows/Frame.h \ - $(WXDIR)/src/DataStructures/Object.h -WXINCDEP_wx_mac = -WXINCDEP = $(WXINCDEP_@WXVARIANT@) - MZEXTRAEXPORT='GCDIR=$(GCDIRECTORY)' LINKRESULT_wx_xt = gracket@CGC@ @@ -102,46 +72,27 @@ bin: $(MAKE) @MAIN_VARIANT@ 3m: - $(MAKE) ext-libs - $(MAKE) @WXVARIANT@-min - cd wxs; $(MAKE) ccsources - cd gc2; $(MAKE) gen-deps cd gc2; $(MAKE) 3m cgc: - $(MAKE) ext-libs - $(MAKE) @WXVARIANT@ - cd wxs; $(MAKE) $(MAKE) $(LINKRESULT) both: $(MAKE) cgc $(MAKE) 3m -ext-libs: @JPEG_A@ @PNG_A@ @ZLIB_A@ - $(NOOP) - -gracket@CGC@ : $(RACKETDEPS) grmain.@LTO@ $(GRACKETOBJECTS) $(@WXLIBS@) $(MRSTATIC_STUB) +gracket@CGC@ : $(RACKETDEPS) grmain.@LTO@ $(GRACKETOBJECTS) $(MRSTATIC_STUB) $(GRACKETLINKER) $(GRACKETLDFLAGS) $(MRSTATIC) -o gracket@CGC@ $(GRACKETOBJECTS) $(GRACKETLDLIBS) $(MRSTATIC_STUB) -libgracket.@LIBSFX@: $(WXLIBSNORM) - $(AR) $(ARFLAGS) libgracket.@LIBSFX@ $(WXLIBSNORM) @LIBGRACKET_DEP@ +MRFW = Racket.framework/Versions/$(FWVERSION)/Racket +MRAPPSKEL = GRacket@CGC@.app/Contents/MacOS -MRFW = GRacket.framework/Versions/$(FWVERSION)/GRacket -MRFWRES = GRacket.framework/Versions/$(FWVERSION)/Resources/GRacket.rsrc +GRacket@CGC@.app/Contents/MacOS/GRacket@CGC@: $(MZFW) $(MRAPPSKEL) grmain.@LTO@ + $(GRACKETLINKER) $(GRACKETLDFLAGS) -o GRacket@CGC@.app/Contents/MacOS/GRacket@CGC@ grmain.@LTO@ -Wl,-headerpad_max_install_names -F../racket -framework Racket -framework CoreFoundation @PROFFLAGS@ + /usr/bin/install_name_tool -change "Racket.framework/Versions/$(FWVERSION)/Racket" "@executable_path/../../../../racket/Racket.framework/Versions/$(FWVERSION)/Racket" GRacket@CGC@.app/Contents/MacOS/GRacket@CGC@ -$(MRFW) : $(RACKETDEPS) $(GRACKETOBJECTS) $(@WXLIBS@) $(MRSTATIC_STUB) $(MRFWRES) - $(GRACKETLINKER) $(GRACKETLDFLAGS) -dynamiclib -o $(MRFW) -Wl,-headerpad_max_install_names ../racket/libracket.@LIBSFX@ ../racket/libmzgc.@LIBSFX@ $(@WXLIBS@) $(GUILIBS_@WXVARIANT@) @X_EXTRA_LIBS@ - -GRacket@CGC@.app/Contents/MacOS/GRacket@CGC@: $(MRFWRES) $(MRFW) grmain.@LTO@ - $(GRACKETLINKER) $(GRACKETLDFLAGS) -o GRacket@CGC@.app/Contents/MacOS/GRacket@CGC@ grmain.@LTO@ -Wl,-headerpad_max_install_names -F. -framework GRacket -framework Carbon -framework Cocoa @PROFFLAGS@ - /usr/bin/install_name_tool -change "GRacket.framework/Versions/$(FWVERSION)/GRacket" "@executable_path/../../../GRacket.framework/Versions/$(FWVERSION)/GRacket" GRacket@CGC@.app/Contents/MacOS/GRacket@CGC@ - -$(MRFWRES): $(srcdir)/../mac/osx_appl.rkt $(srcdir)/../mac/cw/GRacket.r - rm -rf GRacket.framework/Resources GRacket.framework/GRacket +$(MRAPPSKEL): $(srcdir)/../mac/osx_appl.rkt env BUILDBASE=.. ../racket/racket@CGC@ -cqu $(srcdir)/../mac/osx_appl.rkt $(srcdir)/.. "@CGC@" - ln -s Versions/$(FWVERSION)/GRacket GRacket.framework/GRacket - ln -s Versions/$(FWVERSION)/Resources GRacket.framework/Resources RACKET = ../racket/racket@CGC@ @@ -157,99 +108,23 @@ solaris-static: linux-static: $(MAKE) gracket MRSTATIC=--static LDNONSTATICLIBS='-ldl' -wx_xt: - cd ../wxxt/src/x; $(MAKE) - -wx_xt-min: - cd ../wxxt/src/x; $(MAKE) min - -wx_mac: - cd ../wxmac/src; $(MAKE) - -wx_mac-min: - cd ../wxmac/src; $(MAKE) min - -gracket.@LTO@ : $(srcdir)/gracket.cxx \ - $(srcdir)/wxs/wxscheme.h $(srcdir)/gracket.h \ - $(srcdir)/../racket/include/scheme.h \ - $(srcdir)/wxs/wxsgracket.h $(WXINCDEP) $(srcdir)/../wxcommon/wxGC.h \ - $(srcdir)/../wxcommon/wx_list.h - $(CXX) $(LOCALFLAGS) $(CXXFLAGS) -c $(srcdir)/gracket.cxx -o gracket.@LTO@ - DEF_COLLECTS_DIR = -DINITIAL_COLLECTS_DIRECTORY='"'"`cd $(srcdir)/../../collects; pwd`"'"' -grmain.@LTO@ : $(srcdir)/grmain.cxx $(srcdir)/gracket.h $(srcdir)/wxs/wxsgracket.h \ +grmain.@LTO@ : $(srcdir)/grmain.c $(srcdir)/../racket/main.c \ $(srcdir)/../racket/cmdline.inc $(srcdir)/../racket/src/stypes.h \ $(srcdir)/../racket/include/scheme.h - $(CXX) $(LOCALFLAGS) $(CXXFLAGS) $(DEF_COLLECTS_DIR) -c $(srcdir)/grmain.cxx -o grmain.@LTO@ + $(CC) $(LOCALFLAGS) $(CFLAGS) $(DEF_COLLECTS_DIR) -c $(srcdir)/grmain.c -o grmain.@LTO@ grmain_ee.@LTO@ : gracket.@LTO@ - $(CXX) $(LOCALFLAGS) $(CXXFLAGS) -DSTANDALONE_WITH_EMBEDDED_EXTENSION $(DEF_COLLECTS_DIR) -c $(srcdir)/grmain.cxx -o grmain_ee.@LTO@ + $(CC) $(LOCALFLAGS) $(CFLAGS) -DSTANDALONE_WITH_EMBEDDED_EXTENSION $(DEF_COLLECTS_DIR) -c $(srcdir)/grmain.cxx -o grmain_ee.@LTO@ ee-main: $(MAKE) grmain_ee.@LTO@ -gracketx.@LTO@ : $(srcdir)/gracketx.cxx $(srcdir)/../racket/include/scheme.h $(srcdir)/gracket.h \ - $(WXINCDEP) \ - $(srcdir)/../wxcommon/wxGC.h $(srcdir)/../wxcommon/wx_list.h \ - $(srcdir)/../racket/src/stypes.h - $(CXX) $(LOCALFLAGS) $(CXXFLAGS) -c $(srcdir)/gracketx.cxx -o gracketx.@LTO@ - -gracketmac.@LTO@ : $(srcdir)/gracketmac.cxx $(srcdir)/../racket/include/scheme.h $(srcdir)/gracket.h \ - $(srcdir)/../wxcommon/wxGC.h $(srcdir)/../wxcommon/wx_list.h \ - $(srcdir)/../racket/src/stypes.h - $(CXX) $(LOCALFLAGS) $(CXXFLAGS) -c $(srcdir)/gracketmac.cxx -o gracketmac.@LTO@ - -wxGC.@LTO@ : $(srcdir)/../wxcommon/wxGC.cxx $(srcdir)/../wxcommon/wxGC.h \ - $(srcdir)/../racket/src/stypes.h - $(CXX) $(LOCALFLAGS) $(CXXFLAGS) -c $(srcdir)/../wxcommon/wxGC.cxx -o wxGC.@LTO@ - -wxJPEG.@LTO@ : $(srcdir)/../wxcommon/wxJPEG.cxx $(srcdir)/../wxcommon/wxGC.h - $(CXX) $(LOCALFLAGS) $(CXXFLAGS) @JPEG_INC@ @ZLIB_INC@ -c $(srcdir)/../wxcommon/wxJPEG.cxx -o wxJPEG.@LTO@ - -dl_stub.@LTO@: $(srcdir)/misc/dl_stub.c - $(CC) $(CFLAGS) $(LOCALFLAGS) -c $(srcdir)/misc/dl_stub.c -o dl_stub.@LTO@ - -simpledrop.@LTO@ : $(srcdir)/../mac/racket/simpledrop.cpp - $(CXX) $(LOCALFLAGS) $(CXXFLAGS) -o simpledrop.@LTO@ -c $(srcdir)/../mac/racket/simpledrop.cpp - -sgilinkhack.@LTO@: - $(CXX) $(LOCALFLAGS) $(CXXFLAGS) -c $(srcdir)/misc/sgilinkhack.cxx -o sgilinkhack.@LTO@ - -$(WXDIR)/libwx_xt.@LIBSFX@: - $(MAKE) wx - -../wxcommon/jpeg/libjpeg.@LIBSFX@: - cd ../wxcommon/jpeg; $(MAKE) libjpeg.@LIBSFX@ CC="$(CC)" AR="@STATIC_AR@ $(ARFLAGS)" AR2="$(RANLIB)" - -../wxcommon/libpng/libpng.@LIBSFX@: - cd ../wxcommon/libpng; $(MAKE) libpng.@LIBSFX@ - -../wxcommon/zlib/libz.@LIBSFX@: - cd ../wxcommon/zlib; $(MAKE) libz.@LIBSFX@ - -CLEANDIR_wx_xt = ../wxxt/src/x -CLEANDIR_wx_mac = ../wxmac/src - clean: - cd $(CLEANDIR_@WXVARIANT@); $(MAKE) clean rm -f *.@LTO@ *.d core gracket gracket3m rm -f gc2/*.@LTO@ gc2/xsrc/* gc2/macxsrc/* gc2/*.d gc2/*.dd rm -rf gc2/xform-collects - cd wxs; $(MAKE) clean - if [ -f ../wxcommon/jpeg/Makefile ] ; then cd ../wxcommon/jpeg; $(MAKE) clean ; fi - if [ -f ../wxcommon/libpng/Makefile ] ; then cd ../wxcommon/libpng; $(MAKE) clean ; fi - if [ -f ../wxcommon/zlib/Makefile ] ; then cd ../wxcommon/zlib; $(MAKE) clean ; fi - rm -f $(WXLIBS_@WXVARIANT@) - $(MAKE) clean_@WXVARIANT@ - -clean_wx_xt: - echo clean done - -clean_wx_mac: - rm -rf GRacket.framework GRacket@CGC@.app Starter.app GRacket@MMM@.app GRacket.rsrc.OSX - rm -rf gc2/GRacket.framework gc2/GRacket.rsrc.OSX gc2/*.pfe gc2/macxsrc/* - echo clean done ICP=@ICP@ BUILDINFO="$(DESTDIR)$(libpltdir)/buildinfo" @@ -282,11 +157,7 @@ install-post-collects: install-common: cd ..; rm -f "$(DESTDIR)$(bindir)/gracket@CGC_INSTALLED@" cd ..; rm -f "$(DESTDIR)$(bindir)/gracket@MMM_INSTALLED@" - cd ..; echo 'CXX=@CXX@' >> $(BUILDINFO) - cd ..; echo 'CXXFLAGS=@CXXFLAGS@ @PREFLAGS@ @COMPFLAGS@' >> $(BUILDINFO) cd ..; echo 'MROPTIONS=@MROPTIONS@' >> $(BUILDINFO) - cd ..; echo 'X_CFLAGS=@X_CFLAGS@' >> $(BUILDINFO) - cd ..; echo 'X_LIB=@X_LIBS@' >> $(BUILDINFO) cd ..; echo "MRLIBS=$(GUILIBS_@WXVARIANT@)" >> $(BUILDINFO) cd ..; echo "MRLDFLAGS=$(GRACKETLDFLAGS)" >> $(BUILDINFO) @@ -300,7 +171,7 @@ install-no-lib-cgc-wx_xt: echo "no dynamic libs" install-lib-cgc-wx_xt: - cd ..; $(ICP) gracket/libgracket.@LIBSFX@ "$(DESTDIR)$(libdir)" + $(NOOP) install-wx_xt-cgc: $(MAKE) @MRLIBINSTALL@-cgc-wx_xt @@ -314,7 +185,7 @@ install-no-lib-3m-wx_xt: echo "no dynamic libs" install-lib-3m-wx_xt: - cd ..; $(ICP) gracket/libgracket3m.@LIBSFX@ "$(DESTDIR)$(libdir)" + $(NOOP) install-wx_xt-3m: $(MAKE) @MRLIBINSTALL@-3m-wx_xt @@ -329,46 +200,31 @@ install-wx_xt-post-collects: # Mac OS X ---------------------------------------- -MRFWDIR = @FRAMEWORK_INSTALL_DIR@/GRacket.framework FRAMEWORK_REL_PREFIX="@executable_path/../../../lib/" install-wx_mac: - rm -rf $(MRFWDIR)/Versions/$(FWVERSION) - rm -rf $(MRFWDIR)/Versions/$(FWVERSION)_3m - rm -f $(MRFWDIR)/GRacket - rm -rf $(MRFWDIR)/Resources cd ..; rm -rf "$(prefix)/GRacket@CGC_CAP_INSTALLED@.app" cd ..; rm -rf "$(prefix)/GRacket@MMM_CAP_INSTALLED@.app" - if [ @FRAMEWORK_REL_INSTALL@ = yes ] ; then rm -rf $(MRFWDIR) ; fi - mkdir -p "@FRAMEWORK_INSTALL_DIR@" install-wx_mac-cgc: - mkdir -p "$(MRFWDIR)/Versions/$(FWVERSION)" cd ..; $(ICP) -r gracket/GRacket@CGC@.app "$(prefix)/GRacket@CGC_CAP_INSTALLED@.app" $(RACKET) -cqu "$(srcdir)/../mac/rename-app.rkt" "$(prefix)/GRacket@CGC_CAP_INSTALLED@.app" "GRacket@CGC@" "GRacket@CGC_CAP_INSTALLED@" - $(ICP) GRacket.framework/Versions/$(FWVERSION)/GRacket $(MRFWDIR)/Versions/$(FWVERSION)/GRacket - $(ICP) -r GRacket.framework/Versions/$(FWVERSION)/Resources $(MRFWDIR)/Versions/$(FWVERSION)/Resources - /usr/bin/install_name_tool -change "@executable_path/../../../GRacket.framework/Versions/$(FWVERSION)/GRacket" "@FRAMEWORK_PREFIX@GRacket.framework/Versions/$(FWVERSION)/GRacket" "$(prefix)/GRacket@CGC_CAP_INSTALLED@.app/Contents/MacOS/GRacket@CGC_CAP_INSTALLED@" + /usr/bin/install_name_tool -change "@executable_path/../../../Racket.framework/Versions/$(FWVERSION)/Racket" "@FRAMEWORK_PREFIX@Racket.framework/Versions/$(FWVERSION)/Racket" "$(prefix)/GRacket@CGC_CAP_INSTALLED@.app/Contents/MacOS/GRacket@CGC_CAP_INSTALLED@" $(RACKET) -cu "$(srcdir)/../racket/collects-path.rkt" "$(prefix)/GRacket@CGC_CAP_INSTALLED@.app/Contents/MacOS/GRacket@CGC_CAP_INSTALLED@" ../../../collects @STRIP_DEBUG@ "$(prefix)/GRacket@CGC_CAP_INSTALLED@.app/Contents/MacOS/GRacket@CGC_CAP_INSTALLED@" install-wx_mac-cgc-final: - ln -s Versions/$(FWVERSION)/GRacket $(MRFWDIR)/ - ln -s Versions/$(FWVERSION)/Resources $(MRFWDIR)/ + $(NOOP) install-wx_mac-3m: - mkdir -p "$(MRFWDIR)/Versions/$(FWVERSION)_3m" cd ..; $(ICP) -r "gracket/GRacket@MMM@.app" "$(prefix)/GRacket@MMM_CAP_INSTALLED@.app" $(RACKET) -cqu "$(srcdir)/../mac/rename-app.rkt" "$(prefix)/GRacket@MMM_CAP_INSTALLED@.app" "GRacket@MMM@" "GRacket@MMM_CAP_INSTALLED@" - $(ICP) "GRacket.framework/Versions/$(FWVERSION)_3m/GRacket" "$(MRFWDIR)/Versions/$(FWVERSION)_3m/GRacket" - $(ICP) -r "GRacket.framework/Versions/$(FWVERSION)_3m/Resources" "$(MRFWDIR)/Versions/$(FWVERSION)_3m/Resources" - /usr/bin/install_name_tool -change "@executable_path/../../../GRacket.framework/Versions/$(FWVERSION)_3m/GRacket" "@FRAMEWORK_PREFIX@GRacket.framework/Versions/$(FWVERSION)_3m/GRacket" "$(prefix)/GRacket@MMM_CAP_INSTALLED@.app/Contents/MacOS/GRacket@MMM_CAP_INSTALLED@" + /usr/bin/install_name_tool -change "@executable_path/../../../Racket.framework/Versions/$(FWVERSION)_3m/Racket" "@FRAMEWORK_PREFIX@Racket.framework/Versions/$(FWVERSION)_3m/Racket" "$(prefix)/GRacket@MMM_CAP_INSTALLED@.app/Contents/MacOS/GRacket@MMM_CAP_INSTALLED@" $(RACKET) -cu "$(srcdir)/../racket/collects-path.rkt" "$(prefix)/GRacket@MMM_CAP_INSTALLED@.app/Contents/MacOS/GRacket@MMM_CAP_INSTALLED@" "../../../collects" @STRIP_DEBUG@ "$(prefix)/GRacket@MMM_CAP_INSTALLED@.app/Contents/MacOS/GRacket@MMM_CAP_INSTALLED@" install-wx_mac-3m-final: - ln -s Versions/$(FWVERSION)_3m/GRacket $(MRFWDIR)/ - ln -s Versions/$(FWVERSION)_3m/Resources $(MRFWDIR)/ + $(NOOP) install-wx_mac-post-collects: cd ..; rm -rf $(collectsdir)/launcher/Starter.app @@ -376,8 +232,4 @@ install-wx_mac-post-collects: cd ..; $(ICP) -r gracket/Starter.app $(collectsdir)/launcher/. -@INCLUDEDEP@ wxGC.d -@INCLUDEDEP@ wxJPEG.d -@INCLUDEDEP@ gracket.d -@INCLUDEDEP@ gracketmac.d @INCLUDEDEP@ grmain.d diff --git a/src/gracket/gc2/Makefile.in b/src/gracket/gc2/Makefile.in index 2a8586aeda..bec86c8382 100644 --- a/src/gracket/gc2/Makefile.in +++ b/src/gracket/gc2/Makefile.in @@ -12,9 +12,6 @@ collectsdir = @collectsdir@ mainsrcdir = @srcdir@/../.. @INCLUDEDEP@ @srcdir@/../../racket/version.mak -WXDIR = $(srcdir)/../../wxxt -WXMACDIR = $(srcdir)/../../wxmac/src - PLTSRCDIR = $(srcdir)/../.. PLTBUILDDIR = $(builddir)/../.. @@ -22,1127 +19,67 @@ PLTBUILDDIR = $(builddir)/../.. # Common Macros # ########################### CC = @CC@ -CXX = @CXX@ -LINKER = $(CXX) +LINKER = $(CC) PERL = @PERL@ RANLIB = @RANLIB@ -NICEAR = $(PLTSRCDIR)/utils/nicear AR = @AR@ ARFLAGS = @ARFLAGS@ OPTIONS = @OPTIONS@ @GC2OPTIONS@ @MROPTIONS@ XINCLUDE = @X_CFLAGS@ -XLIB = @X_LIBS@ -LDLIBS = @X_PRE_LIBS@ -lXaw -lXmu -lXt -lX11 -lXext @X_EXTRA_LIBS@ @LIBS@ +LDLIBS = @LIBS@ GCDIRECTORY = @GCDIR@ WBUILD = @WBUILD@ WXVARIANT = @WXVARIANT@ -WXINC_wx_xt = -I$(PLTSRCDIR)/wxxt/src/AIAI-include -I$(PLTSRCDIR)/wxxt/src -WXINC_wx_mac = -I$(PLTSRCDIR)/wxmac/include/base -I$(PLTSRCDIR)/wxmac/include/mac -I$(PLTSRCDIR)/wxcommon -I$(PLTSRCDIR)/a-list/c-headers/ - -WXINC = $(WXINC_@WXVARIANT@) -NOGCINC = $(WXINC) -I$(PLTBUILDDIR)/racket/ -I$(PLTSRCDIR)/racket/include/ +NOGCINC = -I$(PLTBUILDDIR)/racket/ -I$(PLTSRCDIR)/racket/include/ INC = -I$(PLTSRCDIR)/racket/$(GCDIRECTORY) $(NOGCINC) -CXXFLAGS = $(INC) $(XINCLUDE) $(OPTIONS) -D$(WXVARIANT) @COMPFLAGS@ @PROFFLAGS@ @CXXFLAGS@ @PREFLAGS@ -CFLAGS = $(INC) $(XINCLUDE) $(OPTIONS) -D$(WXVARIANT) @COMPFLAGS@ @PROFFLAGS@ @CFLAGS@ @PREFLAGS@ -LDFLAGS = @LDFLAGS@ $(XLIB) +CFLAGS = $(INC) $(OPTIONS) -D$(WXVARIANT) @COMPFLAGS@ @PROFFLAGS@ @CFLAGS@ @PREFLAGS@ +LDFLAGS = @LDFLAGS@ ARLIBFLAGS = $(LDFLAGS) $(LDLIBS) ########################### CPP = @CPP@ -CXXCPP = @CXXCPP@ -JPEG_A = ../../wxcommon/jpeg/libjpeg.@LIBSFX@ -JPEG_INC = -I../../wxcommon/jpeg -I$(srcdir)/../../wxcommon/jpeg -ZLIB_A = ../../wxcommon/zlib/libz.@LIBSFX@ -ZLIB_INC = -I$(srcdir)/../../wxcommon/zlib -PNG_A = ../../wxcommon/libpng/libpng.@LIBSFX@ - -XFORM_INC_wx_xt = -Dwx_xt @WX_MMD_FLAG@ -I$(WXDIR)/src/XWidgets -I$(WXDIR)/src -XFORM_INC_wx_mac = -Dwx_mac -DOS_X -MMD -DWX_CARBON -I$(WXMACDIR)/../utils/image/src -I$(WXMACDIR)/../contrib/wxxpm/libxpm.34b/lib -I$(WXMACDIR)/../../mac/racket +XFORM_INC_wx_xt = -Dwx_xt @WX_MMD_FLAG@ +XFORM_INC_wx_mac = -Dwx_mac -DOS_X -MMD -DWX_CARBON MZMMM_wx_xt = ../../racket/racket@MMM@ MZMMM_wx_mac = ../../racket/racket@MMM@ MZMMM = $(MZMMM_@WXVARIANT@) XFORM_CMD = $(MZMMM) -cqu $(srcdir)/../../racket/gc2/xform.rkt --setup ../../racket/gc2 -XFORM_CPP_ARGS = -I$(srcdir)/../../racket/gc2 $(NOGCINC) $(XINCLUDE) $(OPTIONS) @PREFLAGS@ $(XFORM_INC_@WXVARIANT@) @JPEG_INC@ @ZLIB_INC@ +XFORM_CPP_ARGS = -I$(srcdir)/../../racket/gc2 $(NOGCINC) $(OPTIONS) @PREFLAGS@ $(XFORM_INC_@WXVARIANT@) -XFORMXX = $(XFORM_CMD) --cpp "$(CXXCPP) $(XFORM_CPP_ARGS)" @XFORMFLAGS@ -o XFORM = $(XFORM_CMD) --cpp "$(CPP) $(XFORM_CPP_ARGS)" @XFORMFLAGS@ -o XFORMDEP = $(srcdir)/../../racket/gc2/xform.rkt $(srcdir)/../../racket/gc2/xform-mod.rkt $(srcdir)/../../racket/gc2/gc2.h -NONPRECOMPDEP = $(srcdir)/../../racket/include/schthread.h - -WXBDIR=../../wxxt -WXMACBDIR=../../wxmac/src - -GRACKETLDFLAGS = -L$(WXBDIR)/utils/image/src -L$(WXBDIR)/contrib/xpm/lib $(LDFLAGS) -L../../racket -L../wxs -L$(WXBDIR)/src +GRACKETLDFLAGS = $(LDFLAGS) -L../../racket DEF_COLLECTS_DIR = +D INITIAL_COLLECTS_DIRECTORY='"'"`cd $(srcdir)/../../../collects; pwd`"'"' -xsrc/Window.cc: $(WXDIR)/src/Windows/Window.cc $(XFORMDEP) - $(XFORMXX) xsrc/Window.cc $(WXDIR)/src/Windows/Window.cc -xsrc/Button.cc: $(WXDIR)/src/Windows/Button.cc $(XFORMDEP) - $(XFORMXX) xsrc/Button.cc $(WXDIR)/src/Windows/Button.cc -xsrc/Frame.cc: $(WXDIR)/src/Windows/Frame.cc $(XFORMDEP) - $(XFORMXX) xsrc/Frame.cc $(WXDIR)/src/Windows/Frame.cc -xsrc/Layout.cc: $(WXDIR)/src/Windows/Layout.cc $(XFORMDEP) - $(XFORMXX) xsrc/Layout.cc $(WXDIR)/src/Windows/Layout.cc -xsrc/MenuBar.cc: $(WXDIR)/src/Windows/MenuBar.cc $(XFORMDEP) - $(XFORMXX) xsrc/MenuBar.cc $(WXDIR)/src/Windows/MenuBar.cc -xsrc/RadioBox.cc: $(WXDIR)/src/Windows/RadioBox.cc $(XFORMDEP) - $(XFORMXX) xsrc/RadioBox.cc $(WXDIR)/src/Windows/RadioBox.cc -xsrc/CheckBox.cc: $(WXDIR)/src/Windows/CheckBox.cc $(XFORMDEP) - $(XFORMXX) xsrc/CheckBox.cc $(WXDIR)/src/Windows/CheckBox.cc -xsrc/Choice.cc: $(WXDIR)/src/Windows/Choice.cc $(XFORMDEP) - $(XFORMXX) xsrc/Choice.cc $(WXDIR)/src/Windows/Choice.cc -xsrc/Gauge.cc: $(WXDIR)/src/Windows/Gauge.cc $(XFORMDEP) - $(XFORMXX) xsrc/Gauge.cc $(WXDIR)/src/Windows/Gauge.cc -xsrc/ListBox.cc: $(WXDIR)/src/Windows/ListBox.cc $(XFORMDEP) - $(XFORMXX) xsrc/ListBox.cc $(WXDIR)/src/Windows/ListBox.cc -xsrc/Message.cc: $(WXDIR)/src/Windows/Message.cc $(XFORMDEP) - $(XFORMXX) xsrc/Message.cc $(WXDIR)/src/Windows/Message.cc -xsrc/Slider.cc: $(WXDIR)/src/Windows/Slider.cc $(XFORMDEP) - $(XFORMXX) xsrc/Slider.cc $(WXDIR)/src/Windows/Slider.cc -xsrc/Canvas.cc: $(WXDIR)/src/Windows/Canvas.cc $(XFORMDEP) - $(XFORMXX) xsrc/Canvas.cc $(WXDIR)/src/Windows/Canvas.cc -xsrc/DialogBox.cc: $(WXDIR)/src/Windows/DialogBox.cc $(XFORMDEP) - $(XFORMXX) xsrc/DialogBox.cc $(WXDIR)/src/Windows/DialogBox.cc -xsrc/Item.cc: $(WXDIR)/src/Windows/Item.cc $(XFORMDEP) - $(XFORMXX) xsrc/Item.cc $(WXDIR)/src/Windows/Item.cc -xsrc/Menu.cc: $(WXDIR)/src/Windows/Menu.cc $(XFORMDEP) - $(XFORMXX) xsrc/Menu.cc $(WXDIR)/src/Windows/Menu.cc -xsrc/Panel.cc: $(WXDIR)/src/Windows/Panel.cc $(XFORMDEP) - $(XFORMXX) xsrc/Panel.cc $(WXDIR)/src/Windows/Panel.cc +XFORMWP = $(XFORM) -xsrc/DC.cc: $(WXDIR)/src/DeviceContexts/DC.cc $(XFORMDEP) - $(XFORMXX) xsrc/DC.cc $(WXDIR)/src/DeviceContexts/DC.cc -xsrc/WindowDC.cc: $(WXDIR)/src/DeviceContexts/WindowDC.cc $(XFORMDEP) - $(XFORMXX) xsrc/WindowDC.cc $(WXDIR)/src/DeviceContexts/WindowDC.cc -xsrc/MemoryDC.cc: $(WXDIR)/src/DeviceContexts/MemoryDC.cc $(XFORMDEP) - $(XFORMXX) xsrc/MemoryDC.cc $(WXDIR)/src/DeviceContexts/MemoryDC.cc -xsrc/PSDC.cc: $(WXDIR)/src/DeviceContexts/PSDC.cc $(XFORMDEP) - $(XFORMXX) xsrc/PSDC.cc $(WXDIR)/src/DeviceContexts/PSDC.cc - -xsrc/Object.cc: $(WXDIR)/src/DataStructures/Object.cc $(XFORMDEP) - $(XFORMXX) xsrc/Object.cc $(WXDIR)/src/DataStructures/Object.cc -xsrc/TypeTree.cc: $(WXDIR)/src/DataStructures/TypeTree.cc $(XFORMDEP) - $(XFORMXX) xsrc/TypeTree.cc $(WXDIR)/src/DataStructures/TypeTree.cc -xsrc/wb_list.cc: $(WXDIR)/src/DataStructures/wb_list.cc $(XFORMDEP) - $(XFORMXX) xsrc/wb_list.cc $(WXDIR)/src/DataStructures/wb_list.cc -xsrc/wb_hash.cc: $(WXDIR)/src/DataStructures/wb_hash.cc $(XFORMDEP) - $(XFORMXX) xsrc/wb_hash.cc $(WXDIR)/src/DataStructures/wb_hash.cc - -xsrc/AppMain.cc: $(WXDIR)/src/Application/AppMain.cc $(XFORMDEP) - $(XFORMXX) xsrc/AppMain.cc $(WXDIR)/src/Application/AppMain.cc -xsrc/GlobalData.cc: $(WXDIR)/src/Application/GlobalData.cc $(XFORMDEP) - $(XFORMXX) xsrc/GlobalData.cc $(WXDIR)/src/Application/GlobalData.cc - -xsrc/FileDialog.cc: $(WXDIR)/src/Dialogs/FileDialog.cc $(XFORMDEP) - $(XFORMXX) xsrc/FileDialog.cc $(WXDIR)/src/Dialogs/FileDialog.cc -xsrc/MessageBox.cc: $(WXDIR)/src/Dialogs/MessageBox.cc $(XFORMDEP) - $(XFORMXX) xsrc/MessageBox.cc $(WXDIR)/src/Dialogs/MessageBox.cc - -xsrc/EvtHandler.cc: $(WXDIR)/src/EventHandling/EvtHandler.cc $(XFORMDEP) - $(XFORMXX) xsrc/EvtHandler.cc $(WXDIR)/src/EventHandling/EvtHandler.cc -xsrc/wb_sysev.cc: $(WXDIR)/src/EventHandling/wb_sysev.cc $(XFORMDEP) - $(XFORMXX) xsrc/wb_sysev.cc $(WXDIR)/src/EventHandling/wb_sysev.cc -xsrc/wb_stdev.cc: $(WXDIR)/src/EventHandling/wb_stdev.cc $(XFORMDEP) - $(XFORMXX) xsrc/wb_stdev.cc $(WXDIR)/src/EventHandling/wb_stdev.cc - -xsrc/Bitmap.cc: $(WXDIR)/src/GDI-Classes/Bitmap.cc $(XFORMDEP) - $(XFORMXX) xsrc/Bitmap.cc $(WXDIR)/src/GDI-Classes/Bitmap.cc -xsrc/Colour.cc: $(WXDIR)/src/GDI-Classes/Colour.cc $(XFORMDEP) - $(XFORMXX) xsrc/Colour.cc $(WXDIR)/src/GDI-Classes/Colour.cc -xsrc/Font.cc: $(WXDIR)/src/GDI-Classes/Font.cc $(XFORMDEP) - $(XFORMXX) xsrc/Font.cc $(WXDIR)/src/GDI-Classes/Font.cc -xsrc/FontDirectory.cc: $(WXDIR)/src/GDI-Classes/FontDirectory.cc $(XFORMDEP) - $(XFORMXX) xsrc/FontDirectory.cc $(WXDIR)/src/GDI-Classes/FontDirectory.cc -xsrc/Pen+Brush.cc: $(WXDIR)/src/GDI-Classes/Pen+Brush.cc $(XFORMDEP) - $(XFORMXX) xsrc/Pen+Brush.cc $(WXDIR)/src/GDI-Classes/Pen+Brush.cc - -xsrc/Clipboard.cc: $(WXDIR)/src/Misc/Clipboard.cc $(XFORMDEP) - $(XFORMXX) xsrc/Clipboard.cc $(WXDIR)/src/Misc/Clipboard.cc -xsrc/Timer.cc: $(WXDIR)/src/Misc/Timer.cc $(XFORMDEP) - $(XFORMXX) xsrc/Timer.cc $(WXDIR)/src/Misc/Timer.cc - -xsrc/Application.cc: $(WXDIR)/src/Utilities/Application.cc $(XFORMDEP) - $(XFORMXX) xsrc/Application.cc $(WXDIR)/src/Utilities/Application.cc -xsrc/Assert.cc: $(WXDIR)/src/Utilities/Assert.cc $(XFORMDEP) - $(XFORMXX) xsrc/Assert.cc $(WXDIR)/src/Utilities/Assert.cc -xsrc/BusyCursor.cc: $(WXDIR)/src/Utilities/BusyCursor.cc $(XFORMDEP) - $(XFORMXX) xsrc/BusyCursor.cc $(WXDIR)/src/Utilities/BusyCursor.cc -xsrc/Date+Time.cc: $(WXDIR)/src/Utilities/Date+Time.cc $(XFORMDEP) - $(XFORMXX) xsrc/Date+Time.cc $(WXDIR)/src/Utilities/Date+Time.cc -xsrc/Directory.cc: $(WXDIR)/src/Utilities/Directory.cc $(XFORMDEP) - $(XFORMXX) xsrc/Directory.cc $(WXDIR)/src/Utilities/Directory.cc -xsrc/Error.cc: $(WXDIR)/src/Utilities/Error.cc $(XFORMDEP) - $(XFORMXX) xsrc/Error.cc $(WXDIR)/src/Utilities/Error.cc -xsrc/GDI.cc: $(WXDIR)/src/Utilities/GDI.cc $(XFORMDEP) - $(XFORMXX) xsrc/GDI.cc $(WXDIR)/src/Utilities/GDI.cc -xsrc/Home.cc: $(WXDIR)/src/Utilities/Home.cc $(XFORMDEP) - $(XFORMXX) xsrc/Home.cc $(WXDIR)/src/Utilities/Home.cc -xsrc/Misc.cc: $(WXDIR)/src/Utilities/Misc.cc $(XFORMDEP) - $(XFORMXX) xsrc/Misc.cc $(WXDIR)/src/Utilities/Misc.cc -xsrc/Net.c: $(WXDIR)/src/Utilities/Net.c $(XFORMDEP) - $(XFORM) xsrc/Net.c $(WXDIR)/src/Utilities/Net.c -xsrc/Path.cc: $(WXDIR)/src/Utilities/Path.cc $(XFORMDEP) - $(XFORMXX) xsrc/Path.cc $(WXDIR)/src/Utilities/Path.cc -xsrc/Resources.cc: $(WXDIR)/src/Utilities/Resources.cc $(XFORMDEP) - $(XFORMXX) xsrc/Resources.cc $(WXDIR)/src/Utilities/Resources.cc -xsrc/String.cc: $(WXDIR)/src/Utilities/String.cc $(XFORMDEP) - $(XFORMXX) xsrc/String.cc $(WXDIR)/src/Utilities/String.cc -xsrc/TempFile.cc: $(WXDIR)/src/Utilities/TempFile.cc $(XFORMDEP) - $(XFORMXX) xsrc/TempFile.cc $(WXDIR)/src/Utilities/TempFile.cc - -xsrc/wx_image.cc: $(WXDIR)/utils/image/src/wx_image.cc $(XFORMDEP) - $(XFORMXX) xsrc/wx_image.cc $(WXDIR)/utils/image/src/wx_image.cc -xsrc/wx_img.cc: $(WXDIR)/utils/image/src/wx_img.cc $(XFORMDEP) - $(XFORMXX) xsrc/wx_img.cc $(WXDIR)/utils/image/src/wx_img.cc -xsrc/wx_24to8.cc: $(WXDIR)/utils/image/src/wx_24to8.cc $(XFORMDEP) - $(XFORMXX) xsrc/wx_24to8.cc $(WXDIR)/utils/image/src/wx_24to8.cc -xsrc/wx_bmp.cc: $(WXDIR)/utils/image/src/wx_bmp.cc $(XFORMDEP) - $(XFORMXX) xsrc/wx_bmp.cc $(WXDIR)/utils/image/src/wx_bmp.cc -xsrc/wx_gam.cc: $(WXDIR)/utils/image/src/wx_gam.cc $(XFORMDEP) - $(XFORMXX) xsrc/wx_gam.cc $(WXDIR)/utils/image/src/wx_gam.cc -xsrc/wx_gif.cc: $(WXDIR)/utils/image/src/wx_gif.cc $(XFORMDEP) - $(XFORMXX) xsrc/wx_gif.cc $(WXDIR)/utils/image/src/wx_gif.cc -xsrc/wx_gifwr.cc: $(WXDIR)/utils/image/src/wx_gifwr.cc $(XFORMDEP) - $(XFORMXX) xsrc/wx_gifwr.cc $(WXDIR)/utils/image/src/wx_gifwr.cc -xsrc/wx_xbm.cc: $(WXDIR)/utils/image/src/wx_xbm.cc $(XFORMDEP) - $(XFORMXX) xsrc/wx_xbm.cc $(WXDIR)/utils/image/src/wx_xbm.cc - -MACXPRECOMP = macxsrc/xform_precomp.h -MACXPRECOMPDEP = - -macxsrc/xform_precomp.h : $(XFORMDEP) $(srcdir)/macprecomp.cxx $(srcdir)/../../racket/src/schvers.h \ - $(srcdir)/../../racket/src/schemef.h - env XFORM_PRECOMP=yes $(XFORMXX) $(MACXPRECOMP) $(srcdir)/macprecomp.cxx - -@INCLUDEDEP@ macprecomp.dd - -wx_xt_XFORMWP = $(XFORMXX) -wx_mac_XFORMWP = env XFORM_USE_PRECOMP=$(MACXPRECOMP) $(XFORMXX) -XFORMWP = $(@WXVARIANT@_XFORMWP) - -macxsrc/wb_item.cc: $(WXMACDIR)/base/wb_item.cc $(XFORMDEP) $(MACXPRECOMPDEP) - $(XFORMWP) macxsrc/wb_item.cc $(WXMACDIR)/base/wb_item.cc -macxsrc/wb_panel.cc: $(WXMACDIR)/base/wb_panel.cc $(XFORMDEP) $(MACXPRECOMPDEP) - $(XFORMWP) macxsrc/wb_panel.cc $(WXMACDIR)/base/wb_panel.cc -macxsrc/wb_timer.cc: $(WXMACDIR)/base/wb_timer.cc $(XFORMDEP) $(MACXPRECOMPDEP) - $(XFORMWP) macxsrc/wb_timer.cc $(WXMACDIR)/base/wb_timer.cc -macxsrc/wb_frame.cc: $(WXMACDIR)/base/wb_frame.cc $(XFORMDEP) $(MACXPRECOMPDEP) - $(XFORMWP) macxsrc/wb_frame.cc $(WXMACDIR)/base/wb_frame.cc -macxsrc/wb_list.cc: $(srcdir)/../../wxcommon/wb_list.cxx $(XFORMDEP) $(MACXPRECOMPDEP) - $(XFORMWP) macxsrc/wb_list.cc $(WXMACDIR)/../../wxcommon/wb_list.cxx -macxsrc/PSDC.cc: $(srcdir)/../../wxcommon/PSDC.cxx $(XFORMDEP) $(MACXPRECOMPDEP) - $(XFORMWP) macxsrc/PSDC.cc $(WXMACDIR)/../../wxcommon/PSDC.cxx -macxsrc/wb_types.cc: $(WXMACDIR)/base/wb_types.cc $(XFORMDEP) $(MACXPRECOMPDEP) - $(XFORMWP) macxsrc/wb_types.cc $(WXMACDIR)/base/wb_types.cc -macxsrc/wb_canvs.cc: $(WXMACDIR)/base/wb_canvs.cc $(XFORMDEP) $(MACXPRECOMPDEP) - $(XFORMWP) macxsrc/wb_canvs.cc $(WXMACDIR)/base/wb_canvs.cc -macxsrc/wb_gdi.cc: $(WXMACDIR)/base/wb_gdi.cc $(XFORMDEP) $(MACXPRECOMPDEP) - $(XFORMWP) macxsrc/wb_gdi.cc $(WXMACDIR)/base/wb_gdi.cc -macxsrc/wb_main.cc: $(WXMACDIR)/base/wb_main.cc $(XFORMDEP) $(MACXPRECOMPDEP) - $(XFORMWP) macxsrc/wb_main.cc $(WXMACDIR)/base/wb_main.cc -macxsrc/wb_utils.cc: $(WXMACDIR)/base/wb_utils.cc $(XFORMDEP) $(MACXPRECOMPDEP) - $(XFORMWP) macxsrc/wb_utils.cc $(WXMACDIR)/base/wb_utils.cc -macxsrc/wb_data.cc: $(WXMACDIR)/base/wb_data.cc $(XFORMDEP) $(MACXPRECOMPDEP) - $(XFORMWP) macxsrc/wb_data.cc $(WXMACDIR)/base/wb_data.cc -macxsrc/wb_hash.cc: $(srcdir)/../../wxcommon/wb_hash.cxx $(XFORMDEP) $(MACXPRECOMPDEP) - $(XFORMWP) macxsrc/wb_hash.cc $(WXMACDIR)/../../wxcommon/wb_hash.cxx -macxsrc/wb_stdev.cc: $(WXMACDIR)/base/wb_stdev.cc $(XFORMDEP) $(MACXPRECOMPDEP) - $(XFORMWP) macxsrc/wb_stdev.cc $(WXMACDIR)/base/wb_stdev.cc -macxsrc/wb_win.cc: $(WXMACDIR)/base/wb_win.cc $(XFORMDEP) $(MACXPRECOMPDEP) - $(XFORMWP) macxsrc/wb_win.cc $(WXMACDIR)/base/wb_win.cc -macxsrc/wb_dc.cc: $(WXMACDIR)/base/wb_dc.cc $(XFORMDEP) $(MACXPRECOMPDEP) - $(XFORMWP) macxsrc/wb_dc.cc $(WXMACDIR)/base/wb_dc.cc -macxsrc/wb_sysev.cc: $(WXMACDIR)/base/wb_sysev.cc $(XFORMDEP) $(MACXPRECOMPDEP) - $(XFORMWP) macxsrc/wb_sysev.cc $(WXMACDIR)/base/wb_sysev.cc -macxsrc/wb_dialg.cc: $(WXMACDIR)/base/wb_dialg.cc $(XFORMDEP) $(MACXPRECOMPDEP) - $(XFORMWP) macxsrc/wb_dialg.cc $(WXMACDIR)/base/wb_dialg.cc -macxsrc/wb_obj.cc: $(WXMACDIR)/base/wb_obj.cc $(XFORMDEP) $(MACXPRECOMPDEP) - $(XFORMWP) macxsrc/wb_obj.cc $(WXMACDIR)/base/wb_obj.cc -macxsrc/xfspline.cc: $(WXMACDIR)/base/xfspline.cc $(XFORMDEP) $(MACXPRECOMPDEP) - $(XFORMWP) macxsrc/xfspline.cc $(WXMACDIR)/base/xfspline.cc -macxsrc/wx_choic.cc: $(WXMACDIR)/mac/wx_choic.cc $(XFORMDEP) $(MACXPRECOMPDEP) - $(XFORMWP) macxsrc/wx_choic.cc $(WXMACDIR)/mac/wx_choic.cc -macxsrc/wx_main.cc: $(WXMACDIR)/mac/wx_main.cc $(XFORMDEP) $(MACXPRECOMPDEP) - $(XFORMWP) macxsrc/wx_main.cc $(WXMACDIR)/mac/wx_main.cc -macxsrc/wx_clipb.cc: $(WXMACDIR)/mac/wx_clipb.cc $(XFORMDEP) $(MACXPRECOMPDEP) - $(XFORMWP) macxsrc/wx_clipb.cc $(WXMACDIR)/mac/wx_clipb.cc -macxsrc/wx_menu.cc: $(WXMACDIR)/mac/wx_menu.cc $(XFORMDEP) $(MACXPRECOMPDEP) - $(XFORMWP) macxsrc/wx_menu.cc $(WXMACDIR)/mac/wx_menu.cc -macxsrc/wx_messg.cc: $(WXMACDIR)/mac/wx_messg.cc $(XFORMDEP) $(MACXPRECOMPDEP) - $(XFORMWP) macxsrc/wx_messg.cc $(WXMACDIR)/mac/wx_messg.cc -macxsrc/wxBorder.cc: $(WXMACDIR)/mac/wxBorder.cc $(XFORMDEP) $(MACXPRECOMPDEP) - $(XFORMWP) macxsrc/wxBorder.cc $(WXMACDIR)/mac/wxBorder.cc -macxsrc/wx_dc.cc: $(WXMACDIR)/mac/wx_dc.cc $(XFORMDEP) $(MACXPRECOMPDEP) - $(XFORMWP) macxsrc/wx_dc.cc $(WXMACDIR)/mac/wx_dc.cc -macxsrc/wxBorderArea.cc: $(WXMACDIR)/mac/wxBorderArea.cc $(XFORMDEP) $(MACXPRECOMPDEP) - $(XFORMWP) macxsrc/wxBorderArea.cc $(WXMACDIR)/mac/wxBorderArea.cc -macxsrc/wx_dccan1.cc: $(WXMACDIR)/mac/wx_dccan1.cc $(XFORMDEP) $(MACXPRECOMPDEP) - $(XFORMWP) macxsrc/wx_dccan1.cc $(WXMACDIR)/mac/wx_dccan1.cc -macxsrc/wx_mnuit.cc: $(WXMACDIR)/mac/wx_mnuit.cc $(XFORMDEP) $(MACXPRECOMPDEP) - $(XFORMWP) macxsrc/wx_mnuit.cc $(WXMACDIR)/mac/wx_mnuit.cc -macxsrc/wxButtonBorder.cc: $(WXMACDIR)/mac/wxButtonBorder.cc $(XFORMDEP) $(MACXPRECOMPDEP) - $(XFORMWP) macxsrc/wxButtonBorder.cc $(WXMACDIR)/mac/wxButtonBorder.cc -macxsrc/wx_dccan2.cc: $(WXMACDIR)/mac/wx_dccan2.cc $(XFORMDEP) $(MACXPRECOMPDEP) - $(XFORMWP) macxsrc/wx_dccan2.cc $(WXMACDIR)/mac/wx_dccan2.cc -macxsrc/wx_dccan3.cc: $(WXMACDIR)/mac/wx_dccan3.cc $(XFORMDEP) $(MACXPRECOMPDEP) - $(XFORMWP) macxsrc/wx_dccan3.cc $(WXMACDIR)/mac/wx_dccan3.cc -macxsrc/wx_panel.cc: $(WXMACDIR)/mac/wx_panel.cc $(XFORMDEP) $(MACXPRECOMPDEP) - $(XFORMWP) macxsrc/wx_panel.cc $(WXMACDIR)/mac/wx_panel.cc -macxsrc/wxLabelArea.cc: $(WXMACDIR)/mac/wxLabelArea.cc $(XFORMDEP) $(MACXPRECOMPDEP) - $(XFORMWP) macxsrc/wxLabelArea.cc $(WXMACDIR)/mac/wxLabelArea.cc -macxsrc/wx_dcmem.cc: $(WXMACDIR)/mac/wx_dcmem.cc $(XFORMDEP) $(MACXPRECOMPDEP) - $(XFORMWP) macxsrc/wx_dcmem.cc $(WXMACDIR)/mac/wx_dcmem.cc -macxsrc/wx_print.cc: $(WXMACDIR)/mac/wx_print.cc $(XFORMDEP) $(MACXPRECOMPDEP) - $(XFORMWP) macxsrc/wx_print.cc $(WXMACDIR)/mac/wx_print.cc -macxsrc/wxMacDC.cc: $(WXMACDIR)/mac/wxMacDC.cc $(XFORMDEP) $(MACXPRECOMPDEP) - $(XFORMWP) macxsrc/wxMacDC.cc $(WXMACDIR)/mac/wxMacDC.cc -macxsrc/wx_dcpr1.cc: $(WXMACDIR)/mac/wx_dcpr1.cc $(XFORMDEP) $(MACXPRECOMPDEP) - $(XFORMWP) macxsrc/wx_dcpr1.cc $(WXMACDIR)/mac/wx_dcpr1.cc -macxsrc/wx_rbox.cc: $(WXMACDIR)/mac/wx_rbox.cc $(XFORMDEP) $(MACXPRECOMPDEP) - $(XFORMWP) macxsrc/wx_rbox.cc $(WXMACDIR)/mac/wx_rbox.cc -macxsrc/wx_rbut.cc: $(WXMACDIR)/mac/wx_rbut.cc $(XFORMDEP) $(MACXPRECOMPDEP) - $(XFORMWP) macxsrc/wx_rbut.cc $(WXMACDIR)/mac/wx_rbut.cc -macxsrc/wx_sbar.cc: $(WXMACDIR)/mac/wx_sbar.cc $(XFORMDEP) $(MACXPRECOMPDEP) - $(XFORMWP) macxsrc/wx_sbar.cc $(WXMACDIR)/mac/wx_sbar.cc -macxsrc/wx_dialg.cc: $(WXMACDIR)/mac/wx_dialg.cc $(XFORMDEP) $(MACXPRECOMPDEP) - $(XFORMWP) macxsrc/wx_dialg.cc $(WXMACDIR)/mac/wx_dialg.cc -macxsrc/wx_screen.cc: $(WXMACDIR)/mac/wx_screen.cc $(XFORMDEP) $(MACXPRECOMPDEP) - $(XFORMWP) macxsrc/wx_screen.cc $(WXMACDIR)/mac/wx_screen.cc -macxsrc/wxRectBorder.cc: $(WXMACDIR)/mac/wxRectBorder.cc $(XFORMDEP) $(MACXPRECOMPDEP) - $(XFORMWP) macxsrc/wxRectBorder.cc $(WXMACDIR)/mac/wxRectBorder.cc -macxsrc/wx_slidr.cc: $(WXMACDIR)/mac/wx_slidr.cc $(XFORMDEP) $(MACXPRECOMPDEP) - $(XFORMWP) macxsrc/wx_slidr.cc $(WXMACDIR)/mac/wx_slidr.cc -macxsrc/wxScroll.cc: $(WXMACDIR)/mac/wxScroll.cc $(XFORMDEP) $(MACXPRECOMPDEP) - $(XFORMWP) macxsrc/wxScroll.cc $(WXMACDIR)/mac/wxScroll.cc -macxsrc/wx_frame.cc: $(WXMACDIR)/mac/wx_frame.cc $(XFORMDEP) $(MACXPRECOMPDEP) - $(XFORMWP) macxsrc/wx_frame.cc $(WXMACDIR)/mac/wx_frame.cc -macxsrc/wxScrollArea.cc: $(WXMACDIR)/mac/wxScrollArea.cc $(XFORMDEP) $(MACXPRECOMPDEP) - $(XFORMWP) macxsrc/wxScrollArea.cc $(WXMACDIR)/mac/wxScrollArea.cc -macxsrc/wx_gauge.cc: $(WXMACDIR)/mac/wx_gauge.cc $(XFORMDEP) $(MACXPRECOMPDEP) - $(XFORMWP) macxsrc/wx_gauge.cc $(WXMACDIR)/mac/wx_gauge.cc -macxsrc/wxScrollData.cc: $(WXMACDIR)/mac/wxScrollData.cc $(XFORMDEP) $(MACXPRECOMPDEP) - $(XFORMXX) macxsrc/wxScrollData.cc $(WXMACDIR)/mac/wxScrollData.cc -macxsrc/wx_gdi.cc: $(WXMACDIR)/mac/wx_gdi.cc $(XFORMDEP) $(MACXPRECOMPDEP) - $(XFORMWP) macxsrc/wx_gdi.cc $(WXMACDIR)/mac/wx_gdi.cc -macxsrc/wx_app.cc: $(WXMACDIR)/mac/wx_app.cc $(XFORMDEP) $(MACXPRECOMPDEP) - $(XFORMWP) macxsrc/wx_app.cc $(WXMACDIR)/mac/wx_app.cc -macxsrc/wx_util.cc: $(WXMACDIR)/mac/wx_util.cc $(XFORMDEP) $(MACXPRECOMPDEP) - $(XFORMWP) macxsrc/wx_util.cc $(WXMACDIR)/mac/wx_util.cc -macxsrc/wx_area.cc: $(WXMACDIR)/mac/wx_area.cc $(XFORMDEP) $(MACXPRECOMPDEP) - $(XFORMWP) macxsrc/wx_area.cc $(WXMACDIR)/mac/wx_area.cc -macxsrc/wx_win.cc: $(WXMACDIR)/mac/wx_win.cc $(XFORMDEP) $(MACXPRECOMPDEP) - $(XFORMWP) macxsrc/wx_win.cc $(WXMACDIR)/mac/wx_win.cc -macxsrc/wx_buttn.cc: $(WXMACDIR)/mac/wx_buttn.cc $(XFORMDEP) $(MACXPRECOMPDEP) - $(XFORMWP) macxsrc/wx_buttn.cc $(WXMACDIR)/mac/wx_buttn.cc -macxsrc/wx_item.cc: $(WXMACDIR)/mac/wx_item.cc $(XFORMDEP) $(MACXPRECOMPDEP) - $(XFORMWP) macxsrc/wx_item.cc $(WXMACDIR)/mac/wx_item.cc -macxsrc/wximgfil.cc: $(WXMACDIR)/mac/wximgfil.cc $(XFORMDEP) $(MACXPRECOMPDEP) - $(XFORMWP) macxsrc/wximgfil.cc $(WXMACDIR)/mac/wximgfil.cc -macxsrc/wx_canvs.cc: $(WXMACDIR)/mac/wx_canvs.cc $(XFORMDEP) $(MACXPRECOMPDEP) - $(XFORMWP) macxsrc/wx_canvs.cc $(WXMACDIR)/mac/wx_canvs.cc -macxsrc/wx_lbox.cc: $(WXMACDIR)/mac/wx_lbox.cc $(XFORMDEP) $(MACXPRECOMPDEP) - $(XFORMWP) macxsrc/wx_lbox.cc $(WXMACDIR)/mac/wx_lbox.cc -macxsrc/wx_check.cc: $(WXMACDIR)/mac/wx_check.cc $(XFORMDEP) $(MACXPRECOMPDEP) - $(XFORMWP) macxsrc/wx_check.cc $(WXMACDIR)/mac/wx_check.cc -macxsrc/wx_tabc.cc: $(WXMACDIR)/mac/wx_tabc.cc $(XFORMDEP) $(MACXPRECOMPDEP) - $(XFORMWP) macxsrc/wx_tabc.cc $(WXMACDIR)/mac/wx_tabc.cc -macxsrc/wx_gbox.cc: $(WXMACDIR)/mac/wx_gbox.cc $(XFORMDEP) $(MACXPRECOMPDEP) - $(XFORMWP) macxsrc/wx_gbox.cc $(WXMACDIR)/mac/wx_gbox.cc -macxsrc/wx_mac_utils.cc: $(WXMACDIR)/mac/wx_mac_utils.cc $(XFORMDEP) $(MACXPRECOMPDEP) - $(XFORMWP) macxsrc/wx_mac_utils.cc $(WXMACDIR)/mac/wx_mac_utils.cc - -macxsrc/wx_bmp.cc: $(WXMACDIR)/../utils/image/src/wx_bmp.cc $(XFORMDEP) $(MACXPRECOMPDEP) - $(XFORMWP) macxsrc/wx_bmp.cc $(WXMACDIR)/../utils/image/src/wx_bmp.cc -macxsrc/wx_image.cc: $(WXMACDIR)/../utils/image/src/wx_image.cc $(XFORMDEP) $(MACXPRECOMPDEP) - $(XFORMWP) macxsrc/wx_image.cc $(WXMACDIR)/../utils/image/src/wx_image.cc -macxsrc/wx_xbm.cc: $(WXMACDIR)/../utils/image/src/wx_xbm.cc $(XFORMDEP) $(MACXPRECOMPDEP) - $(XFORMWP) macxsrc/wx_xbm.cc $(WXMACDIR)/../utils/image/src/wx_xbm.cc -macxsrc/simpledrop.cc: $(srcdir)/../../mac/racket/simpledrop.cpp $(NONPRECOMPDEP) $(XFORMDEP) - $(XFORMXX) macxsrc/simpledrop.cc $(srcdir)/../../mac/racket/simpledrop.cpp - -wx_xt_XFORMPRECOMP = -wx_mac_XFORMPRECOMP = $(MACXPRECOMPDEP) -XFORMPRECOMP = $(@WXVARIANT@_XFORMPRECOMP) -XFORMPRECOMPDEP = - -xsrc/wxscheme.cc: $(srcdir)/../wxs/wxscheme.cxx $(XFORMDEP) $(XFORMPRECOMPDEP) - $(XFORMWP) xsrc/wxscheme.cc $(srcdir)/../wxs/wxscheme.cxx - -xsrc/xcglue.c: $(srcdir)/../../racket/utils/xcglue.c $(NONPRECOMPDEP) $(XFORMDEP) - $(XFORM) xsrc/xcglue.c $(srcdir)/../../racket/utils/xcglue.c - - -xsrc/gracket.cc: $(srcdir)/../gracket.cxx $(XFORMDEP) $(XFORMPRECOMPDEP) - $(XFORMWP) xsrc/gracket.cc $(srcdir)/../gracket.cxx - -xsrc/grmain.cc: $(srcdir)/../grmain.cxx $(XFORMDEP) $(XFORMPRECOMPDEP) - $(XFORMWP) xsrc/grmain.cc $(DEF_COLLECTS_DIR) $(srcdir)/../grmain.cxx - -xsrc/gracketx.cc: $(srcdir)/../gracketx.cxx $(XFORMDEP) $(XFORMPRECOMPDEP) - $(XFORMWP) xsrc/gracketx.cc $(srcdir)/../gracketx.cxx -xsrc/gracketmac.cc: $(srcdir)/../gracketmac.cxx $(XFORMDEP) $(XFORMPRECOMPDEP) - $(XFORMWP) xsrc/gracketmac.cc $(srcdir)/../gracketmac.cxx - -xsrc/wxs_bmap.cc: $(srcdir)/../wxs/wxs_bmap.cxx $(XFORMDEP) $(XFORMPRECOMPDEP) - $(XFORMWP) xsrc/wxs_bmap.cc $(srcdir)/../wxs/wxs_bmap.cxx -xsrc/wxs_butn.cc: $(srcdir)/../wxs/wxs_butn.cxx $(XFORMDEP) $(XFORMPRECOMPDEP) - $(XFORMWP) xsrc/wxs_butn.cc $(srcdir)/../wxs/wxs_butn.cxx -xsrc/wxs_chce.cc: $(srcdir)/../wxs/wxs_chce.cxx $(XFORMDEP) $(XFORMPRECOMPDEP) - $(XFORMWP) xsrc/wxs_chce.cc $(srcdir)/../wxs/wxs_chce.cxx -xsrc/wxs_ckbx.cc: $(srcdir)/../wxs/wxs_ckbx.cxx $(XFORMDEP) $(XFORMPRECOMPDEP) - $(XFORMWP) xsrc/wxs_ckbx.cc $(srcdir)/../wxs/wxs_ckbx.cxx -xsrc/wxs_cnvs.cc: $(srcdir)/../wxs/wxs_cnvs.cxx $(XFORMDEP) $(XFORMPRECOMPDEP) - $(XFORMWP) xsrc/wxs_cnvs.cc $(srcdir)/../wxs/wxs_cnvs.cxx -xsrc/wxs_dc.cc: $(srcdir)/../wxs/wxs_dc.cxx $(XFORMDEP) $(XFORMPRECOMPDEP) - $(XFORMWP) xsrc/wxs_dc.cc $(srcdir)/../wxs/wxs_dc.cxx -xsrc/wxs_evnt.cc: $(srcdir)/../wxs/wxs_evnt.cxx $(XFORMDEP) $(XFORMPRECOMPDEP) - $(XFORMWP) xsrc/wxs_evnt.cc $(srcdir)/../wxs/wxs_evnt.cxx -xsrc/wxs_fram.cc: $(srcdir)/../wxs/wxs_fram.cxx $(XFORMDEP) $(XFORMPRECOMPDEP) - $(XFORMWP) xsrc/wxs_fram.cc $(srcdir)/../wxs/wxs_fram.cxx -xsrc/wxs_gage.cc: $(srcdir)/../wxs/wxs_gage.cxx $(XFORMDEP) $(XFORMPRECOMPDEP) - $(XFORMWP) xsrc/wxs_gage.cc $(srcdir)/../wxs/wxs_gage.cxx -xsrc/wxs_gdi.cc: $(srcdir)/../wxs/wxs_gdi.cxx $(XFORMDEP) $(XFORMPRECOMPDEP) - $(XFORMWP) xsrc/wxs_gdi.cc $(srcdir)/../wxs/wxs_gdi.cxx -xsrc/wxs_glob.cc: $(srcdir)/../wxs/wxs_glob.cxx $(XFORMDEP) $(XFORMPRECOMPDEP) - $(XFORMWP) xsrc/wxs_glob.cc $(srcdir)/../wxs/wxs_glob.cxx -xsrc/wxs_item.cc: $(srcdir)/../wxs/wxs_item.cxx $(XFORMDEP) $(XFORMPRECOMPDEP) - $(XFORMWP) xsrc/wxs_item.cc $(srcdir)/../wxs/wxs_item.cxx -xsrc/wxs_lbox.cc: $(srcdir)/../wxs/wxs_lbox.cxx $(XFORMDEP) $(XFORMPRECOMPDEP) - $(XFORMWP) xsrc/wxs_lbox.cc $(srcdir)/../wxs/wxs_lbox.cxx -xsrc/wxs_menu.cc: $(srcdir)/../wxs/wxs_menu.cxx $(XFORMDEP) $(XFORMPRECOMPDEP) - $(XFORMWP) xsrc/wxs_menu.cc $(srcdir)/../wxs/wxs_menu.cxx -xsrc/wxs_misc.cc: $(srcdir)/../wxs/wxs_misc.cxx $(XFORMDEP) $(XFORMPRECOMPDEP) - $(XFORMWP) xsrc/wxs_misc.cc $(srcdir)/../wxs/wxs_misc.cxx -xsrc/wxs_obj.cc: $(srcdir)/../wxs/wxs_obj.cxx $(XFORMDEP) $(XFORMPRECOMPDEP) - $(XFORMWP) xsrc/wxs_obj.cc $(srcdir)/../wxs/wxs_obj.cxx -xsrc/wxs_panl.cc: $(srcdir)/../wxs/wxs_panl.cxx $(XFORMDEP) $(XFORMPRECOMPDEP) - $(XFORMWP) xsrc/wxs_panl.cc $(srcdir)/../wxs/wxs_panl.cxx -xsrc/wxs_rado.cc: $(srcdir)/../wxs/wxs_rado.cxx $(XFORMDEP) $(XFORMPRECOMPDEP) - $(XFORMWP) xsrc/wxs_rado.cc $(srcdir)/../wxs/wxs_rado.cxx -xsrc/wxs_slid.cc: $(srcdir)/../wxs/wxs_slid.cxx $(XFORMDEP) $(XFORMPRECOMPDEP) - $(XFORMWP) xsrc/wxs_slid.cc $(srcdir)/../wxs/wxs_slid.cxx -xsrc/wxs_tabc.cc: $(srcdir)/../wxs/wxs_tabc.cxx $(XFORMDEP) $(XFORMPRECOMPDEP) - $(XFORMWP) xsrc/wxs_tabc.cc $(srcdir)/../wxs/wxs_tabc.cxx -xsrc/wxs_win.cc: $(srcdir)/../wxs/wxs_win.cxx $(XFORMDEP) $(XFORMPRECOMPDEP) - $(XFORMWP) xsrc/wxs_win.cc $(srcdir)/../wxs/wxs_win.cxx - -xsrc/wxJPEG.cc: $(srcdir)/../../wxcommon/wxJPEG.cxx $(XFORMDEP) $(XFORMPRECOMPDEP) - $(XFORMWP) xsrc/wxJPEG.cc $(srcdir)/../../wxcommon/wxJPEG.cxx +xsrc/grmain.c: $(srcdir)/../grmain.c $(XFORMDEP) + $(XFORMWP) xsrc/grmain.c $(DEF_COLLECTS_DIR) $(srcdir)/../grmain.c GCPREINC = -include $(srcdir)/../../racket/gc2/gc2.h POSTFLAGS = $(OPTIONS) @COMPFLAGS@ @PROFFLAGS@ @CFLAGS@ -XXPOSTFLAGS = $(OPTIONS) @COMPFLAGS@ @PROFFLAGS@ @CXXFLAGS@ - -Window.@LTO@: xsrc/Window.cc - $(CXX) -DGC2_JUST_MACROS $(GCPREINC) -c $(XXPOSTFLAGS) -o Window.@LTO@ xsrc/Window.cc -Button.@LTO@: xsrc/Button.cc - $(CXX) -DGC2_JUST_MACROS $(GCPREINC) -c $(XXPOSTFLAGS) -o Button.@LTO@ xsrc/Button.cc -Frame.@LTO@: xsrc/Frame.cc - $(CXX) -DGC2_JUST_MACROS $(GCPREINC) -c $(XXPOSTFLAGS) -o Frame.@LTO@ xsrc/Frame.cc -Layout.@LTO@: xsrc/Layout.cc - $(CXX) -DGC2_JUST_MACROS $(GCPREINC) -c $(XXPOSTFLAGS) -o Layout.@LTO@ xsrc/Layout.cc -MenuBar.@LTO@: xsrc/MenuBar.cc - $(CXX) -DGC2_JUST_MACROS $(GCPREINC) -c $(XXPOSTFLAGS) -o MenuBar.@LTO@ xsrc/MenuBar.cc -RadioBox.@LTO@: xsrc/RadioBox.cc - $(CXX) -DGC2_JUST_MACROS $(GCPREINC) -c $(XXPOSTFLAGS) -o RadioBox.@LTO@ xsrc/RadioBox.cc -CheckBox.@LTO@: xsrc/CheckBox.cc - $(CXX) -DGC2_JUST_MACROS $(GCPREINC) -c $(XXPOSTFLAGS) -o CheckBox.@LTO@ xsrc/CheckBox.cc -Choice.@LTO@: xsrc/Choice.cc - $(CXX) -DGC2_JUST_MACROS $(GCPREINC) -c $(XXPOSTFLAGS) -o Choice.@LTO@ xsrc/Choice.cc -Gauge.@LTO@: xsrc/Gauge.cc - $(CXX) -DGC2_JUST_MACROS $(GCPREINC) -c $(XXPOSTFLAGS) -o Gauge.@LTO@ xsrc/Gauge.cc -ListBox.@LTO@: xsrc/ListBox.cc - $(CXX) -DGC2_JUST_MACROS $(GCPREINC) -c $(XXPOSTFLAGS) -o ListBox.@LTO@ xsrc/ListBox.cc -Message.@LTO@: xsrc/Message.cc - $(CXX) -DGC2_JUST_MACROS $(GCPREINC) -c $(XXPOSTFLAGS) -o Message.@LTO@ xsrc/Message.cc -Slider.@LTO@: xsrc/Slider.cc - $(CXX) -DGC2_JUST_MACROS $(GCPREINC) -c $(XXPOSTFLAGS) -o Slider.@LTO@ xsrc/Slider.cc -Canvas.@LTO@: xsrc/Canvas.cc - $(CXX) -DGC2_JUST_MACROS $(GCPREINC) -c $(XXPOSTFLAGS) -o Canvas.@LTO@ xsrc/Canvas.cc -DialogBox.@LTO@: xsrc/DialogBox.cc - $(CXX) -DGC2_JUST_MACROS $(GCPREINC) -c $(XXPOSTFLAGS) -o DialogBox.@LTO@ xsrc/DialogBox.cc -Item.@LTO@: xsrc/Item.cc - $(CXX) -DGC2_JUST_MACROS $(GCPREINC) -c $(XXPOSTFLAGS) -o Item.@LTO@ xsrc/Item.cc -Menu.@LTO@: xsrc/Menu.cc - $(CXX) -DGC2_JUST_MACROS $(GCPREINC) -c $(XXPOSTFLAGS) -o Menu.@LTO@ xsrc/Menu.cc -Panel.@LTO@: xsrc/Panel.cc - $(CXX) -DGC2_JUST_MACROS $(GCPREINC) -c $(XXPOSTFLAGS) -o Panel.@LTO@ xsrc/Panel.cc -DC.@LTO@: xsrc/DC.cc - $(CXX) -DGC2_JUST_MACROS $(GCPREINC) -c $(XXPOSTFLAGS) -o DC.@LTO@ xsrc/DC.cc -WindowDC.@LTO@: xsrc/WindowDC.cc - $(CXX) -DGC2_JUST_MACROS $(GCPREINC) -c $(XXPOSTFLAGS) -o WindowDC.@LTO@ xsrc/WindowDC.cc -MemoryDC.@LTO@: xsrc/MemoryDC.cc - $(CXX) -DGC2_JUST_MACROS $(GCPREINC) -c $(XXPOSTFLAGS) -o MemoryDC.@LTO@ xsrc/MemoryDC.cc -PSDC.@LTO@: xsrc/PSDC.cc - $(CXX) -DGC2_JUST_MACROS $(GCPREINC) -c $(XXPOSTFLAGS) -o PSDC.@LTO@ xsrc/PSDC.cc -Object.@LTO@: xsrc/Object.cc - $(CXX) -DGC2_JUST_MACROS $(GCPREINC) -c $(XXPOSTFLAGS) -o Object.@LTO@ xsrc/Object.cc -TypeTree.@LTO@: xsrc/TypeTree.cc - $(CXX) -DGC2_JUST_MACROS $(GCPREINC) -c $(XXPOSTFLAGS) -o TypeTree.@LTO@ xsrc/TypeTree.cc -wb_list.@LTO@: xsrc/wb_list.cc - $(CXX) -DGC2_JUST_MACROS $(GCPREINC) -c $(XXPOSTFLAGS) -o wb_list.@LTO@ xsrc/wb_list.cc -wb_hash.@LTO@: xsrc/wb_hash.cc - $(CXX) -DGC2_JUST_MACROS $(GCPREINC) -c $(XXPOSTFLAGS) -o wb_hash.@LTO@ xsrc/wb_hash.cc -AppMain.@LTO@: xsrc/AppMain.cc - $(CXX) -DGC2_JUST_MACROS $(GCPREINC) -c $(XXPOSTFLAGS) -o AppMain.@LTO@ xsrc/AppMain.cc -GlobalData.@LTO@: xsrc/GlobalData.cc - $(CXX) -DGC2_JUST_MACROS $(GCPREINC) -c $(XXPOSTFLAGS) -o GlobalData.@LTO@ xsrc/GlobalData.cc -FileDialog.@LTO@: xsrc/FileDialog.cc - $(CXX) -DGC2_JUST_MACROS $(GCPREINC) -c $(XXPOSTFLAGS) -o FileDialog.@LTO@ xsrc/FileDialog.cc -MessageBox.@LTO@: xsrc/MessageBox.cc - $(CXX) -DGC2_JUST_MACROS $(GCPREINC) -c $(XXPOSTFLAGS) -o MessageBox.@LTO@ xsrc/MessageBox.cc -EvtHandler.@LTO@: xsrc/EvtHandler.cc - $(CXX) -DGC2_JUST_MACROS $(GCPREINC) -c $(XXPOSTFLAGS) -o EvtHandler.@LTO@ xsrc/EvtHandler.cc -wb_sysev.@LTO@: xsrc/wb_sysev.cc - $(CXX) -DGC2_JUST_MACROS $(GCPREINC) -c $(XXPOSTFLAGS) -o wb_sysev.@LTO@ xsrc/wb_sysev.cc -wb_stdev.@LTO@: xsrc/wb_stdev.cc - $(CXX) -DGC2_JUST_MACROS $(GCPREINC) -c $(XXPOSTFLAGS) -o wb_stdev.@LTO@ xsrc/wb_stdev.cc -Bitmap.@LTO@: xsrc/Bitmap.cc - $(CXX) -DGC2_JUST_MACROS $(GCPREINC) -c $(XXPOSTFLAGS) -o Bitmap.@LTO@ xsrc/Bitmap.cc -Colour.@LTO@: xsrc/Colour.cc - $(CXX) -DGC2_JUST_MACROS $(GCPREINC) -c $(XXPOSTFLAGS) -o Colour.@LTO@ xsrc/Colour.cc -Font.@LTO@: xsrc/Font.cc - $(CXX) -DGC2_JUST_MACROS $(GCPREINC) -c $(XXPOSTFLAGS) -o Font.@LTO@ xsrc/Font.cc -FontDirectory.@LTO@: xsrc/FontDirectory.cc - $(CXX) -DGC2_JUST_MACROS $(GCPREINC) -c $(XXPOSTFLAGS) -o FontDirectory.@LTO@ xsrc/FontDirectory.cc -Pen+Brush.@LTO@: xsrc/Pen+Brush.cc - $(CXX) -DGC2_JUST_MACROS $(GCPREINC) -c $(XXPOSTFLAGS) -o Pen+Brush.@LTO@ xsrc/Pen+Brush.cc -Clipboard.@LTO@: xsrc/Clipboard.cc - $(CXX) -DGC2_JUST_MACROS $(GCPREINC) -c $(XXPOSTFLAGS) -o Clipboard.@LTO@ xsrc/Clipboard.cc -Timer.@LTO@: xsrc/Timer.cc - $(CXX) -DGC2_JUST_MACROS $(GCPREINC) -c $(XXPOSTFLAGS) -o Timer.@LTO@ xsrc/Timer.cc -Application.@LTO@: xsrc/Application.cc - $(CXX) -DGC2_JUST_MACROS $(GCPREINC) -c $(XXPOSTFLAGS) -o Application.@LTO@ xsrc/Application.cc -Assert.@LTO@: xsrc/Assert.cc - $(CXX) -DGC2_JUST_MACROS $(GCPREINC) -c $(XXPOSTFLAGS) -o Assert.@LTO@ xsrc/Assert.cc -BusyCursor.@LTO@: xsrc/BusyCursor.cc - $(CXX) -DGC2_JUST_MACROS $(GCPREINC) -c $(XXPOSTFLAGS) -o BusyCursor.@LTO@ xsrc/BusyCursor.cc -Date+Time.@LTO@: xsrc/Date+Time.cc - $(CXX) -DGC2_JUST_MACROS $(GCPREINC) -c $(XXPOSTFLAGS) -o Date+Time.@LTO@ xsrc/Date+Time.cc -Directory.@LTO@: xsrc/Directory.cc - $(CXX) -DGC2_JUST_MACROS $(GCPREINC) -c $(XXPOSTFLAGS) -o Directory.@LTO@ xsrc/Directory.cc -Error.@LTO@: xsrc/Error.cc - $(CXX) -DGC2_JUST_MACROS $(GCPREINC) -c $(XXPOSTFLAGS) -o Error.@LTO@ xsrc/Error.cc -GDI.@LTO@: xsrc/GDI.cc - $(CXX) -DGC2_JUST_MACROS $(GCPREINC) -c $(XXPOSTFLAGS) -o GDI.@LTO@ xsrc/GDI.cc -Home.@LTO@: xsrc/Home.cc - $(CXX) -DGC2_JUST_MACROS $(GCPREINC) -c $(XXPOSTFLAGS) -o Home.@LTO@ xsrc/Home.cc -Misc.@LTO@: xsrc/Misc.cc - $(CXX) -DGC2_JUST_MACROS $(GCPREINC) -c $(XXPOSTFLAGS) -o Misc.@LTO@ xsrc/Misc.cc -Net.@LTO@: xsrc/Net.c - $(CC) -DGC2_JUST_MACROS $(GCPREINC) -c $(POSTFLAGS) -o Net.@LTO@ xsrc/Net.c -Path.@LTO@: xsrc/Path.cc - $(CXX) -DGC2_JUST_MACROS $(GCPREINC) -c $(XXPOSTFLAGS) -o Path.@LTO@ xsrc/Path.cc -Resources.@LTO@: xsrc/Resources.cc - $(CXX) -DGC2_JUST_MACROS $(GCPREINC) -c $(XXPOSTFLAGS) -o Resources.@LTO@ xsrc/Resources.cc -String.@LTO@: xsrc/String.cc - $(CXX) -DGC2_JUST_MACROS $(GCPREINC) -c $(XXPOSTFLAGS) -o String.@LTO@ xsrc/String.cc -TempFile.@LTO@: xsrc/TempFile.cc - $(CXX) -DGC2_JUST_MACROS $(GCPREINC) -c $(XXPOSTFLAGS) -o TempFile.@LTO@ xsrc/TempFile.cc -wx_image.@LTO@: xsrc/wx_image.cc - $(CXX) -DGC2_JUST_MACROS $(GCPREINC) -c $(XXPOSTFLAGS) -o wx_image.@LTO@ xsrc/wx_image.cc -wx_img.@LTO@: xsrc/wx_img.cc - $(CXX) -DGC2_JUST_MACROS $(GCPREINC) -c $(XXPOSTFLAGS) -o wx_img.@LTO@ xsrc/wx_img.cc -wx_24to8.@LTO@: xsrc/wx_24to8.cc - $(CXX) -DGC2_JUST_MACROS $(GCPREINC) -c $(XXPOSTFLAGS) -o wx_24to8.@LTO@ xsrc/wx_24to8.cc -wx_bmp.@LTO@: xsrc/wx_bmp.cc - $(CXX) -DGC2_JUST_MACROS $(GCPREINC) -c $(XXPOSTFLAGS) -o wx_bmp.@LTO@ xsrc/wx_bmp.cc -wx_gam.@LTO@: xsrc/wx_gam.cc - $(CXX) -DGC2_JUST_MACROS $(GCPREINC) -c $(XXPOSTFLAGS) -o wx_gam.@LTO@ xsrc/wx_gam.cc -wx_gif.@LTO@: xsrc/wx_gif.cc - $(CXX) -DGC2_JUST_MACROS $(GCPREINC) -c $(XXPOSTFLAGS) -o wx_gif.@LTO@ xsrc/wx_gif.cc -wx_gifwr.@LTO@: xsrc/wx_gifwr.cc - $(CXX) -DGC2_JUST_MACROS $(GCPREINC) -c $(XXPOSTFLAGS) -o wx_gifwr.@LTO@ xsrc/wx_gifwr.cc -wx_xbm.@LTO@: xsrc/wx_xbm.cc - $(CXX) -DGC2_JUST_MACROS $(GCPREINC) -c $(XXPOSTFLAGS) -o wx_xbm.@LTO@ xsrc/wx_xbm.cc - -# Mac ----------------------------------------- - -precomp.@LTO@ : macxsrc/xform_precomp.h $(srcdir)/precomp.cxx - $(CXX) -Imacxsrc --dump-pch . -o precomp.@LTO@ -c $(srcdir)/precomp.cxx - touch precomp.@LTO@ - -WXPRECOMPDIR = . - -MACPRECOMPDEP = @WXPRECOMP@ -MACUSEPRECOMP = @USE_WXPRECOMP@ - -mwb_item.@LTO@: macxsrc/wb_item.cc $(MACPRECOMPDEP) - $(CXX) $(MACUSEPRECOMP) -DGC2_JUST_MACROS $(GCPREINC) -c $(XXPOSTFLAGS) -o mwb_item.@LTO@ macxsrc/wb_item.cc -mwb_panel.@LTO@: macxsrc/wb_panel.cc $(MACPRECOMPDEP) - $(CXX) $(MACUSEPRECOMP) -DGC2_JUST_MACROS $(GCPREINC) -c $(XXPOSTFLAGS) -o mwb_panel.@LTO@ macxsrc/wb_panel.cc -mwb_timer.@LTO@: macxsrc/wb_timer.cc $(MACPRECOMPDEP) - $(CXX) $(MACUSEPRECOMP) -DGC2_JUST_MACROS $(GCPREINC) -c $(XXPOSTFLAGS) -o mwb_timer.@LTO@ macxsrc/wb_timer.cc -mwb_frame.@LTO@: macxsrc/wb_frame.cc $(MACPRECOMPDEP) - $(CXX) $(MACUSEPRECOMP) -DGC2_JUST_MACROS $(GCPREINC) -c $(XXPOSTFLAGS) -o mwb_frame.@LTO@ macxsrc/wb_frame.cc -mwb_list.@LTO@: macxsrc/wb_list.cc $(MACPRECOMPDEP) - $(CXX) $(MACUSEPRECOMP) -DGC2_JUST_MACROS $(GCPREINC) -c $(XXPOSTFLAGS) -o mwb_list.@LTO@ macxsrc/wb_list.cc -mPSDC.@LTO@: macxsrc/PSDC.cc $(MACPRECOMPDEP) - $(CXX) $(MACUSEPRECOMP) -DGC2_JUST_MACROS $(GCPREINC) -c $(XXPOSTFLAGS) -o mPSDC.@LTO@ macxsrc/PSDC.cc -mwb_types.@LTO@: macxsrc/wb_types.cc $(MACPRECOMPDEP) - $(CXX) $(MACUSEPRECOMP) -DGC2_JUST_MACROS $(GCPREINC) -c $(XXPOSTFLAGS) -o mwb_types.@LTO@ macxsrc/wb_types.cc -mwb_canvs.@LTO@: macxsrc/wb_canvs.cc $(MACPRECOMPDEP) - $(CXX) $(MACUSEPRECOMP) -DGC2_JUST_MACROS $(GCPREINC) -c $(XXPOSTFLAGS) -o mwb_canvs.@LTO@ macxsrc/wb_canvs.cc -mwb_gdi.@LTO@: macxsrc/wb_gdi.cc $(MACPRECOMPDEP) - $(CXX) $(MACUSEPRECOMP) -DGC2_JUST_MACROS $(GCPREINC) -c $(XXPOSTFLAGS) -o mwb_gdi.@LTO@ macxsrc/wb_gdi.cc -mwb_main.@LTO@: macxsrc/wb_main.cc $(MACPRECOMPDEP) - $(CXX) $(MACUSEPRECOMP) -DGC2_JUST_MACROS $(GCPREINC) -c $(XXPOSTFLAGS) -o mwb_main.@LTO@ macxsrc/wb_main.cc -mwb_utils.@LTO@: macxsrc/wb_utils.cc $(MACPRECOMPDEP) - $(CXX) $(MACUSEPRECOMP) -DGC2_JUST_MACROS $(GCPREINC) -c $(XXPOSTFLAGS) -o mwb_utils.@LTO@ macxsrc/wb_utils.cc -mwb_data.@LTO@: macxsrc/wb_data.cc $(MACPRECOMPDEP) - $(CXX) $(MACUSEPRECOMP) -DGC2_JUST_MACROS $(GCPREINC) -c $(XXPOSTFLAGS) -o mwb_data.@LTO@ macxsrc/wb_data.cc -mwb_hash.@LTO@: macxsrc/wb_hash.cc $(MACPRECOMPDEP) - $(CXX) $(MACUSEPRECOMP) -DGC2_JUST_MACROS $(GCPREINC) -c $(XXPOSTFLAGS) -o mwb_hash.@LTO@ macxsrc/wb_hash.cc -mwb_stdev.@LTO@: macxsrc/wb_stdev.cc $(MACPRECOMPDEP) - $(CXX) $(MACUSEPRECOMP) -DGC2_JUST_MACROS $(GCPREINC) -c $(XXPOSTFLAGS) -o mwb_stdev.@LTO@ macxsrc/wb_stdev.cc -mwb_win.@LTO@: macxsrc/wb_win.cc $(MACPRECOMPDEP) - $(CXX) $(MACUSEPRECOMP) -DGC2_JUST_MACROS $(GCPREINC) -c $(XXPOSTFLAGS) -o mwb_win.@LTO@ macxsrc/wb_win.cc -mwb_dc.@LTO@: macxsrc/wb_dc.cc $(MACPRECOMPDEP) - $(CXX) $(MACUSEPRECOMP) -DGC2_JUST_MACROS $(GCPREINC) -c $(XXPOSTFLAGS) -o mwb_dc.@LTO@ macxsrc/wb_dc.cc -mwb_sysev.@LTO@: macxsrc/wb_sysev.cc $(MACPRECOMPDEP) - $(CXX) $(MACUSEPRECOMP) -DGC2_JUST_MACROS $(GCPREINC) -c $(XXPOSTFLAGS) -o mwb_sysev.@LTO@ macxsrc/wb_sysev.cc -mwb_dialg.@LTO@: macxsrc/wb_dialg.cc $(MACPRECOMPDEP) - $(CXX) $(MACUSEPRECOMP) -DGC2_JUST_MACROS $(GCPREINC) -c $(XXPOSTFLAGS) -o mwb_dialg.@LTO@ macxsrc/wb_dialg.cc -mwb_obj.@LTO@: macxsrc/wb_obj.cc $(MACPRECOMPDEP) - $(CXX) $(MACUSEPRECOMP) -DGC2_JUST_MACROS $(GCPREINC) -c $(XXPOSTFLAGS) -o mwb_obj.@LTO@ macxsrc/wb_obj.cc -mxfspline.@LTO@: macxsrc/xfspline.cc $(MACPRECOMPDEP) - $(CXX) $(MACUSEPRECOMP) -DGC2_JUST_MACROS $(GCPREINC) -c $(XXPOSTFLAGS) -o mxfspline.@LTO@ macxsrc/xfspline.cc -mwx_choic.@LTO@: macxsrc/wx_choic.cc $(MACPRECOMPDEP) - $(CXX) $(MACUSEPRECOMP) -DGC2_JUST_MACROS $(GCPREINC) -c $(XXPOSTFLAGS) -o mwx_choic.@LTO@ macxsrc/wx_choic.cc -mwx_main.@LTO@: macxsrc/wx_main.cc $(MACPRECOMPDEP) - $(CXX) $(MACUSEPRECOMP) -DGC2_JUST_MACROS $(GCPREINC) -c $(XXPOSTFLAGS) -o mwx_main.@LTO@ macxsrc/wx_main.cc -mwx_clipb.@LTO@: macxsrc/wx_clipb.cc $(MACPRECOMPDEP) - $(CXX) $(MACUSEPRECOMP) -DGC2_JUST_MACROS $(GCPREINC) -c $(XXPOSTFLAGS) -o mwx_clipb.@LTO@ macxsrc/wx_clipb.cc -mwx_menu.@LTO@: macxsrc/wx_menu.cc $(MACPRECOMPDEP) - $(CXX) $(MACUSEPRECOMP) -DGC2_JUST_MACROS $(GCPREINC) -c $(XXPOSTFLAGS) -o mwx_menu.@LTO@ macxsrc/wx_menu.cc -mwx_messg.@LTO@: macxsrc/wx_messg.cc $(MACPRECOMPDEP) - $(CXX) $(MACUSEPRECOMP) -DGC2_JUST_MACROS $(GCPREINC) -c $(XXPOSTFLAGS) -o mwx_messg.@LTO@ macxsrc/wx_messg.cc -mwxBorder.@LTO@: macxsrc/wxBorder.cc $(MACPRECOMPDEP) - $(CXX) $(MACUSEPRECOMP) -DGC2_JUST_MACROS $(GCPREINC) -c $(XXPOSTFLAGS) -o mwxBorder.@LTO@ macxsrc/wxBorder.cc -mwx_dc.@LTO@: macxsrc/wx_dc.cc $(MACPRECOMPDEP) - $(CXX) $(MACUSEPRECOMP) -DGC2_JUST_MACROS $(GCPREINC) -c $(XXPOSTFLAGS) -o mwx_dc.@LTO@ macxsrc/wx_dc.cc -mwxBorderArea.@LTO@: macxsrc/wxBorderArea.cc $(MACPRECOMPDEP) - $(CXX) $(MACUSEPRECOMP) -DGC2_JUST_MACROS $(GCPREINC) -c $(XXPOSTFLAGS) -o mwxBorderArea.@LTO@ macxsrc/wxBorderArea.cc -mwx_dccan1.@LTO@: macxsrc/wx_dccan1.cc $(MACPRECOMPDEP) - $(CXX) $(MACUSEPRECOMP) -DGC2_JUST_MACROS $(GCPREINC) -c $(XXPOSTFLAGS) -o mwx_dccan1.@LTO@ macxsrc/wx_dccan1.cc -mwx_mnuit.@LTO@: macxsrc/wx_mnuit.cc $(MACPRECOMPDEP) - $(CXX) $(MACUSEPRECOMP) -DGC2_JUST_MACROS $(GCPREINC) -c $(XXPOSTFLAGS) -o mwx_mnuit.@LTO@ macxsrc/wx_mnuit.cc -mwxButtonBorder.@LTO@: macxsrc/wxButtonBorder.cc $(MACPRECOMPDEP) - $(CXX) $(MACUSEPRECOMP) -DGC2_JUST_MACROS $(GCPREINC) -c $(XXPOSTFLAGS) -o mwxButtonBorder.@LTO@ macxsrc/wxButtonBorder.cc -mwx_dccan2.@LTO@: macxsrc/wx_dccan2.cc $(MACPRECOMPDEP) - $(CXX) $(MACUSEPRECOMP) -DGC2_JUST_MACROS $(GCPREINC) -c $(XXPOSTFLAGS) -o mwx_dccan2.@LTO@ macxsrc/wx_dccan2.cc -mwx_dccan3.@LTO@: macxsrc/wx_dccan3.cc $(MACPRECOMPDEP) - $(CXX) $(MACUSEPRECOMP) -DGC2_JUST_MACROS $(GCPREINC) -c $(XXPOSTFLAGS) -o mwx_dccan3.@LTO@ macxsrc/wx_dccan3.cc -mwx_panel.@LTO@: macxsrc/wx_panel.cc $(MACPRECOMPDEP) - $(CXX) $(MACUSEPRECOMP) -DGC2_JUST_MACROS $(GCPREINC) -c $(XXPOSTFLAGS) -o mwx_panel.@LTO@ macxsrc/wx_panel.cc -mwxLabelArea.@LTO@: macxsrc/wxLabelArea.cc $(MACPRECOMPDEP) - $(CXX) $(MACUSEPRECOMP) -DGC2_JUST_MACROS $(GCPREINC) -c $(XXPOSTFLAGS) -o mwxLabelArea.@LTO@ macxsrc/wxLabelArea.cc -mwx_dcmem.@LTO@: macxsrc/wx_dcmem.cc $(MACPRECOMPDEP) - $(CXX) $(MACUSEPRECOMP) -DGC2_JUST_MACROS $(GCPREINC) -c $(XXPOSTFLAGS) -o mwx_dcmem.@LTO@ macxsrc/wx_dcmem.cc -mwx_print.@LTO@: macxsrc/wx_print.cc $(MACPRECOMPDEP) - $(CXX) $(MACUSEPRECOMP) -DGC2_JUST_MACROS $(GCPREINC) -c $(XXPOSTFLAGS) -o mwx_print.@LTO@ macxsrc/wx_print.cc -mwxMacDC.@LTO@: macxsrc/wxMacDC.cc $(MACPRECOMPDEP) - $(CXX) $(MACUSEPRECOMP) -DGC2_JUST_MACROS $(GCPREINC) -c $(XXPOSTFLAGS) -o mwxMacDC.@LTO@ macxsrc/wxMacDC.cc -mwx_dcpr1.@LTO@: macxsrc/wx_dcpr1.cc $(MACPRECOMPDEP) - $(CXX) $(MACUSEPRECOMP) -DGC2_JUST_MACROS $(GCPREINC) -c $(XXPOSTFLAGS) -o mwx_dcpr1.@LTO@ macxsrc/wx_dcpr1.cc -mwx_rbox.@LTO@: macxsrc/wx_rbox.cc $(MACPRECOMPDEP) - $(CXX) $(MACUSEPRECOMP) -DGC2_JUST_MACROS $(GCPREINC) -c $(XXPOSTFLAGS) -o mwx_rbox.@LTO@ macxsrc/wx_rbox.cc -mwx_rbut.@LTO@: macxsrc/wx_rbut.cc $(MACPRECOMPDEP) - $(CXX) $(MACUSEPRECOMP) -DGC2_JUST_MACROS $(GCPREINC) -c $(XXPOSTFLAGS) -o mwx_rbut.@LTO@ macxsrc/wx_rbut.cc -mwx_sbar.@LTO@: macxsrc/wx_sbar.cc $(MACPRECOMPDEP) - $(CXX) $(MACUSEPRECOMP) -DGC2_JUST_MACROS $(GCPREINC) -c $(XXPOSTFLAGS) -o mwx_sbar.@LTO@ macxsrc/wx_sbar.cc -mwx_dialg.@LTO@: macxsrc/wx_dialg.cc $(MACPRECOMPDEP) - $(CXX) $(MACUSEPRECOMP) -DGC2_JUST_MACROS $(GCPREINC) -c $(XXPOSTFLAGS) -o mwx_dialg.@LTO@ macxsrc/wx_dialg.cc -mwx_screen.@LTO@: macxsrc/wx_screen.cc $(MACPRECOMPDEP) - $(CXX) $(MACUSEPRECOMP) -DGC2_JUST_MACROS $(GCPREINC) -c $(XXPOSTFLAGS) -o mwx_screen.@LTO@ macxsrc/wx_screen.cc -mwxRectBorder.@LTO@: macxsrc/wxRectBorder.cc $(MACPRECOMPDEP) - $(CXX) $(MACUSEPRECOMP) -DGC2_JUST_MACROS $(GCPREINC) -c $(XXPOSTFLAGS) -o mwxRectBorder.@LTO@ macxsrc/wxRectBorder.cc -mwx_slidr.@LTO@: macxsrc/wx_slidr.cc $(MACPRECOMPDEP) - $(CXX) $(MACUSEPRECOMP) -DGC2_JUST_MACROS $(GCPREINC) -c $(XXPOSTFLAGS) -o mwx_slidr.@LTO@ macxsrc/wx_slidr.cc -mwxScroll.@LTO@: macxsrc/wxScroll.cc $(MACPRECOMPDEP) - $(CXX) $(MACUSEPRECOMP) -DGC2_JUST_MACROS $(GCPREINC) -c $(XXPOSTFLAGS) -o mwxScroll.@LTO@ macxsrc/wxScroll.cc -mwx_frame.@LTO@: macxsrc/wx_frame.cc $(MACPRECOMPDEP) - $(CXX) $(MACUSEPRECOMP) -DGC2_JUST_MACROS $(GCPREINC) -c $(XXPOSTFLAGS) -o mwx_frame.@LTO@ macxsrc/wx_frame.cc -mwxScrollArea.@LTO@: macxsrc/wxScrollArea.cc $(MACPRECOMPDEP) - $(CXX) $(MACUSEPRECOMP) -DGC2_JUST_MACROS $(GCPREINC) -c $(XXPOSTFLAGS) -o mwxScrollArea.@LTO@ macxsrc/wxScrollArea.cc -mwx_gauge.@LTO@: macxsrc/wx_gauge.cc $(MACPRECOMPDEP) - $(CXX) $(MACUSEPRECOMP) -DGC2_JUST_MACROS $(GCPREINC) -c $(XXPOSTFLAGS) -o mwx_gauge.@LTO@ macxsrc/wx_gauge.cc -mwxScrollData.@LTO@: macxsrc/wxScrollData.cc - $(CXX) -DGC2_JUST_MACROS $(GCPREINC) -c $(XXPOSTFLAGS) -o mwxScrollData.@LTO@ macxsrc/wxScrollData.cc -mwx_gdi.@LTO@: macxsrc/wx_gdi.cc $(MACPRECOMPDEP) - $(CXX) $(MACUSEPRECOMP) -DGC2_JUST_MACROS $(GCPREINC) -c $(XXPOSTFLAGS) -o mwx_gdi.@LTO@ macxsrc/wx_gdi.cc -mwx_app.@LTO@: macxsrc/wx_app.cc $(MACPRECOMPDEP) - $(CXX) $(MACUSEPRECOMP) -DGC2_JUST_MACROS $(GCPREINC) -c $(XXPOSTFLAGS) -o mwx_app.@LTO@ macxsrc/wx_app.cc -mwx_util.@LTO@: macxsrc/wx_util.cc $(MACPRECOMPDEP) - $(CXX) $(MACUSEPRECOMP) -DGC2_JUST_MACROS $(GCPREINC) -c $(XXPOSTFLAGS) -o mwx_util.@LTO@ macxsrc/wx_util.cc -mwx_area.@LTO@: macxsrc/wx_area.cc $(MACPRECOMPDEP) - $(CXX) $(MACUSEPRECOMP) -DGC2_JUST_MACROS $(GCPREINC) -c $(XXPOSTFLAGS) -o mwx_area.@LTO@ macxsrc/wx_area.cc -mwx_win.@LTO@: macxsrc/wx_win.cc $(MACPRECOMPDEP) - $(CXX) $(MACUSEPRECOMP) -DGC2_JUST_MACROS $(GCPREINC) -c $(XXPOSTFLAGS) -o mwx_win.@LTO@ macxsrc/wx_win.cc -mwx_buttn.@LTO@: macxsrc/wx_buttn.cc $(MACPRECOMPDEP) - $(CXX) $(MACUSEPRECOMP) -DGC2_JUST_MACROS $(GCPREINC) -c $(XXPOSTFLAGS) -o mwx_buttn.@LTO@ macxsrc/wx_buttn.cc -mwx_item.@LTO@: macxsrc/wx_item.cc $(MACPRECOMPDEP) - $(CXX) $(MACUSEPRECOMP) -DGC2_JUST_MACROS $(GCPREINC) -c $(XXPOSTFLAGS) -o mwx_item.@LTO@ macxsrc/wx_item.cc -mwximgfil.@LTO@: macxsrc/wximgfil.cc $(MACPRECOMPDEP) - $(CXX) $(MACUSEPRECOMP) -DGC2_JUST_MACROS $(GCPREINC) -c $(XXPOSTFLAGS) -o mwximgfil.@LTO@ macxsrc/wximgfil.cc -mwx_canvs.@LTO@: macxsrc/wx_canvs.cc $(MACPRECOMPDEP) - $(CXX) $(MACUSEPRECOMP) -DGC2_JUST_MACROS $(GCPREINC) -c $(XXPOSTFLAGS) -o mwx_canvs.@LTO@ macxsrc/wx_canvs.cc -mwx_lbox.@LTO@: macxsrc/wx_lbox.cc $(MACPRECOMPDEP) - $(CXX) $(MACUSEPRECOMP) -DGC2_JUST_MACROS $(GCPREINC) -c $(XXPOSTFLAGS) -o mwx_lbox.@LTO@ macxsrc/wx_lbox.cc -mwx_check.@LTO@: macxsrc/wx_check.cc $(MACPRECOMPDEP) - $(CXX) $(MACUSEPRECOMP) -DGC2_JUST_MACROS $(GCPREINC) -c $(XXPOSTFLAGS) -o mwx_check.@LTO@ macxsrc/wx_check.cc -mwx_tabc.@LTO@: macxsrc/wx_tabc.cc $(MACPRECOMPDEP) - $(CXX) $(MACUSEPRECOMP) -DGC2_JUST_MACROS $(GCPREINC) -c $(XXPOSTFLAGS) -o mwx_tabc.@LTO@ macxsrc/wx_tabc.cc -mwx_gbox.@LTO@: macxsrc/wx_gbox.cc $(MACPRECOMPDEP) - $(CXX) $(MACUSEPRECOMP) -DGC2_JUST_MACROS $(GCPREINC) -c $(XXPOSTFLAGS) -o mwx_gbox.@LTO@ macxsrc/wx_gbox.cc -mwx_mac_utils.@LTO@: macxsrc/wx_mac_utils.cc $(MACPRECOMPDEP) - $(CXX) $(MACUSEPRECOMP) -DGC2_JUST_MACROS $(GCPREINC) -c $(XXPOSTFLAGS) -o mwx_mac_utils.@LTO@ macxsrc/wx_mac_utils.cc - -mwx_bmp.@LTO@: macxsrc/wx_bmp.cc $(MACPRECOMPDEP) - $(CXX) $(MACUSEPRECOMP) -DGC2_JUST_MACROS $(GCPREINC) -c $(XXPOSTFLAGS) -o mwx_bmp.@LTO@ macxsrc/wx_bmp.cc -mwx_image.@LTO@: macxsrc/wx_image.cc $(MACPRECOMPDEP) - $(CXX) $(MACUSEPRECOMP) -DGC2_JUST_MACROS $(GCPREINC) -c $(XXPOSTFLAGS) -o mwx_image.@LTO@ macxsrc/wx_image.cc -mwx_xbm.@LTO@: macxsrc/wx_xbm.cc $(MACPRECOMPDEP) - $(CXX) $(MACUSEPRECOMP) -DGC2_JUST_MACROS $(GCPREINC) -c $(XXPOSTFLAGS) -o mwx_xbm.@LTO@ macxsrc/wx_xbm.cc - -simpledrop.@LTO@: macxsrc/simpledrop.cc - $(CXX) -DGC2_JUST_MACROS $(GCPREINC) -c $(XXPOSTFLAGS) -o simpledrop.@LTO@ macxsrc/simpledrop.cc - -wx_xt_PRECOMPDEP = -wx_mac_PRECOMPDEP =$(MACPRECOMPDEP) -PRECOMPDEP = $(@WXVARIANT@_PRECOMPDEP) wx_xt_EXTRAFLAGS = -wx_mac_EXTRAFLAGS = $(MACUSEPRECOMP) -Imacxsrc +wx_mac_EXTRAFLAGS = EXTRAFLAGS = $(@WXVARIANT@_EXTRAFLAGS) -wxscheme.@LTO@: xsrc/wxscheme.cc $(PRECOMPDEP) - $(CXX) $(EXTRAFLAGS) -DGC2_JUST_MACROS $(GCPREINC) -c $(XXPOSTFLAGS) -o wxscheme.@LTO@ xsrc/wxscheme.cc -wxs_bmap.@LTO@: xsrc/wxs_bmap.cc $(PRECOMPDEP) - $(CXX) $(EXTRAFLAGS) -DGC2_JUST_MACROS $(GCPREINC) -c $(XXPOSTFLAGS) -o wxs_bmap.@LTO@ xsrc/wxs_bmap.cc -wxs_butn.@LTO@: xsrc/wxs_butn.cc $(PRECOMPDEP) - $(CXX) $(EXTRAFLAGS) -DGC2_JUST_MACROS $(GCPREINC) -c $(XXPOSTFLAGS) -o wxs_butn.@LTO@ xsrc/wxs_butn.cc -wxs_chce.@LTO@: xsrc/wxs_chce.cc $(PRECOMPDEP) - $(CXX) $(EXTRAFLAGS) -DGC2_JUST_MACROS $(GCPREINC) -c $(XXPOSTFLAGS) -o wxs_chce.@LTO@ xsrc/wxs_chce.cc -wxs_ckbx.@LTO@: xsrc/wxs_ckbx.cc $(PRECOMPDEP) - $(CXX) $(EXTRAFLAGS) -DGC2_JUST_MACROS $(GCPREINC) -c $(XXPOSTFLAGS) -o wxs_ckbx.@LTO@ xsrc/wxs_ckbx.cc -wxs_cnvs.@LTO@: xsrc/wxs_cnvs.cc $(PRECOMPDEP) - $(CXX) $(EXTRAFLAGS) -DGC2_JUST_MACROS $(GCPREINC) -c $(XXPOSTFLAGS) -o wxs_cnvs.@LTO@ xsrc/wxs_cnvs.cc -wxs_dc.@LTO@: xsrc/wxs_dc.cc $(PRECOMPDEP) - $(CXX) $(EXTRAFLAGS) -DGC2_JUST_MACROS $(GCPREINC) -c $(XXPOSTFLAGS) -o wxs_dc.@LTO@ xsrc/wxs_dc.cc -wxs_evnt.@LTO@: xsrc/wxs_evnt.cc $(PRECOMPDEP) - $(CXX) $(EXTRAFLAGS) -DGC2_JUST_MACROS $(GCPREINC) -c $(XXPOSTFLAGS) -o wxs_evnt.@LTO@ xsrc/wxs_evnt.cc -wxs_fram.@LTO@: xsrc/wxs_fram.cc $(PRECOMPDEP) - $(CXX) $(EXTRAFLAGS) -DGC2_JUST_MACROS $(GCPREINC) -c $(XXPOSTFLAGS) -o wxs_fram.@LTO@ xsrc/wxs_fram.cc -wxs_gage.@LTO@: xsrc/wxs_gage.cc $(PRECOMPDEP) - $(CXX) $(EXTRAFLAGS) -DGC2_JUST_MACROS $(GCPREINC) -c $(XXPOSTFLAGS) -o wxs_gage.@LTO@ xsrc/wxs_gage.cc -wxs_gdi.@LTO@: xsrc/wxs_gdi.cc $(PRECOMPDEP) - $(CXX) $(EXTRAFLAGS) -DGC2_JUST_MACROS $(GCPREINC) -c $(XXPOSTFLAGS) -o wxs_gdi.@LTO@ xsrc/wxs_gdi.cc -wxs_glob.@LTO@: xsrc/wxs_glob.cc $(PRECOMPDEP) - $(CXX) $(EXTRAFLAGS) -DGC2_JUST_MACROS $(GCPREINC) -c $(XXPOSTFLAGS) -o wxs_glob.@LTO@ xsrc/wxs_glob.cc -wxs_item.@LTO@: xsrc/wxs_item.cc $(PRECOMPDEP) - $(CXX) $(EXTRAFLAGS) -DGC2_JUST_MACROS $(GCPREINC) -c $(XXPOSTFLAGS) -o wxs_item.@LTO@ xsrc/wxs_item.cc -wxs_lbox.@LTO@: xsrc/wxs_lbox.cc $(PRECOMPDEP) - $(CXX) $(EXTRAFLAGS) -DGC2_JUST_MACROS $(GCPREINC) -c $(XXPOSTFLAGS) -o wxs_lbox.@LTO@ xsrc/wxs_lbox.cc -wxs_menu.@LTO@: xsrc/wxs_menu.cc $(PRECOMPDEP) - $(CXX) $(EXTRAFLAGS) -DGC2_JUST_MACROS $(GCPREINC) -c $(XXPOSTFLAGS) -o wxs_menu.@LTO@ xsrc/wxs_menu.cc -wxs_misc.@LTO@: xsrc/wxs_misc.cc $(PRECOMPDEP) - $(CXX) $(EXTRAFLAGS) -DGC2_JUST_MACROS $(GCPREINC) -c $(XXPOSTFLAGS) -o wxs_misc.@LTO@ xsrc/wxs_misc.cc -wxs_obj.@LTO@: xsrc/wxs_obj.cc $(PRECOMPDEP) - $(CXX) $(EXTRAFLAGS) -DGC2_JUST_MACROS $(GCPREINC) -c $(XXPOSTFLAGS) -o wxs_obj.@LTO@ xsrc/wxs_obj.cc -wxs_panl.@LTO@: xsrc/wxs_panl.cc $(PRECOMPDEP) - $(CXX) $(EXTRAFLAGS) -DGC2_JUST_MACROS $(GCPREINC) -c $(XXPOSTFLAGS) -o wxs_panl.@LTO@ xsrc/wxs_panl.cc -wxs_rado.@LTO@: xsrc/wxs_rado.cc $(PRECOMPDEP) - $(CXX) $(EXTRAFLAGS) -DGC2_JUST_MACROS $(GCPREINC) -c $(XXPOSTFLAGS) -o wxs_rado.@LTO@ xsrc/wxs_rado.cc -wxs_slid.@LTO@: xsrc/wxs_slid.cc $(PRECOMPDEP) - $(CXX) $(EXTRAFLAGS) -DGC2_JUST_MACROS $(GCPREINC) -c $(XXPOSTFLAGS) -o wxs_slid.@LTO@ xsrc/wxs_slid.cc -wxs_tabc.@LTO@: xsrc/wxs_tabc.cc $(PRECOMPDEP) - $(CXX) $(EXTRAFLAGS) -DGC2_JUST_MACROS $(GCPREINC) -c $(XXPOSTFLAGS) -o wxs_tabc.@LTO@ xsrc/wxs_tabc.cc -wxs_win.@LTO@: xsrc/wxs_win.cc $(PRECOMPDEP) - $(CXX) $(EXTRAFLAGS) -DGC2_JUST_MACROS $(GCPREINC) -c $(XXPOSTFLAGS) -o wxs_win.@LTO@ xsrc/wxs_win.cc +grmain.@LTO@: xsrc/grmain.c + $(CC) $(EXTRAFLAGS) -DGC2_JUST_MACROS $(GCPREINC) -c $(POSTFLAGS) -o grmain.@LTO@ xsrc/grmain.c -wxJPEG.@LTO@: xsrc/wxJPEG.cc $(PRECOMPDEP) - $(CXX) $(EXTRAFLAGS) -DGC2_JUST_MACROS $(GCPREINC) -c $(XXPOSTFLAGS) -o wxJPEG.@LTO@ xsrc/wxJPEG.cc -gracket.@LTO@: xsrc/gracket.cc $(PRECOMPDEP) - $(CXX) $(EXTRAFLAGS) -DGC2_JUST_MACROS $(GCPREINC) -c $(XXPOSTFLAGS) -o gracket.@LTO@ xsrc/gracket.cc -grmain.@LTO@: xsrc/grmain.cc $(PRECOMPDEP) - $(CXX) $(EXTRAFLAGS) -DGC2_JUST_MACROS $(GCPREINC) -c $(XXPOSTFLAGS) -o grmain.@LTO@ xsrc/grmain.cc -gracketx.@LTO@: xsrc/gracketx.cc $(PRECOMPDEP) - $(CXX) $(EXTRAFLAGS) -DGC2_JUST_MACROS $(GCPREINC) -c $(XXPOSTFLAGS) -o gracketx.@LTO@ xsrc/gracketx.cc -gracketmac.@LTO@: xsrc/gracketmac.cc $(PRECOMPDEP) - $(CXX) $(EXTRAFLAGS) -DGC2_JUST_MACROS $(GCPREINC) -c $(XXPOSTFLAGS) -o gracketmac.@LTO@ xsrc/gracketmac.cc +XSRCS = xsrc/grmain.c -xcglue.@LTO@: xsrc/xcglue.c - $(CC) -DGC2_JUST_MACROS $(GCPREINC) -c $(CFLAGS) -o xcglue.@LTO@ xsrc/xcglue.c +wx_xt_LIBS = +wx_mac_LIBS = -framework CoreFoundation -wxGC.@LTO@: $(srcdir)/../../wxcommon/wxGC.cxx $(srcdir)/../../wxcommon/wxGC.h \ - $(srcdir)/../../racket/gc2/gc2.h $(srcdir)/../../racket/src/stypes.h - $(CXX) -DMZ_PRECISE_GC -I$(srcdir)/../../racket/gc2/ $(CXXFLAGS) -c -o wxGC.@LTO@ $(srcdir)/../../wxcommon/wxGC.cxx - -wx_xt_XSRCS = \ - xsrc/Window.cc \ - xsrc/Button.cc \ - xsrc/Frame.cc \ - xsrc/Layout.cc \ - xsrc/MenuBar.cc \ - xsrc/RadioBox.cc \ - xsrc/CheckBox.cc \ - xsrc/Choice.cc \ - xsrc/Gauge.cc \ - xsrc/ListBox.cc \ - xsrc/Message.cc \ - xsrc/Slider.cc \ - xsrc/Canvas.cc \ - xsrc/DialogBox.cc \ - xsrc/Item.cc \ - xsrc/Menu.cc \ - xsrc/Panel.cc \ -\ - xsrc/DC.cc \ - xsrc/WindowDC.cc \ - xsrc/MemoryDC.cc \ - xsrc/PSDC.cc \ -\ - xsrc/Object.cc \ - xsrc/TypeTree.cc \ - xsrc/wb_list.cc \ - xsrc/wb_hash.cc \ -\ - xsrc/AppMain.cc \ - xsrc/GlobalData.cc \ -\ - xsrc/FileDialog.cc \ - xsrc/MessageBox.cc \ -\ - xsrc/EvtHandler.cc \ - xsrc/wb_sysev.cc \ - xsrc/wb_stdev.cc \ -\ - xsrc/Bitmap.cc \ - xsrc/Colour.cc \ - xsrc/Font.cc \ - xsrc/FontDirectory.cc \ - xsrc/Pen+Brush.cc \ -\ - xsrc/Clipboard.cc \ - xsrc/Timer.cc \ -\ - xsrc/Application.cc \ - xsrc/Assert.cc \ - xsrc/BusyCursor.cc \ - xsrc/Date+Time.cc \ - xsrc/Directory.cc \ - xsrc/Error.cc \ - xsrc/GDI.cc \ - xsrc/Home.cc \ - xsrc/Misc.cc \ - xsrc/Net.c \ - xsrc/Path.cc \ - xsrc/Resources.cc \ - xsrc/String.cc \ - xsrc/TempFile.cc \ -\ - xsrc/wx_image.cc \ - xsrc/wx_img.cc \ - xsrc/wx_24to8.cc \ - xsrc/wx_bmp.cc \ - xsrc/wx_gam.cc \ - xsrc/wx_gif.cc \ - xsrc/wx_gifwr.cc \ - xsrc/wx_xbm.cc - -wx_mac_XSRCS = \ - macxsrc/wb_item.cc \ - macxsrc/wb_panel.cc \ - macxsrc/wb_timer.cc \ - macxsrc/wb_frame.cc \ - macxsrc/wb_list.cc \ - macxsrc/PSDC.cc \ - macxsrc/wb_types.cc \ - macxsrc/wb_canvs.cc \ - macxsrc/wb_gdi.cc \ - macxsrc/wb_main.cc \ - macxsrc/wb_utils.cc \ - macxsrc/wb_data.cc \ - macxsrc/wb_hash.cc \ - macxsrc/wb_stdev.cc \ - macxsrc/wb_win.cc \ - macxsrc/wb_dc.cc \ - macxsrc/wb_sysev.cc \ - macxsrc/wb_dialg.cc \ - macxsrc/wb_obj.cc \ - macxsrc/xfspline.cc \ - macxsrc/wx_choic.cc \ - macxsrc/wx_main.cc \ - macxsrc/wx_clipb.cc \ - macxsrc/wx_menu.cc \ - macxsrc/wx_messg.cc \ - macxsrc/wxBorder.cc \ - macxsrc/wx_dc.cc \ - macxsrc/wxBorderArea.cc \ - macxsrc/wx_dccan1.cc \ - macxsrc/wx_mnuit.cc \ - macxsrc/wxButtonBorder.cc \ - macxsrc/wx_dccan2.cc \ - macxsrc/wx_dccan3.cc \ - macxsrc/wx_panel.cc \ - macxsrc/wxLabelArea.cc \ - macxsrc/wx_dcmem.cc \ - macxsrc/wx_print.cc \ - macxsrc/wxMacDC.cc \ - macxsrc/wx_dcpr1.cc \ - macxsrc/wx_rbox.cc \ - macxsrc/wx_rbut.cc \ - macxsrc/wx_sbar.cc \ - macxsrc/wx_dialg.cc \ - macxsrc/wx_screen.cc \ - macxsrc/wxRectBorder.cc \ - macxsrc/wx_slidr.cc \ - macxsrc/wxScroll.cc \ - macxsrc/wx_frame.cc \ - macxsrc/wxScrollArea.cc \ - macxsrc/wx_gauge.cc \ - macxsrc/wxScrollData.cc \ - macxsrc/wx_gdi.cc \ - macxsrc/wx_app.cc \ - macxsrc/wx_util.cc \ - macxsrc/wx_area.cc \ - macxsrc/wx_win.cc \ - macxsrc/wx_buttn.cc \ - macxsrc/wx_item.cc \ - macxsrc/wximgfil.cc \ - macxsrc/wx_canvs.cc \ - macxsrc/wx_lbox.cc \ - macxsrc/wx_check.cc \ - macxsrc/wx_tabc.cc \ - macxsrc/wx_gbox.cc \ - macxsrc/wx_mac_utils.cc \ -\ - macxsrc/wx_bmp.cc \ - macxsrc/wx_image.cc \ - macxsrc/wx_xbm.cc \ -\ - macxsrc/simpledrop.cc - -GRACKET_wx_xt = gracketx -GRACKET_wx_mac = gracketmac - -GRACKET_XSRCS = \ - xsrc/wxs_bmap.cc \ - xsrc/wxs_butn.cc \ - xsrc/wxs_chce.cc \ - xsrc/wxs_ckbx.cc \ - xsrc/wxs_cnvs.cc \ - xsrc/wxs_dc.cc \ - xsrc/wxs_evnt.cc \ - xsrc/wxs_fram.cc \ - xsrc/wxs_gage.cc \ - xsrc/wxs_gdi.cc \ - xsrc/wxs_glob.cc \ - xsrc/wxs_item.cc \ - xsrc/wxs_lbox.cc \ - xsrc/wxs_menu.cc \ - xsrc/wxs_misc.cc \ - xsrc/wxs_obj.cc \ - xsrc/wxs_panl.cc \ - xsrc/wxs_rado.cc \ - xsrc/wxs_slid.cc \ - xsrc/wxs_tabc.cc \ - xsrc/wxs_win.cc \ -\ - xsrc/wxscheme.cc \ -\ - xsrc/wxJPEG.cc \ -\ - xsrc/gracket.cc \ - xsrc/grmain.cc \ - xsrc/$(GRACKET_@WXVARIANT@).cc - -XSRCS = $(@WXVARIANT@_XSRCS) $(GRACKET_XSRCS) - -wx_xt_XOBJS = Window.@LTO@ \ - Button.@LTO@ \ - Frame.@LTO@ \ - Layout.@LTO@ \ - MenuBar.@LTO@ \ - RadioBox.@LTO@ \ - CheckBox.@LTO@ \ - Choice.@LTO@ \ - Gauge.@LTO@ \ - ListBox.@LTO@ \ - Message.@LTO@ \ - Slider.@LTO@ \ - Canvas.@LTO@ \ - DialogBox.@LTO@ \ - Item.@LTO@ \ - Menu.@LTO@ \ - Panel.@LTO@ \ -\ - DC.@LTO@ \ - WindowDC.@LTO@ \ - MemoryDC.@LTO@ \ - PSDC.@LTO@ \ -\ - Object.@LTO@ \ - TypeTree.@LTO@ \ - wb_list.@LTO@ \ - wb_hash.@LTO@ \ -\ - AppMain.@LTO@ \ - GlobalData.@LTO@ \ -\ - FileDialog.@LTO@ \ - MessageBox.@LTO@ \ -\ - EvtHandler.@LTO@ \ - wb_sysev.@LTO@ \ - wb_stdev.@LTO@ \ -\ - Bitmap.@LTO@ \ - Colour.@LTO@ \ - Font.@LTO@ \ - FontDirectory.@LTO@ \ - Pen+Brush.@LTO@ \ -\ - Clipboard.@LTO@ \ - Timer.@LTO@ \ -\ - Application.@LTO@ \ - Assert.@LTO@ \ - BusyCursor.@LTO@ \ - Date+Time.@LTO@ \ - Directory.@LTO@ \ - Error.@LTO@ \ - GDI.@LTO@ \ - Home.@LTO@ \ - Misc.@LTO@ \ - Net.@LTO@ \ - Path.@LTO@ \ - Resources.@LTO@ \ - String.@LTO@ \ - TempFile.@LTO@ \ -\ - wx_image.@LTO@ \ - wx_img.@LTO@ \ - wx_24to8.@LTO@ \ - wx_bmp.@LTO@ \ - wx_gam.@LTO@ \ - wx_gif.@LTO@ \ - wx_gifwr.@LTO@ \ - wx_xbm.@LTO@ - -wx_mac_XOBJS = \ - mwb_item.@LTO@ \ - mwb_panel.@LTO@ \ - mwb_timer.@LTO@ \ - mwb_frame.@LTO@ \ - mwb_list.@LTO@ \ - mPSDC.@LTO@ \ - mwb_types.@LTO@ \ - mwb_canvs.@LTO@ \ - mwb_gdi.@LTO@ \ - mwb_main.@LTO@ \ - mwb_utils.@LTO@ \ - mwb_data.@LTO@ \ - mwb_hash.@LTO@ \ - mwb_stdev.@LTO@ \ - mwb_win.@LTO@ \ - mwb_dc.@LTO@ \ - mwb_sysev.@LTO@ \ - mwb_dialg.@LTO@ \ - mwb_obj.@LTO@ \ - mxfspline.@LTO@ \ - mwx_choic.@LTO@ \ - mwx_main.@LTO@ \ - mwx_clipb.@LTO@ \ - mwx_menu.@LTO@ \ - mwx_messg.@LTO@ \ - mwxBorder.@LTO@ \ - mwx_dc.@LTO@ \ - mwxBorderArea.@LTO@ \ - mwx_dccan1.@LTO@ \ - mwx_mnuit.@LTO@ \ - mwxButtonBorder.@LTO@ \ - mwx_dccan2.@LTO@ \ - mwx_dccan3.@LTO@ \ - mwx_panel.@LTO@ \ - mwxLabelArea.@LTO@ \ - mwx_dcmem.@LTO@ \ - mwx_print.@LTO@ \ - mwxMacDC.@LTO@ \ - mwx_dcpr1.@LTO@ \ - mwx_rbox.@LTO@ \ - mwx_rbut.@LTO@ \ - mwx_sbar.@LTO@ \ - mwx_dialg.@LTO@ \ - mwx_screen.@LTO@ \ - mwxRectBorder.@LTO@ \ - mwx_slidr.@LTO@ \ - mwxScroll.@LTO@ \ - mwx_frame.@LTO@ \ - mwxScrollArea.@LTO@ \ - mwx_gauge.@LTO@ \ - mwxScrollData.@LTO@ \ - mwx_gdi.@LTO@ \ - mwx_app.@LTO@ \ - mwx_util.@LTO@ \ - mwx_area.@LTO@ \ - mwx_win.@LTO@ \ - mwx_buttn.@LTO@ \ - mwx_item.@LTO@ \ - mwximgfil.@LTO@ \ - mwx_canvs.@LTO@ \ - mwx_lbox.@LTO@ \ - mwx_check.@LTO@ \ - mwx_tabc.@LTO@ \ - mwx_gbox.@LTO@ \ - mwx_mac_utils.@LTO@ \ -\ - mwx_bmp.@LTO@ \ - mwx_image.@LTO@ \ - mwx_xbm.@LTO@ \ -\ - simpledrop.@LTO@ - -GRACKET_XOBJS = \ - wxs_bmap.@LTO@ \ - wxs_butn.@LTO@ \ - wxs_chce.@LTO@ \ - wxs_ckbx.@LTO@ \ - wxs_cnvs.@LTO@ \ - wxs_dc.@LTO@ \ - wxs_evnt.@LTO@ \ - wxs_fram.@LTO@ \ - wxs_gage.@LTO@ \ - wxs_gdi.@LTO@ \ - wxs_glob.@LTO@ \ - wxs_item.@LTO@ \ - wxs_lbox.@LTO@ \ - wxs_menu.@LTO@ \ - wxs_misc.@LTO@ \ - wxs_obj.@LTO@ \ - wxs_panl.@LTO@ \ - wxs_rado.@LTO@ \ - wxs_slid.@LTO@ \ - wxs_tabc.@LTO@ \ - wxs_win.@LTO@ \ -\ - wxscheme.@LTO@ \ -\ - wxJPEG.@LTO@ \ -\ - gracket.@LTO@ \ - $(GRACKET_@WXVARIANT@).@LTO@ \ -\ - xcglue.@LTO@ \ - wxGC.@LTO@ +GRACKETLINKER = @MZLINKER@ +<<<<<<< HEAD XOBJS = $(@WXVARIANT@_XOBJS) $(GRACKET_XOBJS) MZOBJS = ../../racket/libracket3m.@LIBSFX@ @@ -1234,209 +171,57 @@ LIBGRACKETLIBS_la = $(LDFLAGS) $(LDLIBS) $(@WXVARIANT@_LIBS) LIBGRACKETMZOBJS_a = LIBGRACKETMZOBJS_la = $(MZOBJS) GRACKETLIBS_a = $(LDLIBS) $(@WXVARIANT@_LIBS) +======= +GRACKETLIBS_a = $(LDLIBS) +>>>>>>> C source and build changes to drop wx frm GRacket GRACKETLIBS_la = GRACKETMZOBJS_a = $(MZOBJS) GRACKETMZOBJS_la = -../libgracket3m.@LIBSFX@: $(XOBJS) $(MZOBJS) $(@WXVARIANT@_PLAIN_OBJS) $(EXTRA_MZ_OBJS) - $(NICEAR) $(AR) $(ARFLAGS) ../libgracket3m.@LIBSFX@ $(XOBJS) $(LIBGRACKETMZOBJS_@LIBSFX@) $(@WXVARIANT@_PLAIN_OBJS) $(EXTRA_MZ_OBJS) $(LIBGRACKETLIBS_@LIBSFX@) - $(RANLIB) ../libgracket3m.@LIBSFX@ +../gracket@MMM@@NOT_OSX@: grmain.@LTO@ ../../racket/libracket3m.@LIBSFX@ + $(GRACKETLINKER) $(GRACKETLDFLAGS) -o ../gracket@MMM@ grmain.@LTO@ ../../racket/libracket3m.@LIBSFX@ $(GRACKETMZOBJS_@LIBSFX@) $(GRACKETLIBS_@LIBSFX@) -../gracket@MMM@@NOT_OSX@: grmain.@LTO@ ../libgracket3m.@LIBSFX@ - $(GRACKETLINKER) $(GRACKETLDFLAGS) -o ../gracket@MMM@ grmain.@LTO@ ../libgracket3m.@LIBSFX@ $(GRACKETMZOBJS_@LIBSFX@) $(GRACKETLIBS_@LIBSFX@) +MZFW = ../../racket/Racket.framework/Versions/$(FWVERSION)_3m/Racket +MRAPPSKEL = ../GRacket@MMM@.app/Contents/MacOS -MRFW = GRacket.framework/Versions/$(FWVERSION)_3m/GRacket -MRFWRES = GRacket.framework/Versions/$(FWVERSION)_3m/Resources/GRacket.rsrc - -../GRacket@MMM@.app/Contents/MacOS/GRacket@MMM@: $(MRFWRES) $(MRFW) grmain.@LTO@ - $(GRACKETLINKER) $(LDFLAGS) -o ../GRacket@MMM@.app/Contents/MacOS/GRacket@MMM@ grmain.@LTO@ -Wl,-headerpad_max_install_names -F. -framework GRacket -framework Carbon -framework Cocoa - mkdir -p "../GRacket.framework/Versions/$(FWVERSION)_3m" - cp "$(MRFW)" "../$(MRFW)" - rm -rf "../GRacket.framework/Versions/$(FWVERSION)_3m/Resources" - cp -r "GRacket.framework/Versions/$(FWVERSION)_3m/Resources" "../GRacket.framework/Versions/$(FWVERSION)_3m/Resources" - /usr/bin/install_name_tool -change "GRacket.framework/Versions/$(FWVERSION)_3m/GRacket" "@executable_path/../../../GRacket.framework/Versions/$(FWVERSION)_3m/GRacket" "../GRacket@MMM@.app/Contents/MacOS/GRacket@MMM@" +../GRacket@MMM@.app/Contents/MacOS/GRacket@MMM@: $(MRAPPSKEL) $(MZFW) grmain.@LTO@ + $(GRACKETLINKER) $(LDFLAGS) -o ../GRacket@MMM@.app/Contents/MacOS/GRacket@MMM@ grmain.@LTO@ -Wl,-headerpad_max_install_names -F../../racket/gc2 -framework Racket -framework CoreFoundation + /usr/bin/install_name_tool -change "Racket.framework/Versions/$(FWVERSION)_3m/Racket" "@executable_path/../../../../racket/Racket.framework/Versions/$(FWVERSION)_3m/Racket" "../GRacket@MMM@.app/Contents/MacOS/GRacket@MMM@" $(MRFW) : $(XOBJS) $(@WXVARIANT@_PLAIN_OBJS) ../../racket/libracket3m.@LIBSFX@ wx_font.o wx_file_dialog.o $(MRFWRES) $(GRACKETLINKER) $(LDFLAGS) -dynamiclib -o $(MRFW) -Wl,-headerpad_max_install_names $(XOBJS) $(@WXVARIANT@_PLAIN_OBJS) ../../racket/libracket3m.@LIBSFX@ $(@WXVARIANT@_LIBS) @X_EXTRA_LIBS@ wx_font.o wx_file_dialog.o -$(MRFWRES): $(srcdir)/../../mac/osx_appl.rkt $(srcdir)/../../mac/cw/GRacket.r - rm -rf GRacket.framework/Resources GRacket.framework/GRacket +$(MRAPPSKEL): $(srcdir)/../../mac/osx_appl.rkt env BUILDBASE=../.. BUILDING_3M=yes ../../racket/racket@CGC@ -cqu $(srcdir)/../../mac/osx_appl.rkt $(srcdir)/../.. "@MMM@" - ln -s Versions/$(FWVERSION)_3m/GRacket GRacket.framework/GRacket - ln -s Versions/$(FWVERSION)_3m/Resources GRacket.framework/Resources ../gracket@MMM@@OSX@ : - $(MAKE) macxsrc/xform_precomp.h $(MAKE) ../GRacket@MMM@.app/Contents/MacOS/GRacket@MMM@ xsrc: mkdir xsrc -macxsrc: - mkdir macxsrc -XSRC_EXTRA_DIR_wx_xt = -XSRC_EXTRA_DIR_wx_mac = macxsrc - -3m: xsrc $(XSRC_EXTRA_DIR_@WXVARIANT@) +3m: xsrc $(MAKE) ../gracket@MMM@ ######################################## # Make Depends # ######################################## -gen-deps: - ../../racket/racket@MMM@ -cqu "$(srcdir)/gen-deps.rkt" +GRMAIN_DEPS = $(srcdir)/../grmain.c \ + $(srcdir)/../../racket/main.c \ + $(srcdir)/../../racket/include/scheme.h \ + $(srcdir)/../../racket/include/../sconfig.h \ + ../../racket/mzconfig.h \ + $(srcdir)/../../racket/include/../uconfig.h \ + $(srcdir)/../../racket/include/../src/stypes.h \ + $(srcdir)/../../racket/include/../gc2/gc2_obj.h \ + $(srcdir)/../../racket/include/schthread.h \ + $(srcdir)/../../racket/include/../src/schexn.h \ + $(srcdir)/../../racket/include/../gc2/gc2.h \ + $(srcdir)/../../racket/include/../gc2/../include/schthread.h \ + $(srcdir)/../../racket/include/../src/schemef.h \ + $(srcdir)/../../racket/cmdline.inc -@INCLUDEDEP@ grmain.dd -@INCLUDEDEP@ gracket.dd -@INCLUDEDEP@ gracketx.dd -@INCLUDEDEP@ gracketmac.dd -@INCLUDEDEP@ wb_item.dd -@INCLUDEDEP@ wb_panel.dd -@INCLUDEDEP@ wb_timer.dd -@INCLUDEDEP@ wb_frame.dd -@INCLUDEDEP@ wb_list.dd -@INCLUDEDEP@ PSDC.dd -@INCLUDEDEP@ wb_types.dd -@INCLUDEDEP@ wb_canvs.dd -@INCLUDEDEP@ wb_gdi.dd -@INCLUDEDEP@ wb_main.dd -@INCLUDEDEP@ wb_utils.dd -@INCLUDEDEP@ wb_data.dd -@INCLUDEDEP@ wb_hash.dd -@INCLUDEDEP@ wb_stdev.dd -@INCLUDEDEP@ wb_win.dd -@INCLUDEDEP@ wb_dc.dd -@INCLUDEDEP@ wb_sysev.dd -@INCLUDEDEP@ wb_dialg.dd -@INCLUDEDEP@ wb_obj.dd -@INCLUDEDEP@ xfspline.dd -@INCLUDEDEP@ wx_choic.dd -@INCLUDEDEP@ wx_main.dd -@INCLUDEDEP@ wx_clipb.dd -@INCLUDEDEP@ wx_menu.dd -@INCLUDEDEP@ wx_messg.dd -@INCLUDEDEP@ wxBorder.dd -@INCLUDEDEP@ wx_dc.dd -@INCLUDEDEP@ wxBorderArea.dd -@INCLUDEDEP@ wx_dccan1.dd -@INCLUDEDEP@ wx_mnuit.dd -@INCLUDEDEP@ wxButtonBorder.dd -@INCLUDEDEP@ wx_dccan2.dd -@INCLUDEDEP@ wx_dccan3.dd -@INCLUDEDEP@ wx_panel.dd -@INCLUDEDEP@ wxLabelArea.dd -@INCLUDEDEP@ wx_dcmem.dd -@INCLUDEDEP@ wx_print.dd -@INCLUDEDEP@ wxMacDC.dd -@INCLUDEDEP@ wx_dcpr1.dd -@INCLUDEDEP@ wx_rbox.dd -@INCLUDEDEP@ wx_rbut.dd -@INCLUDEDEP@ wx_sbar.dd -@INCLUDEDEP@ wx_dialg.dd -@INCLUDEDEP@ wx_screen.dd -@INCLUDEDEP@ wxRectBorder.dd -@INCLUDEDEP@ wx_slidr.dd -@INCLUDEDEP@ wxScroll.dd -@INCLUDEDEP@ wx_frame.dd -@INCLUDEDEP@ wxScrollArea.dd -@INCLUDEDEP@ wx_gauge.dd -@INCLUDEDEP@ wxScrollData.dd -@INCLUDEDEP@ wx_gdi.dd -@INCLUDEDEP@ wx_app.dd -@INCLUDEDEP@ wx_util.dd -@INCLUDEDEP@ wx_area.dd -@INCLUDEDEP@ wx_win.dd -@INCLUDEDEP@ wx_buttn.dd -@INCLUDEDEP@ wx_item.dd -@INCLUDEDEP@ wximgfil.dd -@INCLUDEDEP@ wx_canvs.dd -@INCLUDEDEP@ wx_lbox.dd -@INCLUDEDEP@ wx_check.dd -@INCLUDEDEP@ wx_tabc.dd -@INCLUDEDEP@ wx_gbox.dd -@INCLUDEDEP@ wx_mac_utils.dd -@INCLUDEDEP@ wx_bmp.dd -@INCLUDEDEP@ wx_24to8.dd -@INCLUDEDEP@ wx_image.dd -@INCLUDEDEP@ wx_xbm.dd -@INCLUDEDEP@ AppMain.dd -@INCLUDEDEP@ GlobalData.dd -@INCLUDEDEP@ Object.dd -@INCLUDEDEP@ TypeTree.dd -@INCLUDEDEP@ wb_hash.dd -@INCLUDEDEP@ wb_list.dd -@INCLUDEDEP@ DC.dd -@INCLUDEDEP@ MemoryDC.dd -@INCLUDEDEP@ PSDC.dd -@INCLUDEDEP@ WindowDC.dd -@INCLUDEDEP@ FileDialog.dd -@INCLUDEDEP@ MessageBox.dd -@INCLUDEDEP@ wb_stdev.dd -@INCLUDEDEP@ wb_sysev.dd -@INCLUDEDEP@ EvtHandler.dd -@INCLUDEDEP@ GDI-Bitmap.dd -@INCLUDEDEP@ GDI-Colour.dd -@INCLUDEDEP@ GDI-Font.dd -@INCLUDEDEP@ GDI-FontDirectory.dd -@INCLUDEDEP@ GDI-Pen+Brush.dd -@INCLUDEDEP@ Timer.dd -@INCLUDEDEP@ Clipboard.dd -@INCLUDEDEP@ Application.dd -@INCLUDEDEP@ Assert.dd -@INCLUDEDEP@ BusyCursor.dd -@INCLUDEDEP@ Date+Time.dd -@INCLUDEDEP@ Directory.dd -@INCLUDEDEP@ Error.dd -@INCLUDEDEP@ GDI.dd -@INCLUDEDEP@ Home.dd -@INCLUDEDEP@ Misc.dd -@INCLUDEDEP@ Net.dd -@INCLUDEDEP@ Path.dd -@INCLUDEDEP@ Resources.dd -@INCLUDEDEP@ String.dd -@INCLUDEDEP@ TempFile.dd -@INCLUDEDEP@ Button.dd -@INCLUDEDEP@ Canvas.dd -@INCLUDEDEP@ CheckBox.dd -@INCLUDEDEP@ Choice.dd -@INCLUDEDEP@ DialogBox.dd -@INCLUDEDEP@ Frame.dd -@INCLUDEDEP@ Gauge.dd -@INCLUDEDEP@ Item.dd -@INCLUDEDEP@ Layout.dd -@INCLUDEDEP@ ListBox.dd -@INCLUDEDEP@ Menu.dd -@INCLUDEDEP@ MenuBar.dd -@INCLUDEDEP@ Message.dd -@INCLUDEDEP@ Panel.dd -@INCLUDEDEP@ RadioBox.dd -@INCLUDEDEP@ Slider.dd -@INCLUDEDEP@ Window.dd -@INCLUDEDEP@ wx_style.dd -@INCLUDEDEP@ wx_keym.dd -@INCLUDEDEP@ wx_mbuf.dd -@INCLUDEDEP@ xcglue.dd -@INCLUDEDEP@ wxs_bmap.dd -@INCLUDEDEP@ wxs_butn.dd -@INCLUDEDEP@ wxs_chce.dd -@INCLUDEDEP@ wxs_ckbx.dd -@INCLUDEDEP@ wxs_cnvs.dd -@INCLUDEDEP@ wxs_dc.dd -@INCLUDEDEP@ wxs_evnt.dd -@INCLUDEDEP@ wxs_fram.dd -@INCLUDEDEP@ wxs_gage.dd -@INCLUDEDEP@ wxs_gdi.dd -@INCLUDEDEP@ wxs_glob.dd -@INCLUDEDEP@ wxs_item.dd -@INCLUDEDEP@ wxs_lbox.dd -@INCLUDEDEP@ wxs_menu.dd -@INCLUDEDEP@ wxs_misc.dd -@INCLUDEDEP@ wxs_obj.dd -@INCLUDEDEP@ wxs_panl.dd -@INCLUDEDEP@ wxs_rado.dd -@INCLUDEDEP@ wxs_slid.dd -@INCLUDEDEP@ wxs_tabc.dd -@INCLUDEDEP@ wxs_win.dd -@INCLUDEDEP@ wxscheme.dd -@INCLUDEDEP@ wxJPEG.dd +xsrc/grmain.c: $(GRMAIN_DEPS) + +grmain.@LTO@: $(GRMAIN_DEPS) diff --git a/src/gracket/grmain.c b/src/gracket/grmain.c new file mode 100644 index 0000000000..17e291e731 --- /dev/null +++ b/src/gracket/grmain.c @@ -0,0 +1,565 @@ +/* + * File: mred.c + * Purpose: GRacket main file, including a hodge-podge of global stuff + * Author: Matthew Flatt + * Created: 1995 + * Copyright: (c) 2004-2010 PLT Scheme Inc. + * Copyright: (c) 1995-2000, Matthew Flatt + */ + +#ifdef WIN32 +/* Hack: overwrite "y" with "n" in binary to disable checking for another + instance of the same app. */ +char *check_for_another = "yes, please check for another"; +static int wx_in_terminal = 0; +# define MZ_DEFINE_UTF8_MAIN +#endif + +#ifdef wx_x +# define INIT_FILENAME "~/.gracketrc" +#else +# ifdef WIN32 +# define INIT_FILENAME "%%HOMEDIRVE%%\\%%HOMEPATH%%\\gracketrc.rktd" +# else +# ifdef OS_X +# define INIT_FILENAME "~/.gracketrc" +# else +# define INIT_FILENAME "PREFERENCES:gracketrc.rktd" +# endif +# endif +#endif +#define GET_INIT_FILENAME get_init_filename +#if WIN32 +# define NEED_CONSOLE_PRINTF +# define DEFER_EXPLICIT_EXIT +#else +# define PRINTF printf +#endif +#define PROGRAM "GRacket" +#define PROGRAM_LC "gracket" +#define INITIAL_BIN_TYPE "ri" + +#define CMDLINE_STDIO_FLAG +#define YIELD_BEFORE_EXIT +#define INITIAL_NAMESPACE_MODULE "scheme/gui/init" +#define GRAPHICAL_REPL + +static void yield_indefinitely(); + +# include "../racket/main.c" + +static void yield_indefinitely() +{ +#ifdef MZ_PRECISE_GC + void *dummy; +#endif + mz_jmp_buf * volatile save, newbuf; + Scheme_Thread * volatile p; + Scheme_Object *a[2], *yld; + + p = scheme_get_current_thread(); + save = p->error_buf; + p->error_buf = &newbuf; + + if (!scheme_setjmp(newbuf)) { + a[0] = scheme_intern_symbol("mred/mred"); + a[1] = scheme_intern_symbol("yield"); + yld = scheme_dynamic_require(2, a); + + a[0] = scheme_intern_symbol("wait"); + scheme_apply(yld, 1, a); + } + + p->error_buf = save; + +#ifdef MZ_PRECISE_GC + dummy = NULL; /* makes xform think that dummy is live, so we get a __gc_var_stack__ */ +#endif +} + +#ifdef WIN32 + +static void MrEdSchemeMessages(char *, ...); +static Scheme_Object *stdin_pipe; + +static HANDLE console_out; +static HANDLE console_in; +static Scheme_Object *console_inport; +static HWND console_hwnd; +static int has_stdio, stdio_kills_prog; +static HANDLE waiting_sema; + +typedef HWND (WINAPI* gcw_proc)(); + +static void init_console_in() +{ + if (!console_in) { + console_in = GetStdHandle(STD_INPUT_HANDLE); + MZ_REGISTER_STATIC(console_inport); + console_inport = scheme_make_fd_input_port((int)console_in, scheme_intern_symbol("stdin"), 0, 0); + } +} + +static BOOL WINAPI ConsoleHandler(DWORD op) +{ + if (stdio_kills_prog) { + ReleaseSemaphore(waiting_sema, 1, NULL); + } else { + scheme_break_main_thread(); + scheme_signal_received(); + } + return TRUE; +} + +static void WaitOnConsole() +{ + DWORD wrote; + + stdio_kills_prog = 1; + if (console_hwnd) { + AppendMenu(GetSystemMenu(console_hwnd, FALSE), + MF_STRING, + SC_CLOSE, + "Close"); + /* Un-gray the close box: */ + RedrawWindow(console_hwnd, NULL, NULL, + RDW_FRAME | RDW_INVALIDATE | RDW_UPDATENOW); + } + + WriteConsole(console_out, "\n[Exited. Close box or Ctrl-C closes the console.]\n", 51, &wrote, NULL); + + WaitForSingleObject(waiting_sema, INFINITE); +} + +static void MrEdSchemeMessages(char *msg, ...) +{ + GC_CAN_IGNORE va_list args; + + scheme_start_atomic(); + + XFORM_HIDE_EXPR(va_start(args, msg)); + + if (!console_out) { + AllocConsole(); + console_out = GetStdHandle(STD_OUTPUT_HANDLE); + + if (!wx_in_terminal) { + has_stdio = 1; + waiting_sema = CreateSemaphore(NULL, 0, 1, NULL); + SetConsoleCtrlHandler(ConsoleHandler, TRUE); + + { + HMODULE hm; + gcw_proc gcw; + + hm = LoadLibrary("kernel32.dll"); + if (hm) + gcw = (gcw_proc)GetProcAddress(hm, "GetConsoleWindow"); + else + gcw = NULL; + + if (gcw) + console_hwnd = gcw(); + } + + if (console_hwnd) { + EnableMenuItem(GetSystemMenu(console_hwnd, FALSE), SC_CLOSE, + MF_BYCOMMAND | MF_GRAYED); + RemoveMenu(GetSystemMenu(console_hwnd, FALSE), SC_CLOSE, MF_BYCOMMAND); + } + } + } + + if (!msg) { + char *s; + long l, d; + DWORD wrote; + + s = va_arg(args, char*); + d = va_arg(args, long); + l = va_arg(args, long); + + WriteConsole(console_out, s XFORM_OK_PLUS d, l, &wrote, NULL); + } else { + char *buffer; + DWORD wrote; + buffer = (char *)malloc(5 * strlen(msg)); + vsprintf(buffer, msg, args); + WriteConsole(console_out, buffer, strlen(buffer), &wrote, NULL); + free(buffer); + } + + scheme_end_atomic_no_swap(); + + XFORM_HIDE_EXPR(va_end(args)); +} + +static void MrEdSchemeMessagesOutput(char *s, long l) +{ + if (l) + MrEdSchemeMessages(NULL, s, 0, l); +} + +static Scheme_Object *console_reading; + +static void add_console_reading() +{ + Scheme_Thread *thread; + thread = scheme_get_current_thread(); + + if (!console_reading) { + MZ_REGISTER_STATIC(console_reading); + console_reading = scheme_make_null(); + } + + console_reading = scheme_make_pair((Scheme_Object *)thread, + console_reading); +} + +static void remove_console_reading() +{ + Scheme_Object *p, *prev = NULL; + Scheme_Thread *thread; + thread = scheme_get_current_thread(); + + if (!console_reading) + return; + + p = console_reading; + while (SCHEME_PAIRP(p)) { + if (SAME_OBJ(SCHEME_CAR(p), (Scheme_Object *)thread)) { + if (prev) + SCHEME_CDR(prev) = SCHEME_CDR(p); + else + console_reading = SCHEME_CDR(p); + return; + } + prev = p; + p = SCHEME_CDR(p); + } +} + +static void break_console_reading_threads() +{ + Scheme_Object *p; + + if (!console_reading) + return; + + for (p = console_reading; SCHEME_PAIRP(p); p = SCHEME_CDR(p)) { + scheme_break_thread((Scheme_Thread *)SCHEME_CAR(p)); + } +} + +static long mrconsole_get_string(Scheme_Input_Port *ip, + char *buffer, long offset, long size, + int nonblock, Scheme_Object *unless) +{ + long result; + Scheme_Object *pipe = (Scheme_Object *)ip->port_data; + MrEdSchemeMessages(""); + + init_console_in(); + pipe = console_inport; + + add_console_reading(); + result = scheme_get_byte_string_unless("console get-string", pipe, + buffer, offset, size, + nonblock, 0, NULL, + unless); + remove_console_reading(); + return result; +} + +static Scheme_Object *mrconsole_progress_evt(Scheme_Input_Port *ip) +{ + Scheme_Object *pipe = (Scheme_Object *)ip->port_data; + MrEdSchemeMessages(""); + + init_console_in(); + pipe = console_inport; + + return scheme_progress_evt(pipe); +} + +static int mrconsole_peeked_read(Scheme_Input_Port *ip, + long amount, + Scheme_Object *unless, + Scheme_Object *target_ch) +{ + Scheme_Object *pipe = (Scheme_Object *)ip->port_data; + MrEdSchemeMessages(""); + + init_console_in(); + pipe = console_inport; + + return scheme_peeked_read(pipe, amount, unless, target_ch); +} + +static int mrconsole_char_ready(Scheme_Input_Port *ip) +{ + Scheme_Object *pipe = (Scheme_Object *)ip->port_data; + MrEdSchemeMessages(""); + + init_console_in(); + pipe = console_inport; + + return scheme_char_ready(pipe); +} + +static void mrconsole_close(Scheme_Input_Port *ip) +{ + Scheme_Object *pipe = (Scheme_Object *)ip->port_data; + + init_console_in(); + pipe = console_inport; + + scheme_close_input_port(pipe); +} + +static Scheme_Object *MrEdMakeStdIn(void) +{ + Scheme_Object *readp; + Scheme_Input_Port *ip; + + MZ_REGISTER_STATIC(stdin_pipe); + + scheme_pipe(&readp, &stdin_pipe); + + ip = scheme_make_input_port(scheme_make_port_type("mred-console-input-port"), + readp, + scheme_intern_symbol("mred-console"), + mrconsole_get_string, + NULL, + mrconsole_progress_evt, + mrconsole_peeked_read, + mrconsole_char_ready, + mrconsole_close, + NULL, + 0); + + return (Scheme_Object *)ip; +} + +static long stdout_write(Scheme_Output_Port*op, const char *s, long d, long l, + int rarely_block, int enable_break) +{ + if (l) + MrEdSchemeMessages(NULL, s, d, l); + return l; +} + +static Scheme_Object *MrEdMakeStdOut(void) +{ + Scheme_Object *outtype; + + outtype = scheme_make_port_type("stdout"); + + return (Scheme_Object *)scheme_make_output_port(outtype, NULL, + scheme_intern_symbol("mred-console"), + scheme_write_evt_via_write, + stdout_write, + NULL, NULL, NULL, NULL, NULL, 0); +} + +static long stderr_write(Scheme_Output_Port*op, const char *s, long d, long l, + int rarely_block, int enable_break) +{ + if (l) + MrEdSchemeMessages(NULL, s, d, l); + return l; +} + +static Scheme_Object *MrEdMakeStdErr(void) +{ + Scheme_Object *errtype; + + errtype = scheme_make_port_type("stderr"); + + return (Scheme_Object *)scheme_make_output_port(errtype, NULL, + scheme_intern_symbol("mred-console"), + scheme_write_evt_via_write, + stderr_write, + NULL, NULL, NULL, NULL, NULL, 0); +} + +static void MrEdExit(int v) +{ + if (has_stdio) { + WaitOnConsole(); + } + + scheme_immediate_exit(v); +} + +# ifdef MZ_PRECISE_GC +START_XFORM_SKIP; +# endif + +char *wchar_to_char(wchar_t *wa, int len) +{ + char *a; + int l; + + l = scheme_utf8_encode((unsigned int *)wa, 0, len, + NULL, 0, + 1 /* UTF-16 */); + a = (char *)malloc(l + 1); + scheme_utf8_encode((unsigned int *)wa, 0, len, + (unsigned char *)a, 0, + 1 /* UTF-16 */); + a[l] = 0; + + return a; +} + +static int parse_command_line(char ***_command, char *buf) +{ + GC_CAN_IGNORE unsigned char *parse, *created, *write; + int maxargs; + int findquote = 0; + char **command; + int count = 0; + + maxargs = 49; + command = (char **)malloc((maxargs + 1) * sizeof(char *)); + + parse = created = write = (unsigned char *)buf; + while (*parse) { + while (*parse && isspace(*parse)) { parse++; } + while (*parse && (!isspace(*parse) || findquote)) { + if (*parse== '"') { + findquote = !findquote; + } else if (*parse== '\\') { + GC_CAN_IGNORE unsigned char *next; + for (next = parse; *next == '\\'; next++) { } + if (*next == '"') { + /* Special handling: */ + int count = (next - parse), i; + for (i = 1; i < count; i += 2) { + *(write++) = '\\'; + } + parse += (count - 1); + if (count & 0x1) { + *(write++) = '\"'; + parse++; + } + } else + *(write++) = *parse; + } else + *(write++) = *parse; + parse++; + } + if (*parse) + parse++; + *(write++) = 0; + + if (*created) { + command[count++] = (char *)created; + if (count == maxargs) { + char **c2; + c2 = (char **)malloc(((2 * maxargs) + 1) * sizeof(char *)); + memcpy(c2, command, maxargs * sizeof(char *)); + maxargs *= 2; + } + } + created = write; + } + + command[count] = NULL; + *_command = command; + + return count; +} + +int APIENTRY WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR ignored, int nCmdShow) +{ + LPWSTR m_lpCmdLine; + int j, argc, l; + char *a, **argv, *normalized_path; + + /* Order matters: load dependencies first */ +# ifndef MZ_PRECISE_GC + load_delayed_dll(NULL, "libmzgcxxxxxxx.dll"); +# endif + load_delayed_dll(NULL, "libmzsch" DLL_3M_SUFFIX "xxxxxxx.dll"); + record_dll_path(); + + { + HANDLE h; + h = GetStdHandle(STD_OUTPUT_HANDLE); + if (h && (h != INVALID_HANDLE_VALUE) + && (GetFileType(h) != FILE_TYPE_UNKNOWN)) { + wx_in_terminal = 1; + } + } + + /* Get command line: */ + m_lpCmdLine = GetCommandLineW(); + for (j = 0; m_lpCmdLine[j]; j++) { + } + a = wchar_to_char(m_lpCmdLine, j); + + argc = parse_command_line(&argv, a); + + /* argv[0] should be the name of the executable, but Windows doesn't + specify really where this name comes from, so we get it from + GetModuleFileName, just in case */ + { + int name_len = 1024; + while (1) { + wchar_t *my_name; + my_name = (wchar_t *)malloc(sizeof(wchar_t) * name_len); + l = GetModuleFileNameW(NULL, my_name, name_len); + if (!l) { + name_len = GetLastError(); + free(my_name); + my_name = NULL; + break; + } else if (l < name_len) { + a = wchar_to_char(my_name, l); + argv[0] = a; + { + /* CharLowerBuff doesn't work with unicows.dll -- strange. + So we use CharLower, instead. */ + int i; + for (i = 0; i < l; i++) { + CharLowerW(my_name XFORM_OK_PLUS i); + } + } + normalized_path = wchar_to_char(my_name, l); + free(my_name); + break; + } else { + free(my_name); + name_len = name_len * 2; + } + } + } + + if (!wx_in_terminal) { + scheme_set_stdio_makers(MrEdMakeStdIn, + MrEdMakeStdOut, + MrEdMakeStdErr); + scheme_set_console_output(MrEdSchemeMessagesOutput); + } + scheme_set_console_printf(MrEdSchemeMessages); + scheme_set_exit(MrEdExit); + + j = main(argc, argv); + + MrEdExit(j); + /* shouldn't get here */ + + return j; +} + +# ifdef MZ_PRECISE_GC +END_XFORM_SKIP; +# endif + +#if _MSC_VER >= 1400 +#pragma comment(linker,"/manifestdependency:\"type='win32' name='Microsoft.Windows.Common-Controls' version='6.0.0.0' processorArchitecture='*' publicKeyToken='6595b64144ccf1df' language='*'\"") +#endif + +#endif diff --git a/src/gracket/grmain.cxx b/src/gracket/grmain.cxx index 118487e3c0..a1357646f5 100644 --- a/src/gracket/grmain.cxx +++ b/src/gracket/grmain.cxx @@ -111,7 +111,9 @@ extern "C" Scheme_Object *scheme_initialize(Scheme_Env *env); # endif #endif #define GET_INIT_FILENAME get_init_filename -#if REDIRECT_STDIO || WINDOW_STDIO || WCONSOLE_STDIO +#if wx_msw +# define NEED_MRED_EXIT +static void MrEdExit(int v); # define PRINTF mred_console_printf # define CMDLINE_FFLUSH(x) /* nothing */ static void (*mred_console_printf)(char *str, ...); @@ -459,88 +461,17 @@ static int parse_command_line(char ***_command, char *buf) return count; } -static char *CreateUniqueName() -{ - char desktop[MAX_PATH], session[32], *together; - int dlen, slen; - - { - // Name should be desktop unique, so add current desktop name - HDESK hDesk; - ULONG cchDesk = MAX_PATH - 1; - - hDesk = GetThreadDesktop(GetCurrentThreadId()); - - if (!GetUserObjectInformation( hDesk, UOI_NAME, desktop, cchDesk, &cchDesk)) - desktop[0] = 0; - else - desktop[MAX_PATH - 1] = 0; - } - - { - // Name should be session unique, so add current session id - HANDLE hToken = NULL; - // Try to open the token (fails on Win9x) and check necessary buffer size - if (OpenProcessToken(GetCurrentProcess(), TOKEN_QUERY, &hToken)) { - DWORD cbBytes = 0; - - if(!GetTokenInformation( hToken, TokenStatistics, NULL, cbBytes, &cbBytes ) - && GetLastError() == ERROR_INSUFFICIENT_BUFFER) { - PTOKEN_STATISTICS pTS; - - pTS = (PTOKEN_STATISTICS)malloc(cbBytes); - - if(GetTokenInformation(hToken, TokenStatistics, (LPVOID)pTS, cbBytes, &cbBytes)) { - sprintf(session, "-%08x%08x-", - pTS->AuthenticationId.HighPart, - pTS->AuthenticationId.LowPart); - } else - session[0] = 0; - free(pTS); - } else { - session[0] = 0; - } - } else - session[0] = 0; - } - - dlen = strlen(desktop); - slen = strlen(session); - together = (char *)malloc(slen + dlen + 1); - memcpy(together, desktop, dlen); - memcpy(together + dlen, session, slen); - together[dlen + slen] = 0; - - return together; -} - -/* To propagate args from WinMain to wxWinMain via - scheme_main_stack_setup: */ -typedef struct { - int wm_is_mred; - HINSTANCE hInstance; - HINSTANCE hPrevInstance; - int argc; - char **argv; - int nCmdShow; -} WinMain_Args; - -static int WinMain_after_stack(void *_wma) -{ - WinMain_Args *wma = (WinMain_Args *)_wma; - - return wxWinMain(wma->wm_is_mred, wma->hInstance, wma->hPrevInstance, - wma->argc, wma->argv, - wma->nCmdShow, - main_after_stack); -} - -int APIENTRY WinMain_dlls_ready(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR ignored, int nCmdShow) +int APIENTRY WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR ignored, int nCmdShow) { LPWSTR m_lpCmdLine; - long argc, j, l; - char *a, **argv, *b, *normalized_path = NULL; - WinMain_Args wma; + int wx_in_terminal = 0; + + /* Order matters: load dependencies first */ +# ifndef MZ_PRECISE_GC + load_delayed_dll(NULL, "libmzgcxxxxxxx.dll"); +# endif + load_delayed_dll(NULL, "libmzsch" DLL_3M_SUFFIX "xxxxxxx.dll"); + record_dll_path(); /* Get command line: */ m_lpCmdLine = GetCommandLineW(); diff --git a/src/mac/cw/MrStarter.r b/src/mac/cw/MrStarter.r index 1d72181464..e69de29bb2 100644 --- a/src/mac/cw/MrStarter.r +++ b/src/mac/cw/MrStarter.r @@ -1,196 +0,0 @@ -data 'BNDL' (128) { - $"4D72 5374 0000 0001 4652 4546 0001 0000" /* MrSt....FREF.... */ - $"0080 0001 0081 4943 4E23 0001 0000 0082" /* ....ICN#..... */ - $"0001 0000" /* .... */ -}; - -data 'cmdl' (128) { - $"2D65 2027 2864 6973 706C 6179 2022 6869" /* -e '(display "hi */ - $"2229 27" /* ")' */ -}; - -data 'ALRT' (128) { - $"0065 0054 00EF 0184 0080 5555 300A" /* .e.T...UU0 */ -}; - -data 'DITL' (128) { - $"0002 0000 0000 006C 0089 0080 00C3 0402" /* .......l..... */ - $"4F4B 0000 0000 0007 000C 0039 0122 8802" /* OK.........9.". */ - $"5E30 0000 0000 003A 000C 0064 0122 8802" /* ^0.....:...d.". */ - $"5E31" /* ^1 */ -}; - -data 'icl8' (130) { - $"0000 0000 0000 0000 0000 0000 00F5 2BF7" /* .............+ */ - $"F7F7 F500 0000 0000 0000 0000 0000 0000" /* ............. */ - $"0000 0000 0000 0000 0000 F8FB F2F1 D4EB" /* .......... */ - $"ECD3 EEAA 802B 0000 0000 0000 0000 0000" /* +.......... */ - $"0000 0000 0000 0000 56FB FAF7 F5F5 F7AB" /* ........V */ - $"D2D2 D2D2 D2D3 AAF7 0000 0000 0000 0000" /* Ӫ........ */ - $"0000 0000 0000 F688 885D 6464 F900 00F5" /* ......]dd.. */ - $"AAD2 D2D2 D2D2 D2D3 FBF5 0000 0000 0000" /* ...... */ - $"0000 0000 00F7 6B23 2323 2323 D9F7 0000" /* .....k#####.. */ - $"F7D3 D2D2 D2D2 D2D2 D2AA F600 0000 0000" /* Ҫ..... */ - $"0000 0000 F7DA 2323 2323 2323 23DB 0000" /* ....#######.. */ - $"00AA D2D2 D2D2 D2D2 D2D2 D4F6 0000 0000" /* ..... */ - $"0000 00F6 6B23 2323 2323 2323 23D8 F800" /* ...k########. */ - $"00F9 D2D2 D2D2 D2D2 D2D2 D2AB 0000 0000" /* .ҫ.... */ - $"0000 0088 2323 2323 2323 2323 2323 6400" /* ...##########d. */ - $"00F6 EED2 D2D2 D2D2 D2D2 D2D2 8000 0000" /* .Ҁ... */ - $"0000 56D8 2323 2323 2323 2323 2323 6B00" /* ..V##########k. */ - $"0000 AAD2 D2D2 D2D2 D2D2 D2D2 D32B 0000" /* ..+.. */ - $"0000 DB23 2323 2323 2323 2323 2323 472B" /* ..###########G+ */ - $"0000 F9D2 D2D2 D2D2 D2D2 D2D2 D2AA 0000" /* ..Ҫ.. */ - $"00F8 D723 2323 2323 2323 2323 2323 D7F8" /* .########### */ - $"0000 F6EE D2D2 D2D2 D2D2 D2D2 D2ED 2B00" /* ..+. */ - $"0064 2323 2323 2323 2323 2323 2323 D7F8" /* .d############ */ - $"0000 00AA D2D2 D2D2 D2D2 D2D2 D2D2 FA00" /* .... */ - $"006B 2323 2323 2323 2323 2323 2323 D9F6" /* .k############ */ - $"0000 00F8 ECD2 D2D2 D2D2 D2D2 D2D2 AA00" /* ...Ҫ. */ - $"F6D9 2323 2323 2323 2323 2323 2323 DB00" /* ############. */ - $"F600 0000 D4D2 D2D2 D2D2 D2D2 D2D2 D400" /* .... */ - $"F7D7 2323 2323 2323 2323 2323 2323 FA5D" /* ############] */ - $"DBF6 0000 FAD2 D2D2 D2D2 D2D2 D2D2 EDF6" /* .. */ - $"56D7 2323 2323 2323 2323 2323 23DA 2B6B" /* V###########+k */ - $"235D 0000 F6ED D2D2 D2D2 D2D2 D2D2 D32B" /* #]..+ */ - $"56D7 2323 2323 2323 2323 2323 235D F9D7" /* V###########] */ - $"236B F500 00AA D2D2 D2D2 D2D2 D2D2 D32B" /* #k..+ */ - $"F7D8 2323 2323 2323 2323 2323 6BF6 6423" /* ##########kd# */ - $"2323 F900 00F8 EBD2 D2D2 D2D2 D2D2 EEF5" /* ##.. */ - $"F6D9 2323 2323 2323 2323 23D7 FAF8 D823" /* ########## */ - $"2323 6400 0000 EFD2 D2D2 D2D2 D2D2 D400" /* ##d.... */ - $"006B 2323 2323 2323 2323 23DB 0064 2323" /* .k#########.d## */ - $"2323 47F7 0000 F9EB D2D2 D2D2 D2D2 AA00" /* ##G..Ҫ. */ - $"0064 2323 2323 2323 2323 D856 F6DA 2323" /* .d########V## */ - $"2323 235D 0000 00D4 D2D2 D2D2 D2D2 8000" /* ###]...Ҁ. */ - $"00F8 D823 2323 2323 2323 6400 5D23 2323" /* .#######d.]### */ - $"2323 236B F500 00F9 EBD2 D2D2 D2ED 2B00" /* ###k..+. */ - $"0000 DB23 2323 2323 2347 F7F5 6B23 2323" /* ..######Gk### */ - $"2323 23D7 5600 00F5 D4D2 D2D2 D2AB 0000" /* ###V..ҫ.. */ - $"0000 56D8 2323 2323 2388 00F9 D723 2323" /* ..V#####.### */ - $"2323 2323 6400 0000 F9EB E3E3 ED2B 0000" /* ####d...+.. */ - $"0000 0088 2323 2323 DA2B 0064 2323 2323" /* ...####+.d#### */ - $"2323 2323 D9F6 0000 F5EF E3CB E300 0000" /* ####..... */ - $"0000 00F6 6B23 2323 5D00 F7D8 2323 2323" /* ...k###].#### */ - $"2323 2323 23E3 E3E3 E3E3 E3CB CBE3 0000" /* #####.. */ - $"0000 0000 F7DA 236B F500 6423 2323 2323" /* ....#k.d##### */ - $"2323 2323 23E3 CBCB CBCB CBCB CBCB E300" /* #####. */ - $"0000 0000 00F7 DB56 00F7 D923 2323 2323" /* .....V.##### */ - $"2323 2323 23E3 CBCB CBCB CBCB CBCB CBE3" /* ##### */ - $"0000 0000 0000 F6FC 8FD9 2323 2323 2323" /* ......###### */ - $"2323 2323 23E3 CBCB CBCB CBCB CBCB E300" /* #####. */ - $"0000 0000 0000 0000 F864 4723 2323 2323" /* ........dG##### */ - $"2323 2323 23E3 E3E3 E3E3 E3CB CBE3 0000" /* #####.. */ - $"0000 0000 0000 0000 0000 F75D DBDA 47D7" /* ..........]G */ - $"D747 6B64 5D2B 0000 0000 E3CB E300 0000" /* Gkd]+....... */ - $"0000 0000 0000 0000 0000 0000 00F5 2B2B" /* .............++ */ - $"2B2B 0000 0000 0000 0000 E3E3 0000 0000" /* ++............ */ -}; - -data 'icl4' (130) { - $"0000 0000 0000 00CC CC00 0000 0000 0000" /* .............. */ - $"0000 0000 00CE FF66 6665 DC00 0000 0000" /* .....ffe..... */ - $"0000 0000 DEDC 00CE 6666 665C 0000 0000" /* .....fff\.... */ - $"0000 00CE EBBB D000 5666 6666 E000 0000" /* ....Vfff... */ - $"0000 0C33 3333 3C00 C666 6666 65C0 0000" /* ...333<.fffe.. */ - $"0000 C333 3333 3300 0566 6666 666C 0000" /* ..3333..ffffl.. */ - $"000C 3333 3333 33C0 0D66 6666 666E 0000" /* ..33333.ffffn.. */ - $"000E 3333 3333 33B0 0C66 6666 6666 D000" /* ..33333.fffff. */ - $"00D3 3333 3333 3330 0056 6666 6666 6C00" /* .333330.Vffffl. */ - $"0033 3333 3333 333C 00D6 6666 6666 6500" /* .333333<.ffffe. */ - $"0C33 3333 3333 333C 00C6 6666 6666 66C0" /* .333333<.fffff */ - $"0B33 3333 3333 333C 0005 6666 6666 66D0" /* .333333<..fffff */ - $"0333 3333 3333 333C 000C 6666 6666 6650" /* .333333<..fffffP */ - $"C333 3333 3333 3330 C000 6666 6666 6660" /* 3333330.fffff` */ - $"C333 3333 3333 33DB 3C00 D666 6666 666C" /* 333333<.ffffl */ - $"D333 3333 3333 33C3 3B00 C666 6666 666C" /* 333333;.ffffl */ - $"D333 3333 3333 3BD3 3300 0566 6666 666C" /* 33333;3..ffffl */ - $"C333 3333 3333 3CB3 33D0 0C66 6666 6660" /* 33333<3.ffff` */ - $"C333 3333 3333 DC33 33B0 0066 6666 6660" /* 3333333.ffff` */ - $"0333 3333 3333 0B33 333C 00D6 6666 6650" /* .33333.33<.fffP */ - $"0B33 3333 333D C333 333B 0006 6666 66D0" /* .3333=33;..fff */ - $"0C33 3333 33B0 B333 3333 000D 6666 66C0" /* .3333333..fff */ - $"0033 3333 33C0 3333 3333 D000 6666 6E00" /* .33333333.ffn. */ - $"00D3 3333 3E0D 3333 3333 B000 D688 6C00" /* .33>.3333.ֈl. */ - $"000E 3333 3C0B 3333 3333 3C00 0689 8000" /* ..33<.3333<... */ - $"000C 3333 B0C3 3333 3333 3888 8889 9800" /* ..3333338. */ - $"0000 C333 00B3 3333 3333 3899 9999 9980" /* ..3.33338 */ - $"0000 0C3D 0C33 3333 3333 3899 9999 9998" /* ...=.333338 */ - $"0000 00CE A333 3333 3333 3899 9999 9980" /* ...Σ333338 */ - $"0000 0000 CB33 3333 3333 3888 8889 9800" /* ....333338. */ - $"0000 0000 00CB 3333 333B BC00 0089 8000" /* .....333;... */ - $"0000 0000 0000 00CC CC00 0000 0088 0000" /* ............. */ -}; - -data 'ICN#' (130) { - $"001F F800 0075 5600 01FE AB80 0341 5540" /* ....uV...AU@ */ - $"06B8 AAA0 0D54 D550 1AAC 6AA8 3556 5554" /* ..TP.j5VUT */ - $"2AAA 2AAC 5555 3556 6AAB 1AAA D555 1555" /* **UU5Vj.U.U */ - $"AAAB 0AAB D555 0D55 AAAA 46AB D556 C555" /* «U.UFVU */ - $"AAAC A2AB D555 6355 AAA9 A1AB D55B 5155" /* UcU[QU */ - $"AAB2 B0AB 5555 58D6 6AA6 A86A 356D 547C" /* UUXjj5mT| */ - $"2ACA AC2C 1555 57E4 0A9A AC02 05B5 5401" /* *ʬ,.UWš..T. */ - $"03EA AC02 01D5 57E4 006A AB28 001F FC30" /* ...W.j(..0 */ - $"001F F800 007F FE00 01FF FF80 03FF FFC0" /* ........ */ - $"07FF FFE0 0FFF FFF0 1FFF FFF8 3FFF FFFC" /* ...? */ - $"3FFF FFFC 7FFF FFFE 7FFF FFFE FFFF FFFF" /* ?.. */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF 7FFF FFFE 7FFF FFFE 3FFF FFFC" /* ..? */ - $"3FFF FFFC 1FFF FFFC 0FFF FFFE 07FF FFFF" /* ?... */ - $"03FF FFFE 01FF FFFC 007F FF38 001F FC30" /* ....8..0 */ -}; - -data 'ics#' (130) { - $"07E0 1FF8 39FC 7EFE 7E7E FF7F FF3F FE3F" /* ..9~~~.?? */ - $"FC9F FDDF F9CF 7BEE 73FA 37E1 1FFA 07E4" /* {s7.. */ - $"07E0 1FF8 3FFC 7FFE 7FFE FFFF FFFF FFFF" /* ..?.. */ - $"FFFF FFFF FFFF 7FFE 7FFE 3FFF 1FFE 07E4" /* ..?.. */ -}; - -data 'ics4' (130) { - $"0000 0FFF FFF0 0000 000F F666 666F F000" /* .......ffo. */ - $"00F3 3006 6666 6F00 0F33 3330 6666 66F0" /* .0.ffo..330fff */ - $"0F33 3330 0666 66F0 F333 3333 0666 666F" /* .330.ff333.ffo */ - $"F333 3333 0066 666F F333 3330 0066 666F" /* 333.ffo330.ffo */ - $"F333 3300 3006 666F F333 3303 3306 666F" /* 33.0.fo33.3.fo */ - $"F333 3003 3300 666F 0F33 3033 3330 68F0" /* 30.3.fo.30330h */ - $"0F33 0033 3388 8980 00F3 0333 3389 9998" /* .3.33..33 */ - $"000F F333 3388 8980 0000 0FFF FFF0 0800" /* ..33..... */ -}; - -data 'ics8' (130) { - $"0000 0000 00FF FFFF FFFF FF00 0000 0000" /* .......... */ - $"0000 00FF FFD2 D2D2 D2D2 D2FF FF00 0000" /* ...... */ - $"0000 FF23 2300 00D2 D2D2 D2D2 D2FF 0000" /* ..##.... */ - $"00FF 2323 2323 2300 D2D2 D2D2 D2D2 FF00" /* .#####.. */ - $"00FF 2323 2323 2300 00D2 D2D2 D2D2 FF00" /* .#####... */ - $"FF23 2323 2323 2323 00D2 D2D2 D2D2 D2FF" /* #######. */ - $"FF23 2323 2323 2323 0000 D2D2 D2D2 D2FF" /* #######.. */ - $"FF23 2323 2323 2300 0000 D2D2 D2D2 D2FF" /* ######... */ - $"FF23 2323 2323 0000 2300 00D2 D2D2 D2FF" /* #####..#.. */ - $"FF23 2323 2323 0023 2323 00D2 D2D2 D2FF" /* #####.###. */ - $"FF23 2323 2300 0023 2323 0000 D2D2 D2FF" /* ####..###.. */ - $"00FF 2323 2300 2323 2323 2300 ECE3 FF00" /* .###.#####.. */ - $"00FF 2323 0000 2323 2323 E3E3 E3CB E300" /* .##..####. */ - $"0000 FF23 0023 2323 2323 E3CB CBCB CBE3" /* ..#.##### */ - $"0000 00FF FF23 2323 2323 E3E3 E3CB E300" /* ...#####. */ - $"0000 0000 00FF FFFF FFFF FF00 00E3 0000" /* ......... */ -}; - -data 'MrSt' (0, "Owner resource") { - $"00" /* . */ -}; - -data 'FREF' (128) { - $"4150 504C 0000 00" /* APPL... */ -}; - -data 'FREF' (129) { - $"2A2A 2A2A 0001 00" /* ****... */ -}; - -data 'SIZE' (-1) { - $"58F0 0007 A120 0007 A120" /* X.. .. */ -}; - diff --git a/src/mac/osx_appl.rkt b/src/mac/osx_appl.rkt index 9254275801..b2d2e26520 100644 --- a/src/mac/osx_appl.rkt +++ b/src/mac/osx_appl.rkt @@ -79,24 +79,6 @@ [icns-dest (build-path contents-path "Resources" (path-replace-suffix (file-name-from-path app-name) #".icns"))]) (unless (file-exists? icns-dest) (copy-file icns-src icns-dest)))))) - - (define (create-fw dest-path fw-name info-plist) - (let* ([fw-path (build-path dest-path - (string-append fw-name ".framework") - "Versions" - (if for-3m? - (format "~a_3m" (version)) - (version)))]) - (make-directory* fw-path) - (realize-template fw-path fw-template-tree) - (write-info (build-path fw-path "Resources") info-plist) - ;; maybe someday we'll have Contents/Resources/English.lproj ? - (let* ([rsrc-src (build-path "GRacket.rsrc.OSX")] - [rsrc-dest (build-path fw-path "Resources" (format "~a.rsrc" fw-name))]) - (when (file-exists? rsrc-dest) - (delete-file rsrc-dest)) - (printf "Installing ~a~n" rsrc-dest) - (copy-file rsrc-src rsrc-dest)))) (define (make-info-plist app-name signature app?) `(dict (assoc-pair "CFBundleDevelopmentRegion" @@ -126,10 +108,6 @@ "APPLmReD" (make-info-plist (string-append "GRacket" suffix) "mReD" #t)) - (create-fw (current-directory) - "GRacket" - (make-info-plist "GRacket" "GRacket" #f)) - (create-app (build-path (current-directory) (if for-3m? 'up 'same)) "Starter" "Starter" diff --git a/src/racket/cmdline.inc b/src/racket/cmdline.inc index 72af94a6a3..001a31dbb7 100644 --- a/src/racket/cmdline.inc +++ b/src/racket/cmdline.inc @@ -62,6 +62,11 @@ static int _coldir_offset = 19; /* Skip permanent tag */ #define DLL_RELATIVE_PATH L"lib" #include "delayed.inc" +#ifdef NEED_CONSOLE_PRINTF +static void (*console_printf)(char *str, ...); +# define PRINTF console_printf +#endif + extern # ifdef __cplusplus "C" @@ -165,7 +170,7 @@ typedef struct { char *init_lib; } FinishArgs; -typedef void (*Repl_Proc)(Scheme_Env *); +typedef void (*Repl_Proc)(Scheme_Env *, FinishArgs *f); static void configure_environment(Scheme_Object *mod) { @@ -424,7 +429,7 @@ static int finish_cmd_line_run(FinishArgs *fa, Repl_Proc repl) save = p->error_buf; p->error_buf = &newbuf; if (!scheme_setjmp(newbuf)) { - repl(fa->global_env); + repl(fa->global_env, fa); exit_val = 0; } else { exit_val = 1; @@ -581,6 +586,10 @@ static int run_from_cmd_line(int argc, char *_argv[], prog = argv[0]; argv++; --argc; + +#ifdef NEED_CONSOLE_PRINTF + console_printf = scheme_get_console_printf(); +#endif #ifdef DOS_FILE_SYSTEM { diff --git a/src/racket/configure.ac b/src/racket/configure.ac index 72c5ef8580..20c31f8e46 100644 --- a/src/racket/configure.ac +++ b/src/racket/configure.ac @@ -6,11 +6,10 @@ # Remember: # CFLAGS - C compilation only -# CXXFLAGS - C++ compilation only -# CPPFLAGS - C and C++ pre-processing and compilation for configure-time testing ONLY -# COMPFLAGS - C and C++ compilation, but not configure-time tests -# PREFLAGS - C and C++ preprocessing, but not configure-time tests -# OPTIONS - C and C++ flags, not needed for configure-time tests +# CPPFLAGS - C pre-processing and compilation for configure-time testing ONLY +# COMPFLAGS - C compilation, but not configure-time tests +# PREFLAGS - C preprocessing, but not configure-time tests +# OPTIONS - C flags, not needed for configure-time tests # MZOPTIONS - Racket-only flags # MROPTIONS - GRacket-only flags # CGCOPTIONS - Boehm-GC-only flags @@ -25,16 +24,7 @@ AC_CONFIG_SRCDIR(racket/src/bignum.c) AC_CONFIG_HEADERS([racket/mzconfig.h]) AC_ARG_ENABLE(gracket, [ --enable-gracket compile GRacket as well as Racket (enabled by default)], , enable_gracket=yes ) - AC_ARG_ENABLE(docs, [ --enable-docs build docs on install (enabled by default)], , enable_docs=yes) - -AC_ARG_ENABLE(gl, [ --enable-gl use OpenGL when available (enabled by default)]) -AC_ARG_ENABLE(xrender, [ --enable-xrender use Xrender when available (enabled by default)]) -AC_ARG_ENABLE(xft, [ --enable-xft use Xft when available (enabled by default)]) -AC_ARG_ENABLE(cairo, [ --enable-cairo use Cairo when available (enabled by default)]) -AC_ARG_ENABLE(libpng, [ --enable-libpng use libpng instead of building (enabled by default)]) -AC_ARG_ENABLE(libjpeg, [ --enable-libjpeg use libjpeg instead of building (enabled by default)]) - AC_ARG_ENABLE(shared, [ --enable-shared create shared libraries]) AC_ARG_ENABLE(dynlib, [ --enable-dynlib same as --enable-shared]) AC_ARG_ENABLE(lt, [ --enable-lt= use instead of bundled libtool], LIBTOOLPROG="$enableval", enable_lt=no) @@ -253,16 +243,6 @@ if test "${enable_gracket}" = "yes" ; then fi fi -if test "${enable_gracket}" = "no" ; then - enable_wbuild=no - enable_xrender=no - enable_cairo=no - enable_libpng=no - enable_libjpeg=no - enable_gl=no - enable_pthread=no -fi - ###### Tell user what flags we have ####### show_explicitly_disabled() @@ -287,14 +267,6 @@ show_explicitly_enabled "${enable_xonx}" "X-on-X" show_explicitly_enabled "${enable_shared}" "Shared libraries" show_explicitly_disabled "${enable_gracket}" GRacket -if test "${enable_gracket}" != "no" ; then - show_explicitly_disabled "${enable_gl}" OpenGL - show_explicitly_disabled "${enable_xrender}" Xrender - show_explicitly_disabled "${enable_xft}" Xft - show_explicitly_disabled "${enable_cairo}" Cairo - show_explicitly_disabled "${enable_libpng}" "Use-existing-libpng" - show_explicitly_disabled "${enable_libjpeg}" "Use-existing-libjpeg" -fi if test "$LIBTOOLPROG" != "" ; then echo "=== Libtool program: $LIBTOOLPROG" @@ -358,14 +330,6 @@ MROPTIONS= INCLUDEDEP="#" WX_MMD_FLAG= -JPEG_A='$(JPEG_A)' -JPEG_INC='$(JPEG_INC)' - -ZLIB_A='$(ZLIB_A)' -ZLIB_INC='$(ZLIB_INC)' - -PNG_A='$(PNG_A)' - PREFLAGS="$CPPFLAGS" MZRT_CGC_FLAGS="" LIBATOM="LIBATOM_NONE" @@ -373,9 +337,6 @@ LIBATOM="LIBATOM_NONE" ar_libtool_no_undefined="" LIBRACKET_DEP="" -XFT_EXTRA_FLAGS= -XFT_EXTRA_LIBS= - EXE_SUFFIX= MMM=3m @@ -439,15 +400,11 @@ COMPFLAGS="" ORIG_CC="${CC}" ORIG_CPP="${CPP}" -ORIG_CXX="${CXX}" -ORIG_CXXCPP="${CXXCPP}" SUB_CONFIGURE_EXTRAS="" if test "${enable_oskit}" = "no" ; then AC_PROG_CC AC_PROG_CPP - AC_PROG_CXX - AC_PROG_CXXCPP if test "$AS" = '' ; then AS=as as_was_set=no @@ -517,17 +474,6 @@ if test "${enable_gcov}" = "yes" ; then PROFFLAGS="$PROFFLAGS -fprofile-arcs -ftest-coverage" fi -if test "${enable_wbuild}" = "yes" ; then - MAKE_WBUILD=wb - WBUILD="x/wbuild/src/wbuild" - WBUILD="$WBUILD --no-init-file --no-lines -i \$(srcdir)/XWidgets" - WBUILD="$WBUILD -c \$(srcdir)/XWidgets -d \$(srcdir)/XWidgets" - WBUILD="$WBUILD -p . \$(srcdir)/x/wbuild/wbuild.cfg" -else - MAKE_WBUILD= - WBUILD="sh \$(PLTSRCDIR)/wxxt/src/XWidgets/dummy.wbuild" -fi - ORIG_CC_FOR_BUILD="${CC_FOR_BUILD}" if test "$CC_FOR_BUILD" = "" ; then CC_FOR_BUILD="$CC" @@ -589,20 +535,13 @@ case $OS in DYN_CFLAGS="-fPIC" GC_THREADS_FLAG="-DGC_LINUX_THREADS" STRIP_DEBUG="strip -S" - # PPC: X11 librares are not found case `$UNAME -m` in #Required for CentOS 4.6 x86_64) enable_futures_by_default=yes CGC_X86_64="1" - if test -d /usr/X11R6/lib64 ; then - X_LIBS="$X_LIBS -L/usr/X11R6/lib64" - fi ;; ppc) - if test -d /usr/X11R6/lib ; then - X_LIBS="$X_LIBS -L/usr/X11R6/lib" - fi ;; alpha) EXTRA_GMP_OBJ="gmp_alpha_gcc.o" @@ -636,9 +575,6 @@ case $OS in MZOPTIONS="$MZOPTIONS +e" fi LIBS="$LIBS -Wl,-E" - # For Xaw and Xmu: - X_CFLAGS="-I/usr/contrib/X11R6/include/ $X_CFLAGS" - X_LIBS="-L/usr/contrib/X11R6/lib/ $X_LIBS" ;; CYGWIN*) enable_cgcdefault="yes" @@ -707,7 +643,6 @@ case $OS in fi else # gcc 3.x - CXXFLAGS="$CXXFLAGS -fno-rtti" if test "${enable_quartz}" = "yes" ; then [ gcc_vers_three_one=`${CC} -v 2>&1 | grep "version 3[.]1"` ] if test "$gcc_vers_three_one" = "" ; then @@ -734,14 +669,6 @@ case $OS in CPP="${CPP} -m32" SUB_CONFIGURE_EXTRAS="${SUB_CONFIGURE_EXTRAS} CPP="'"'"${CPP}"'"' fi - if test "${ORIG_CXX}" = "" ; then - CXX="${CXX} -m32" - SUB_CONFIGURE_EXTRAS="${SUB_CONFIGURE_EXTRAS} CXX="'"'"${CXX}"'"' - fi - if test "${ORIG_CXXCPP}" = "" ; then - CXXCPP="${CXXCPP} -m32" - SUB_CONFIGURE_EXTRAS="${SUB_CONFIGURE_EXTRAS} CPPCXX="'"'"${CPPCXX}"'"' - fi if test "${ORIG_CC_FOR_BUILD}" = "" ; then CC_FOR_BUILD="${CC_FOR_BUILD} -m32" fi @@ -776,12 +703,6 @@ case $OS in fi else PREFLAGS="$PREFLAGS -DXONX " - X_EXTRA_LIBS="$X_EXTRA_LIBS -lz" - X_LIBS="$X_LIBS -L/usr/X11R6/lib" - - # need help finding fontconfig and freetype headers: - XFT_EXTRA_FLAGS="-I/usr/X11R6/include -I/usr/X11R6/include/freetype2" - XFT_EXTRA_LIBS="-lfontconfig" fi ;; *) @@ -1098,97 +1019,11 @@ if test "$check_gcc_dash_e" = "yes" ; then fi -############## C++ grunge ################ - -if test "${enable_gracket}" = "yes" ; then - CPPFLAGS="$CPPFLAGS $X_CFLAGS" - AC_LANG_CPLUSPLUS - - AC_MSG_CHECKING(whether C++ compiler works) - AC_TRY_RUN(int main() { return 0; }, cplusplusworks=yes, cplusplusworks=no, cplusplusworks=yes) - AC_MSG_RESULT($cplusplusworks) - if test "$cplusplusworks" = "no" ; then - MROPTIONS="$MROPTIONS -DOPERATOR_NEW_ARRAY" - echo "***************************************************" - echo configure: C++ compiler/linker ${CXX} does not work - echo "***************************************************" - echo configure aborted - exit 1 - fi - -[ msg="whether new and new[] are different" ] - AC_MSG_CHECKING($msg) - AC_TRY_RUN( -[ #include ] - inline void *operator new(size_t size) { return (void *)0x1; } -[ inline void *operator new[](size_t size) { return (void *)0x2; } ] - class C { int x; }; - int main() { -[ return (new C) == (new C[10]); ] - }, different=yes, different=no, different=yes) - if test "$different" = "yes" ; then - MROPTIONS="$MROPTIONS -DOPERATOR_NEW_ARRAY" - fi - AC_MSG_RESULT($different) - - if test "$enable_quartz" = "no" ; then - - # If we're using gcc and including X11/Intrinsic doesn't work - # then try adding -fpermissive - if test "$CC" = "gcc" ; then - AC_MSG_CHECKING(whether need to use -fpermissive) - AC_TRY_COMPILE([#]include "X11/Intrinsic.h", , addperm=no, addperm=yes) - if test "$addperm" = "yes" ; then - CXXFLAGS="$CXXFLAGS -fpermissive" - fi - AC_MSG_RESULT($addperm) - fi - - # X11 headers present? - xmissing="" - AC_CHECK_HEADER(X11/Xlib.h, :, xmissing="$xmissing X11/Xlib.h") - AC_CHECK_HEADER(X11/Intrinsic.h, :, xmissing="$xmissing X11/XIntrinsic.h") - AC_CHECK_LIB(X11, XFlush, :, xmissing="$xmissing libX11", $X_LIBS) - AC_CHECK_LIB(Xext, XSyncQueryExtension, :, xmissing="$xmissing libXext", $X_LIBS -lX11) - AC_CHECK_LIB(Xt, XtDestroyWidget, :, xmissing="$xmissing libXt", $X_LIBS -lX11 -lXext) - AC_CHECK_LIB(Xmu, XmuInternAtom, :, xmissing="$xmissing libXmu", $X_LIBS -lXt -lX11 -lXext) - AC_CHECK_LIB(Xaw, vendorShellClassRec, :, xmissing="$xmissing libXaw", $X_LIBS -lXmu -lXt -lX11 -lXext) - if test "$xmissing" = "" ; then - : - else - echo "******************************************************" - echo "configure: cannot find X11 development files that are" - echo " needed to compile GRacket:" - echo "$xmissing" - echo "******************************************************" - echo configure aborted - exit 1 - fi - - # Can we make auto-repeat detectable? -[ msg="whether X11/XKBlib.h is available" ] - AC_MSG_CHECKING($msg) - AC_TRY_RUN( -[ #include ] -[ #include ] - int main() { - return 0; - }, xkbavail=yes, xkbavail=no, xkbavail=no) - if test "$xkbavail" = "no" ; then - MROPTIONS="$MROPTIONS -DNO_XKB_LIB_PRESENT" - fi - AC_MSG_RESULT($xkbavail) - - fi # non-quartz - -fi - ############## drop optimization flags ################ if test "${enable_noopt}" = "yes" ; then AWKPRG='BEGIN { FS = "(^| )-O(0|1|2|3|4|5|6|7|8|9|())( |$)" } /.*/ { for (i = 1; i < NF; i++) printf "%s ", $i; print $NF }' CFLAGS=`echo "$CFLAGS" | awk "$AWKPRG"` - CXXFLAGS=`echo "$CXXFLAGS" | awk "$AWKPRG"` fi ################### JIT #################### @@ -1234,154 +1069,6 @@ if test "${enable_gl}" = "yes" ; then MROPTIONS="$MROPTIONS -DUSE_GL" fi -################ Xrender ################## - -if test "${enable_xrender}" = "" ; then - enable_xrender=yes -fi - -if test "${enable_xrender}" = "yes" ; then - AC_CHECK_HEADER(X11/extensions/Xrender.h, enable_xrender=yes, enable_xrender=no) - if test "${enable_xrender}" = "yes" ; then - AC_CHECK_LIB(Xrender, XRenderQueryExtension, enable_xrender="yes", enable_xrender="no", $X_LIBS -lX11 -lXext -lXrender) - if test "${enable_xrender}" = "yes" ; then - MROPTIONS="$MROPTIONS -DWX_USE_XRENDER" - X_EXTRA_LIBS="$X_EXTRA_LIBS -lXrender" - else - echo "no Xrender libs; Xrender support disabled" - fi - else - echo "no Xrender headers; Xrender support disabled" - fi -fi - -################ Xft ################## - -if test "${enable_xft}" = "" ; then - if test "${enable_xrender}" = "yes" ; then - enable_xft=yes - else - enable_xft=no - fi -fi - -if test "${enable_xft}" = "yes" ; then - xft_config_prog="pkg-config xft" - xft_config_ok=`$xft_config_prog --cflags 2> /dev/null` - if test "$?" != 0 ; then - xft_config_prog="xft-config" - xft_config_ok=`$xft_config_prog --cflags 2> /dev/null` - fi - if test "$?" != 0 ; then - save_cpp_flags="$CPPFLAGS" - CPPFLAGS="$CPPFLAGS $XFT_EXTRA_FLAGS $X_CFLAGS" - AC_CHECK_HEADER(X11/Xft/Xft.h, enable_xft=yes, enable_xft=no) - if test "${enable_xft}" = "yes" ; then - AC_CHECK_LIB(Xft, XftTextExtents8, enable_xft="yes", enable_xft="no", $X_LIBS -lX11 -lXext -Xrender -lXft) - if test "${enable_xft}" = "yes" ; then - MROPTIONS="$MROPTIONS $XFT_EXTRA_FLAGS -DWX_USE_XFT" - X_EXTRA_LIBS="$X_EXTRA_LIBS $XFT_EXTRA_LIBS -lXft" - else - echo "no Xft libs; Xft support disabled" - fi - else - echo "no Xft headers; Xft support disabled" - fi - CPPFLAGS="$save_cpp_flags" - else - echo "Using $xft_config_prog..." - xft_cflags=`$xft_config_prog --cflags` - xft_libs=`$xft_config_prog --libs` - echo "Xft flags: $xft_cflags" - echo "Xft libs: $xft_libs" - MROPTIONS="$MROPTIONS -DWX_USE_XFT" - X_CFLAGS="$X_CFLAGS $xft_cflags" - X_EXTRA_LIBS="$X_EXTRA_LIBS $xft_libs" - fi -fi - -################ Cairo ################## - -if test "${enable_cairo}" = "" ; then - enable_cairo=yes -fi - -if test "${enable_cairo}" = "yes" ; then - cairo_config_ok=`pkg-config --cflags cairo 2> /dev/null` - if test "$?" != 0 ; then - echo "no information from pkg-config; Cairo support disabled" - else - echo "Using pkg-config for Cairo..." - cairo_cflags=`pkg-config --cflags cairo` - cairo_libs=`pkg-config --libs cairo` - echo "Cairo flags: $cairo_cflags" - echo "Cairo libs: $cairo_libs" - AC_CHECK_LIB(cairo, cairo_create, enable_cairo="yes", enable_xrender="no", $X_LIBS $X_EXTRA_LIBS $cairo_libs) - if test "${enable_cairo}" = "yes" ; then - MROPTIONS="$MROPTIONS -DWX_USE_CAIRO" - X_CFLAGS="$X_CFLAGS $cairo_cflags" - X_EXTRA_LIBS="$X_EXTRA_LIBS $cairo_libs" - - CPPFLAGS="$CPPFLAGS $cairo_cflags" - AC_CHECK_HEADER(cairo-xlib.h, havecairoxlib=yes, havecairoxlib=no) - if test "${havecairoxlib}" = "no" ; then - MROPTIONS="$MROPTIONS -DWX_CAIRO_NO_XLIBH" - fi - else - echo "no Cairo libs; Cairo support disabled" - fi - fi -fi - -################ libpng ################## - -if test "${enable_libpng}" = "" ; then - enable_libpng=yes -fi - -if test "${enable_libpng}" = "yes" ; then - AC_CHECK_HEADER(png.h, enable_libpng=yes, enable_libpng=no) - if test "${enable_libpng}" = "yes" ; then - AC_CHECK_LIB(png, png_read_info, enable_libpng="yes", enable_libpng="no", -lpng -lz) - if test "${enable_libpng}" = "yes" ; then - PNG_A="" - PNG_INC="" - ZLIB_A="" - ZLIB_INC="" - X_EXTRA_LIBS="$X_EXTRA_LIBS -lpng -lz" - MROPTIONS="$MROPTIONS -DWX_USE_LIBPNG" - else - echo "no libpng installed; building static version" - fi - else - echo "no libpng headers installed; building from PLT copy" - fi -fi - -################ libjpeg ################## - -if test "${enable_libjpeg}" = "" ; then - enable_libjpeg=yes -fi - -if test "${enable_libjpeg}" = "yes" ; then - AC_CHECK_HEADER(jpeglib.h, enable_libjpeg=yes, enable_libjpeg=no) - if test "${enable_libjpeg}" = "yes" ; then - AC_CHECK_LIB(jpeg, jpeg_start_decompress, enable_libjpeg="yes", enable_libjpeg="no", -ljpeg) - if test "${enable_libjpeg}" = "yes" ; then - JPEG_A="" - JPEG_INC="" - X_EXTRA_LIBS="$X_EXTRA_LIBS -ljpeg" - MROPTIONS="$MROPTIONS -DWX_USE_LIBJPEG" - else - echo "no libjpeg installed; building static version" - fi - else - echo "no libjpeg headers installed; building from PLT copy" - fi -fi - - ############## docs ################ if test "${enable_docs}" = "no" ; then @@ -1435,10 +1122,8 @@ if test "${enable_shared}" = "yes" ; then ARFLAGS="" RANLIB=":" MZLINKER="${LIBTOOLPROG} --mode=link --tag=CC $CC${need_gcc_static_libgcc} -rpath ${abslibdir}" - GRACKETLINKER="${LIBTOOLPROG} --mode=link --tag=CXX $CXX${need_gcc_static_libgcc} -rpath ${abslibdir}" PLAIN_CC="$CC" CC="${LIBTOOLPROG} --mode=compile --tag=CC $CC" - CXX="${LIBTOOLPROG} --mode=compile --tag=CXX $CXX" AS="${LIBTOOLPROG} --mode=compile $AS" LIBSFX=la WXLIBS=WXLIBSDYN @@ -1452,7 +1137,6 @@ if test "${enable_shared}" = "yes" ; then MZOPTIONS="$MZOPTIONS -DMZ_USES_SHARED_LIB" else LIBSFX=a - GRACKETLINKER='$(CXX)' WXLIBS=WXLIBSNORM ICP=cp MRLIBINSTALL="install-no-lib" @@ -1472,14 +1156,11 @@ LIBS="$LIBS $EXTRALIBS" AC_SUBST(CC) AC_SUBST(CFLAGS) -AC_SUBST(CXX) -AC_SUBST(CXXFLAGS) AC_SUBST(PREFLAGS) AC_SUBST(COMPFLAGS) AC_SUBST(PROFFLAGS) AC_SUBST(LDFLAGS) AC_SUBST(CPP) -AC_SUBST(CXXCPP) AC_SUBST(SED) AC_SUBST(PERL) AC_SUBST(AS) @@ -1523,7 +1204,6 @@ AC_SUBST(EXE_SUFFIX) AC_SUBST(MZRT_CGC_FLAGS) AC_SUBST(LIBATOM) -AC_SUBST(GRACKETLINKER) AC_SUBST(LIBSFX) AC_SUBST(WXLIBS) AC_SUBST(WXVARIANT) @@ -1541,12 +1221,6 @@ AC_SUBST(USE_WXPRECOMP) AC_SUBST(INCLUDEDEP) AC_SUBST(WX_MMD_FLAG) -AC_SUBST(JPEG_A) -AC_SUBST(JPEG_INC) -AC_SUBST(ZLIB_A) -AC_SUBST(ZLIB_INC) -AC_SUBST(PNG_A) - AC_SUBST(OSKHOME) AC_SUBST(EXTRA_OSK_LIBS) @@ -1614,46 +1288,9 @@ makefiles="$makefiles foreign/Makefile" ac_configure_args="$ac_configure_args$SUB_CONFIGURE_EXTRAS" if test "${enable_gracket}" = "yes" ; then - if test "${enable_quartz}" = "yes" ; then - mk_needed_dir wxmac - mk_needed_dir wxmac/src - else - mk_needed_dir wxxt - mk_needed_dir wxxt/utils - mk_needed_dir wxxt/utils/image - mk_needed_dir wxxt/contrib - mk_needed_dir wxxt/contrib/xpm - fi - makefiles="$makefiles gracket/Makefile - gracket/wxs/Makefile gracket/gc2/Makefile" - - if test "${enable_libpng}" != "yes" ; then - makefiles="$makefiles - wxcommon/libpng/Makefile wxcommon/zlib/Makefile" - fi - - if test "${enable_quartz}" = "yes" ; then - makefiles="$makefiles - wxmac/src/Makefile" - else - makefiles="$makefiles - wxxt/src/Makefile wxxt/src/x/Makefile - wxxt/utils/image/src/Makefile - wxxt/contrib/xpm/lib/Makefile" - fi - - if test "${enable_libjpeg}" = "no" ; then - AC_CONFIG_AUX_DIR( wxcommon/jpeg ) - AC_CONFIG_SUBDIRS( wxcommon/jpeg ) - fi -fi - -if test "${enable_wbuild}" = "yes" ; then - AC_CONFIG_AUX_DIR( wxxt/src/x/wbuild ) - AC_CONFIG_SUBDIRS( wxxt/src/x/wbuild ) fi AC_OUTPUT($makefiles) diff --git a/src/racket/include/scheme.h b/src/racket/include/scheme.h index 1366abc76b..fc8bf4960a 100644 --- a/src/racket/include/scheme.h +++ b/src/racket/include/scheme.h @@ -1670,7 +1670,6 @@ extern void *scheme_malloc_envunbox(size_t); # define scheme_malloc_small_atomic_tagged scheme_malloc_atomic_tagged #endif - #ifdef MZ_PRECISE_GC # define MZ_GC_DECL_REG(size) void *__gc_var_stack__[size+2] = { (void *)0, (void *)size }; # define MZ_GC_VAR_IN_REG(x, v) (__gc_var_stack__[x+2] = (void *)&(v)) @@ -1757,7 +1756,10 @@ MZ_EXTERN void scheme_set_atexit(Scheme_At_Exit_Proc p); typedef void (*scheme_console_printf_t)(char *str, ...); MZ_EXTERN scheme_console_printf_t scheme_console_printf; MZ_EXTERN scheme_console_printf_t scheme_get_console_printf(); -MZ_EXTERN void (*scheme_console_output)(char *str, long len); +MZ_EXTERN void scheme_set_console_printf(scheme_console_printf_t p); +typedef void (*scheme_console_output_t)(char *str, long len); +MZ_EXTERN scheme_console_output_t scheme_console_output; +MZ_EXTERN void scheme_set_console_output(scheme_console_output_t p); MZ_EXTERN void (*scheme_sleep)(float seconds, void *fds); MZ_EXTERN void (*scheme_notify_multithread)(int on); MZ_EXTERN void (*scheme_wakeup_on_input)(void *fds); @@ -1776,10 +1778,16 @@ void scheme_restore_nonmain_thread(void); extern long scheme_creator_id; #endif +typedef Scheme_Object *(*Scheme_Stdio_Maker_Proc)(void); MZ_EXTERN Scheme_Object *(*scheme_make_stdin)(void); MZ_EXTERN Scheme_Object *(*scheme_make_stdout)(void); MZ_EXTERN Scheme_Object *(*scheme_make_stderr)(void); +MZ_EXTERN void scheme_set_stdio_makers(Scheme_Stdio_Maker_Proc in, + Scheme_Stdio_Maker_Proc out, + Scheme_Stdio_Maker_Proc err); + + MZ_EXTERN void scheme_set_banner(char *s); MZ_EXTERN Scheme_Object *scheme_set_exec_cmd(char *s); MZ_EXTERN Scheme_Object *scheme_set_run_cmd(char *s); diff --git a/src/racket/main.c b/src/racket/main.c index 523d0be98c..64c81a2070 100644 --- a/src/racket/main.c +++ b/src/racket/main.c @@ -67,16 +67,6 @@ START_XFORM_SUSPEND; #ifdef UNISTD_INCLUDE # include #endif -#ifdef MACINTOSH_EVENTS -# ifndef OS_X -# include -# endif -#endif -#ifdef MACINTOSH_EVENTS -# ifndef OS_X -# include "simpledrop.h" -# endif -#endif #ifdef INSTRUMENT_PRIMITIVES extern int g_print_prims; @@ -135,24 +125,28 @@ static char *get_init_filename(Scheme_Env *env) extern Scheme_Object *scheme_initialize(Scheme_Env *env); #endif -#ifdef EXPAND_FILENAME_TILDE -# define INIT_FILENAME "~/.racketrc" -#else -# ifdef DOS_FILE_SYSTEM -# define INIT_FILENAME "%%HOMEDRIVE%%\\%%HOMEPATH%%\\racketrc.rktl" +#ifndef INIT_FILENAME +# ifdef EXPAND_FILENAME_TILDE +# define INIT_FILENAME "~/.racketrc" # else -# define INIT_FILENAME "PREFERENCES:racketrc.rktl" +# ifdef DOS_FILE_SYSTEM +# define INIT_FILENAME "%%HOMEDRIVE%%\\%%HOMEPATH%%\\racketrc.rktl" +# else +# define INIT_FILENAME "PREFERENCES:racketrc.rktl" +# endif # endif +# define GET_INIT_FILENAME get_init_filename +# define PRINTF printf +# define PROGRAM "Racket" +# define PROGRAM_LC "racket" +# define INITIAL_BIN_TYPE "zi" +# define RACKET_CMD_LINE +# define INITIAL_NAMESPACE_MODULE "racket/init" #endif -#define GET_INIT_FILENAME get_init_filename -#define PRINTF printf + #define CMDLINE_FFLUSH fflush -#define PROGRAM "Racket" -#define PROGRAM_LC "racket" -#define INITIAL_BIN_TYPE "zi" + #define BANNER scheme_banner() -#define RACKET_CMD_LINE -#define INITIAL_NAMESPACE_MODULE "racket/init" /*========================================================================*/ /* command-line parsing */ @@ -202,10 +196,10 @@ static void user_break_hit(int ignore) #endif /* Forward declarations: */ -static void do_scheme_rep(Scheme_Env *); +static void do_scheme_rep(Scheme_Env *, FinishArgs *f); static int cont_run(FinishArgs *f); -#if defined(WINDOWS_UNICODE_SUPPORT) && !defined(__CYGWIN32__) +#if defined(WINDOWS_UNICODE_SUPPORT) && !defined(__CYGWIN32__) && !defined(MZ_DEFINE_UTF8_MAIN) # define MAIN wmain # define MAIN_char wchar_t # define MAIN_argv wargv @@ -324,9 +318,11 @@ static int main_after_stack(void *data) rval = run_from_cmd_line(argc, argv, scheme_basic_env, cont_run); +#ifndef DEFER_EXPLICIT_EXIT scheme_immediate_exit(rval); - /* shouldn't get here */ +#endif + return rval; } @@ -341,20 +337,31 @@ static int cont_run(FinishArgs *f) /************************* do_scheme_rep *****************************/ /* Finally, do a read-eval-print-loop */ -static void do_scheme_rep(Scheme_Env *env) +static void do_scheme_rep(Scheme_Env *env, FinishArgs *fa) { /* enter read-eval-print loop */ - { - Scheme_Object *rep, *a[2]; + Scheme_Object *rep, *a[2]; + int ending_newline = 1; - a[0] = scheme_intern_symbol("scheme/base"); - a[1] = scheme_intern_symbol("read-eval-print-loop"); - rep = scheme_dynamic_require(2, a); +#ifdef GRAPHICAL_REPL + if (fa->a->alternate_rep) { + a[0] = scheme_intern_symbol("gracket/gracket"); + a[1] = scheme_intern_symbol("textual-read-eval-print-loop"); + } else { + a[0] = scheme_intern_symbol("gracket/gracket"); + a[1] = scheme_intern_symbol("graphical-read-eval-print-loop"); + } + ending_newline = 0; +#else + a[0] = scheme_intern_symbol("scheme/base"); + a[1] = scheme_intern_symbol("read-eval-print-loop"); +#endif + rep = scheme_dynamic_require(2, a); - if (rep) { - scheme_apply(rep, 0, NULL); + if (rep) { + scheme_apply(rep, 0, NULL); + if (ending_newline) printf("\n"); - } } } diff --git a/src/racket/src/error.c b/src/racket/src/error.c index 21ef665937..12e5e40b4e 100644 --- a/src/racket/src/error.c +++ b/src/racket/src/error.c @@ -43,10 +43,12 @@ /* globals */ SHARED_OK scheme_console_printf_t scheme_console_printf; scheme_console_printf_t scheme_get_console_printf() { return scheme_console_printf; } +void scheme_set_console_printf(scheme_console_printf_t p) { scheme_console_printf = p; } SHARED_OK Scheme_Exit_Proc scheme_exit; void scheme_set_exit(Scheme_Exit_Proc p) { scheme_exit = p; } HOOK_SHARED_OK void (*scheme_console_output)(char *str, long len); +void scheme_set_console_output(scheme_console_output_t p) { scheme_console_output = p; } SHARED_OK static int init_syslog_level = INIT_SYSLOG_LEVEL; SHARED_OK static int init_stderr_level = SCHEME_LOG_ERROR; diff --git a/src/racket/src/port.c b/src/racket/src/port.c index f2c1e62f13..8802f5ec71 100644 --- a/src/racket/src/port.c +++ b/src/racket/src/port.c @@ -676,6 +676,15 @@ Scheme_Object * scheme_make_eof (void) return scheme_eof; } +void scheme_set_stdio_makers(Scheme_Stdio_Maker_Proc in, + Scheme_Stdio_Maker_Proc out, + Scheme_Stdio_Maker_Proc err) +{ + scheme_make_stdin = in; + scheme_make_stdout = out; + scheme_make_stderr = err; +} + /*========================================================================*/ /* fd arrays */ /*========================================================================*/ diff --git a/src/worksp/gc2/make.rkt b/src/worksp/gc2/make.rkt index 838ca78243..19057f3782 100644 --- a/src/worksp/gc2/make.rkt +++ b/src/worksp/gc2/make.rkt @@ -316,162 +316,20 @@ (define wx-inc (string-append "/I ../../racket/include " "/I .. " - "/I ../../racket/gc2 " - "/I ../../wxwindow/include/msw " - "/I ../../wxwindow/include/base " - "/I ../../gracket/wxme " - "/I ../../wxwindow/contrib/wxxpm/libxpm.34b/lib " - "/I ../../wxWindow/contrib/fafa " - "/I ../../wxcommon/jpeg /I ../jpeg /I ../../wxcommon/zlib ")) -(try "wxprecomp.cxx" (list* "../../racket/src/schvers.h" common-deps) - "xsrc/wxprecomp.h" #f wx-inc #f "" "-DGC2_AS_IMPORT" #f #f) + "/I ../../racket " + "/I ../../racket/gc2 ")) -(define (wx-try base proj x use-precomp? suffix indirect?) - (let ([cxx-file (format "../../~a/~a.~a" base x suffix)]) - (try cxx-file - (list* cxx-file - common-deps) - (format "xsrc/~a.~a" x suffix) - (format "xsrc/~a.obj" x) - wx-inc - (and use-precomp? "xsrc/wxprecomp.h") - "-DGC2_JUST_MACROS /FI../../../racket/gc2/gc2.h" - (string-append "-DGC2_AS_IMPORT" - (if backtrace-gc? - " /D MZ_GC_BACKTRACE" - "")) - "wx.pch" - indirect?))) - -(define wxwin-base-srcs - '("wb_canvs" - "wb_cmdlg" - "wb_data" - "wb_dc" - "wb_dialg" - "wb_frame" - "wb_gdi" - "wb_hash" - "wb_item" - "wb_list" - "wb_main" - "wb_obj" - "wb_panel" - "wb_print" - "wb_ps" - "wb_stdev" - "wb_sysev" - "wb_timer" - "wb_types" - "wb_utils" - "wb_win")) - -(for-each (lambda (x) - (wx-try "wxwindow/src/base" "wxwin" x #t "cxx" #f)) - wxwin-base-srcs) - -(define wxwin-msw-srcs - '("wx_buttn" - "wx_canvs" - "wx_check" - "wx_choic" - "wx_clipb" - "wx_cmdlg" - "wx_dc" - "wx_dialg" - "wx_frame" - "wx_gauge" - "wx_gbox" - "wx_gdi" - "wx_graph_glue" - "wx_item" - "wx_lbox" - "wx_main" - "wx_menu" - "wx_messg" - "wx_panel" - "wx_pdf" - "wx_rbox" - "wx_slidr" - "wx_tabc" - "wx_timer" - "wx_utils" - "wx_win" - "wximgfil")) - -(for-each (lambda (x) - (wx-try "wxwindow/src/msw" "wxwin" x #t "cxx" #f)) - wxwin-msw-srcs) - -(define wxs-srcs - '("wxs_bmap" - "wxs_butn" - "wxs_chce" - "wxs_ckbx" - "wxs_cnvs" - "wxs_dc" - "wxs_evnt" - "wxs_fram" - "wxs_gage" - "wxs_gdi" - "wxs_glob" - "wxs_item" - "wxs_lbox" - "wxs_menu" - "wxs_misc" - "wxs_obj" - "wxs_panl" - "wxs_rado" - "wxs_slid" - "wxs_tabc" - "wxs_win" - "wxscheme")) - -(for-each (lambda (x) - (wx-try "gracket/wxs" "wxs" x #t "cxx" #f)) - wxs-srcs) - -(define gracket-srcs - '("gracket" - "gracketmsw")) - -(for-each (lambda (x) - (wx-try "gracket" "libgracket" x #t "cxx" #f)) - gracket-srcs) - -(wx-try "wxcommon" "wxme" "wxJPEG" #t "cxx" #f) -(wx-try "racket/utils" "wxme" "xcglue" #f "c" #f) -(c-compile "../../wxcommon/wxGC.cxx" - "xsrc/wxGC.obj" - null - (string-append wx-inc " -DMZ_PRECISE_GC -DGC2_AS_IMPORT -Dwx_msw")) - -(let ([objs (append (list - "xsrc/uniplt.obj" - "xsrc/wxGC.obj" - "xsrc/wxJPEG.obj" - "xsrc/xcglue.obj") - (map - (lambda (n) - (format "xsrc/~a.obj" n)) - (append wxwin-base-srcs - wxwin-msw-srcs - wxs-srcs - gracket-srcs)))] - [libs (list - "../../../lib/msvc/libracket3mxxxxxxx.lib" - "../wxutils/Release/wxutils.lib" - "../jpeg/Release/jpeg.lib" - "../png/Release/png.lib" - "../zlib/Release/zlib.lib")] - [win-libs (list - "comctl32.lib" "glu32.lib" "opengl32.lib" - "gdi32.lib" "comdlg32.lib" "advapi32.lib" - "shell32.lib" "ole32.lib" "oleaut32.lib" - "winmm.lib")]) - (link-dll (append objs libs) null win-libs "../../../lib/libgracket3mxxxxxxx.dll" "" #f)) - -(wx-try "gracket" "gracket" "grmain" #f "cxx" #t) +(try "../../gracket/grmain.c" + (list* "../../gracket/grmain.c" + common-deps) + "xsrc/grmain.c" + "xsrc/grmain.obj" + wx-inc + #f + "" + "/DWIN32 " + #f + #t) (check-rc "gracket.res" "../gracket/gracket.rc") @@ -479,11 +337,9 @@ "gracket.res" "xsrc/grmain.obj" "xsrc/uniplt.obj" - "../../../lib/msvc/libracket3mxxxxxxx.lib" - "../../../lib/msvc/libgracket3mxxxxxxx.lib")]) + "../../../lib/msvc/libracket3mxxxxxxx.lib")]) (link-dll objs - '("libracket3mxxxxxxx.dll" - "libgracket3mxxxxxxx.dll") + '("libracket3mxxxxxxx.dll") '("advapi32.lib" "delayimp.lib") "../../../GRacket.exe" " /subsystem:windows" #t)) diff --git a/src/worksp/gracket/gracket.rc b/src/worksp/gracket/gracket.rc index c2c79f16de..ebcd8c3bf2 100644 --- a/src/worksp/gracket/gracket.rc +++ b/src/worksp/gracket/gracket.rc @@ -1,6 +1,5 @@ //Microsoft Developer Studio generated resource script. // -#include "wx.rc" ///////////////////////////////////////////////////////////////////////////// // diff --git a/src/worksp/gracket/gracket.sln b/src/worksp/gracket/gracket.sln index 258cc729a5..1b08343803 100644 --- a/src/worksp/gracket/gracket.sln +++ b/src/worksp/gracket/gracket.sln @@ -27,34 +27,16 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libracket", "..\libracket\l EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libmzgc", "..\libmzgc\libmzgc.vcproj", "{66548E7B-294E-40EF-B7C0-C8D6D7E6234F}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "jpeg", "..\jpeg\jpeg.vcproj", "{1549C7C5-AF41-43BE-B905-BA6374FE6BEC}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "png", "..\png\png.vcproj", "{85CFDF8A-E7A2-4B6D-A0D2-1C75835B6AEA}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wxme", "..\wxme\wxme.vcproj", "{1C9F9C4D-FA97-4A56-8E7F-CA1EC99C35E3}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wxs", "..\wxs\wxs.vcproj", "{B9FC613A-B427-4DB5-B1E3-7673D384ECE3}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wxutils", "..\wxutils\wxutils.vcproj", "{31231DD7-4B8F-4E46-A747-81E41AFE04B5}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wxwin", "..\wxwin\wxwin.vcproj", "{5386B148-05B4-483B-B144-C3E2A6E15C78}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zlib", "..\zlib\zlib.vcproj", "{8CE7DC81-695B-436B-AA96-2D753846AFE5}" -EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution - Release|Win32 = Release|Win32 Debug|Win32 = Debug|Win32 + Release|Win32 = Release|Win32 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution {D59A2B28-330B-41F5-8261-F5BC1019E163}.Debug|Win32.ActiveCfg = Debug|Win32 {D59A2B28-330B-41F5-8261-F5BC1019E163}.Debug|Win32.Build.0 = Debug|Win32 {D59A2B28-330B-41F5-8261-F5BC1019E163}.Release|Win32.ActiveCfg = Release|Win32 {D59A2B28-330B-41F5-8261-F5BC1019E163}.Release|Win32.Build.0 = Release|Win32 - {81BD2D42-F150-493D-94BA-88585B202789}.Debug|Win32.ActiveCfg = Debug|Win32 - {81BD2D42-F150-493D-94BA-88585B202789}.Debug|Win32.Build.0 = Debug|Win32 - {81BD2D42-F150-493D-94BA-88585B202789}.Release|Win32.ActiveCfg = Release|Win32 - {81BD2D42-F150-493D-94BA-88585B202789}.Release|Win32.Build.0 = Release|Win32 {A6713577-7DFB-48F8-B8C1-7DB2D7C51F90}.Debug|Win32.ActiveCfg = Debug|Win32 {A6713577-7DFB-48F8-B8C1-7DB2D7C51F90}.Debug|Win32.Build.0 = Debug|Win32 {A6713577-7DFB-48F8-B8C1-7DB2D7C51F90}.Release|Win32.ActiveCfg = Release|Win32 @@ -63,34 +45,6 @@ Global {66548E7B-294E-40EF-B7C0-C8D6D7E6234F}.Debug|Win32.Build.0 = Debug|Win32 {66548E7B-294E-40EF-B7C0-C8D6D7E6234F}.Release|Win32.ActiveCfg = Release|Win32 {66548E7B-294E-40EF-B7C0-C8D6D7E6234F}.Release|Win32.Build.0 = Release|Win32 - {1549C7C5-AF41-43BE-B905-BA6374FE6BEC}.Debug|Win32.ActiveCfg = Debug|Win32 - {1549C7C5-AF41-43BE-B905-BA6374FE6BEC}.Debug|Win32.Build.0 = Debug|Win32 - {1549C7C5-AF41-43BE-B905-BA6374FE6BEC}.Release|Win32.ActiveCfg = Release|Win32 - {1549C7C5-AF41-43BE-B905-BA6374FE6BEC}.Release|Win32.Build.0 = Release|Win32 - {85CFDF8A-E7A2-4B6D-A0D2-1C75835B6AEA}.Debug|Win32.ActiveCfg = Debug|Win32 - {85CFDF8A-E7A2-4B6D-A0D2-1C75835B6AEA}.Debug|Win32.Build.0 = Debug|Win32 - {85CFDF8A-E7A2-4B6D-A0D2-1C75835B6AEA}.Release|Win32.ActiveCfg = Release|Win32 - {85CFDF8A-E7A2-4B6D-A0D2-1C75835B6AEA}.Release|Win32.Build.0 = Release|Win32 - {1C9F9C4D-FA97-4A56-8E7F-CA1EC99C35E3}.Debug|Win32.ActiveCfg = Debug|Win32 - {1C9F9C4D-FA97-4A56-8E7F-CA1EC99C35E3}.Debug|Win32.Build.0 = Debug|Win32 - {1C9F9C4D-FA97-4A56-8E7F-CA1EC99C35E3}.Release|Win32.ActiveCfg = Release|Win32 - {1C9F9C4D-FA97-4A56-8E7F-CA1EC99C35E3}.Release|Win32.Build.0 = Release|Win32 - {B9FC613A-B427-4DB5-B1E3-7673D384ECE3}.Debug|Win32.ActiveCfg = Debug|Win32 - {B9FC613A-B427-4DB5-B1E3-7673D384ECE3}.Debug|Win32.Build.0 = Debug|Win32 - {B9FC613A-B427-4DB5-B1E3-7673D384ECE3}.Release|Win32.ActiveCfg = Release|Win32 - {B9FC613A-B427-4DB5-B1E3-7673D384ECE3}.Release|Win32.Build.0 = Release|Win32 - {31231DD7-4B8F-4E46-A747-81E41AFE04B5}.Debug|Win32.ActiveCfg = Debug|Win32 - {31231DD7-4B8F-4E46-A747-81E41AFE04B5}.Debug|Win32.Build.0 = Debug|Win32 - {31231DD7-4B8F-4E46-A747-81E41AFE04B5}.Release|Win32.ActiveCfg = Release|Win32 - {31231DD7-4B8F-4E46-A747-81E41AFE04B5}.Release|Win32.Build.0 = Release|Win32 - {5386B148-05B4-483B-B144-C3E2A6E15C78}.Debug|Win32.ActiveCfg = Debug|Win32 - {5386B148-05B4-483B-B144-C3E2A6E15C78}.Debug|Win32.Build.0 = Debug|Win32 - {5386B148-05B4-483B-B144-C3E2A6E15C78}.Release|Win32.ActiveCfg = Release|Win32 - {5386B148-05B4-483B-B144-C3E2A6E15C78}.Release|Win32.Build.0 = Release|Win32 - {8CE7DC81-695B-436B-AA96-2D753846AFE5}.Debug|Win32.ActiveCfg = Debug|Win32 - {8CE7DC81-695B-436B-AA96-2D753846AFE5}.Debug|Win32.Build.0 = Debug|Win32 - {8CE7DC81-695B-436B-AA96-2D753846AFE5}.Release|Win32.ActiveCfg = Release|Win32 - {8CE7DC81-695B-436B-AA96-2D753846AFE5}.Release|Win32.Build.0 = Release|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/src/worksp/gracket/gracket.vcproj b/src/worksp/gracket/gracket.vcproj index a854ce0274..9714a6ebd6 100644 --- a/src/worksp/gracket/gracket.vcproj +++ b/src/worksp/gracket/gracket.vcproj @@ -43,7 +43,7 @@ InlineFunctionExpansion="2" EnableIntrinsicFunctions="true" FavorSizeOrSpeed="1" - AdditionalIncludeDirectories="..,..\..\racket\gc,..\..\wxwindow\include\base,..\..\wxwindow\include\msw,..\..\racket\include,..\..\racket\utils,..\..\wxwindow\contrib\fafa" + AdditionalIncludeDirectories="..,..\..\racket\gc,..\..\racket\include" PreprocessorDefinitions="WIN32,NDEBUG,_WINDOWS,__WINDOWS__,GC_DLL,__STDC__,_CRT_SECURE_NO_DEPRECATE" StringPooling="true" RuntimeLibrary="0" @@ -130,7 +130,7 @@ - - - -