|
From: Ethan A M. <merritt@u.washington.edu> - 2006-11-18 03:28:57
|
On Friday 17 November 2006 04:07 pm, Timoth=C3=A9e Lecomte wrote: > To sum up: > *get 4.2rc1 from gnuplot.sf.net > *apply wxmac.diff to src/wxterminal Most of wxmac.diff looks like an obvious accommodation to=20 Mac build options. However the bit below doesn't look like it has anything to do with the Mac, but rather Windows. Is this something that needs to go into the general code regardless of this Mac discussion? =20 diff -Naur old/wxt_gui.h new/wxt_gui.h =2D-- old/wxt_gui.h 2006-10-08 22:37:53.000000000 +0200 +++ new/wxt_gui.h 2006-10-08 22:48:38.000000000 +0200 @@ -127,6 +127,11 @@ # define IMAGE_SURFACE #endif =20 +/* by default, enable IMAGE_SURFACE */ +#if !defined(GTK_SURFACE)&&!defined(IMAGE_SURFACE)&&!defined(__WXMSW__) +# define IMAGE_SURFACE +#endif + /* temporarly undef GTK_SURFACE for two reasons : * - because of a CAIRO_OPERATOR_SATURATE bug, * - because as for now, it is slower than the pure image surface, > *run ./prepare, then ./configure with your favorite options, 'make',=20 > 'make install' > You get a working gnuplot with the wxt terminal (assuming you have=20 > cairo, pango and wxMac installed), but the plot windows don't get the foc= us >=20 > Then the bundling stuff: > *download the attached Icon.plist and wxmac.icns files > *run the following commands to create the bundle tree: > mkdir -p ./gnuplot.app/Contents/MacOS/ > mkdir -p ./gnuplot.app/Contents/Resources/ > mkdir -p ./gnuplot.app/Contents/Frameworks/ > cp ../src/gnuplot ./gnuplot.app/Contents/MacOS/gnuplot > echo -n 'APPL????' > ./gnuplot.app/Contents/PkgInfo > * retrieve the attached Icon.plist and wxmac.icns files, put them in the= =20 > current directory, and put them at their respective locations in the=20 > bundle with the following commands: > cp ./Info.plist ./gnuplot.app/Contents/ > cp ./wxmac.icns ./gnuplot.app/Contents/Resources/ >=20 > Then, you're supposed to be all set. To launch gnuplot, do: > open gnuplot.app > or > ./gnuplot.app/Contents/MacOS/gnuplot >=20 > ... and it should be fine now, according to what I've been told on IRC. >=20 > Joe, could you try again with these instructions ? Thank you very much. >=20 > Best regards, >=20 > Timoth=C3=A9e Lecomte >=20 >=20 =2D-=20 Ethan A Merritt Biomolecular Structure Center University of Washington, Seattle 98195-7742 |