From aa662fce43964f8f2ac483394d3d500a604b491d Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sat, 6 Aug 2011 22:41:53 +0000 Subject: newer asymptote library sources git-svn-id: svn://tug.org/texlive/trunk@23432 c570f23f-e606-0410-a88d-b1316a301751 --- Master/source/asymptote/asymptote.README | 57 ++++++--------------- Master/source/asymptote/cygwin-1.5.25-15.tar.bz2 | Bin 1427096 -> 0 bytes .../source/asymptote/cygwin-src-20110327.tar.bz2 | Bin 0 -> 14366520 bytes 3 files changed, 16 insertions(+), 41 deletions(-) delete mode 100644 Master/source/asymptote/cygwin-1.5.25-15.tar.bz2 create mode 100644 Master/source/asymptote/cygwin-src-20110327.tar.bz2 (limited to 'Master/source/asymptote') diff --git a/Master/source/asymptote/asymptote.README b/Master/source/asymptote/asymptote.README index 4c4c6bd0d4d..9e6bfd8d31b 100644 --- a/Master/source/asymptote/asymptote.README +++ b/Master/source/asymptote/asymptote.README @@ -5,55 +5,30 @@ included in the TL sources. We also include a number of Windows dll's for Asymptote (and nothing else). Sources for cygwin1.dll: -ftp://ftp.cygwin.com/pub/cygwin/release/cygwin/cygwin-1.5.25-15.tar.bz2 - -Sources for freeglut.dll: -http://prdownloads.sourceforge.net/freeglut/freeglut-2.6.0-rc1.tar.gz +http://cygwin.com/snapshots/cygwin-src-20110327.tar.bz2 Sources for glu32.dll: -ftp://oss.sgi.com/projects/ogl-sample/download/ogl-sample.20000807.tgz -(via http://oss.sgi.com/projects/ogl-sample/ - and http://www.geocities.com/vmelkon/glu.html) +ftp://ftp.freedesktop.org/pub/mesa/7.6/MesaLib-7.6.tar.bz2 + patched as detailed here: +http://old.nabble.com/Error-building-MesaLib-7.6-onto-Win32-with-Microsoft-Visual-Studio-2005-and-2008-td25990977.html +Sources for freeglut.dll: +http://prdownloads.sourceforge.net/freeglut/freeglut-2.6.0-rc1.tar.gz -Here are some explicit instructions, copied from -http://sourceforge.net/projects/asymptote/forums/forum/409349/topic/2979676?message=7457145 - -Date: 22 Jun 2009 01:31:13 -0600 -From: John Bowman bowman/at/math/ualberta/ca - -For the record, here are the latest instructions for building freeglut.dll -under CYGWIN. (The next release of Asymptote, version 1.78, will ship with -version 2.6.0-rc1 of freeglut.dll): - +Here are explicit instructions from John for compiling freeglut: #!/bin/sh -x -#wget http://prdownloads.sourceforge.net/freeglut/freeglut-2.6.0-rc1.tar.gz -tar -zxf freeglut-2.6.0-rc1.tar.gz +#Be sure to install header files in /usr/include/w32api/GL/ +#and remove /usr/include/GL +# +ln -sf /usr/bin/cyggcc_s-1.dll /usr/lib/libgcc_s.a +wget http://prdownloads.sourceforge.net/freeglut/freeglut-2.6.0.tar.gz +tar -zxf freeglut-2.6.0.tar.gz cd freeglut-2.6.0 -patch -p1 < ../patches/freeglut-cygwin.patch ./configure --prefix=/usr --without-x make -k cd src gcc -s -static -shared -o freeglut.dll *.o -Wl,--out-implib=libfreeglut.a -lglu32 -lopengl32 -lgdi32 -lwinmm -cp libfreeglut.a freeglut.dll /lib - -#OPTIONAL: To compile manually in src: -#gcc -O2 -c -D_WIN32 -DHAVE_CONFIG_H -DFREEGLUT_EXPORTS *.c -I.. -I../include - - - -Here ../patches/freeglut-cygwin.patch refers to: - -diff -ru freeglut-2.6.0/configure freeglut-2.6.0J/configure ---- freeglut-2.6.0/configure 2009-04-20 20:53:07.000000000 -0700 -+++ freeglut-2.6.0J/configure 2009-06-22 06:49:17.640625000 -0700 -@@ -21289,7 +21289,7 @@ - LIBXXF86VM= - LIBXI= - VERSION_INFO= -- EXPORT_FLAGS="-DFREEGLUT_EXPORTS" -+ EXPORT_FLAGS="-DFREEGLUT_EXPORTS -D_WIN32" - else - GL_LIBS="-lGL -lXext -lX11" - { echo "$as_me:$LINENO: checking for XF86VidModeSwitchToMode in -lXxf86vm" >&5 +cp freeglut.dll /lib +gcc -s -shared -o freeglut.dll *.o -Wl,--out-implib=libfreeglut.a -lglu32 -lopengl32 -lgdi32 -lwinmm +cp libfreeglut.a /lib diff --git a/Master/source/asymptote/cygwin-1.5.25-15.tar.bz2 b/Master/source/asymptote/cygwin-1.5.25-15.tar.bz2 deleted file mode 100644 index 940c1e5c0fa..00000000000 Binary files a/Master/source/asymptote/cygwin-1.5.25-15.tar.bz2 and /dev/null differ diff --git a/Master/source/asymptote/cygwin-src-20110327.tar.bz2 b/Master/source/asymptote/cygwin-src-20110327.tar.bz2 new file mode 100644 index 00000000000..ab461b512c6 Binary files /dev/null and b/Master/source/asymptote/cygwin-src-20110327.tar.bz2 differ -- cgit v1.2.3