From e22199f9828597e0e602be092622a9e8bb8348d7 Mon Sep 17 00:00:00 2001 From: Hans-Christoph Steiner Date: Tue, 20 Dec 2005 00:13:17 +0000 Subject: added in mingw_fixes patch which includes NT2_MSC_VER and lots of other stuff so that everything can compile using MinGW; reorged things to use the full name 'windows' rather than just 'win'. This matches 'darwin' and 'linux'; this is windows RC6 svn path=/trunk/; revision=4260 --- packages/patches/win/NT2_MSC_VER.patch | 59 ------------------------------ packages/patches/win/win_font_tweaks.patch | 25 ------------- 2 files changed, 84 deletions(-) delete mode 100644 packages/patches/win/NT2_MSC_VER.patch delete mode 100644 packages/patches/win/win_font_tweaks.patch (limited to 'packages/patches/win') diff --git a/packages/patches/win/NT2_MSC_VER.patch b/packages/patches/win/NT2_MSC_VER.patch deleted file mode 100644 index 7c5f3d25..00000000 --- a/packages/patches/win/NT2_MSC_VER.patch +++ /dev/null @@ -1,59 +0,0 @@ -? configure -Index: d_mayer_fft.c -=================================================================== -RCS file: /cvsroot/pure-data/pd/src/d_mayer_fft.c,v -retrieving revision 1.3 -diff -u -w -r1.3 d_mayer_fft.c ---- d_mayer_fft.c 18 May 2005 04:28:50 -0000 1.3 -+++ d_mayer_fft.c 17 Nov 2005 23:29:25 -0000 -@@ -48,7 +48,8 @@ - * of work. -msp - */ - --#ifdef MSW -+/* These pragmas are only used for MSVC, not MinGW or Cygwin */ -+#ifdef _MSC_VER - #pragma warning( disable : 4305 ) /* uncast const double to float */ - #pragma warning( disable : 4244 ) /* uncast double to float */ - #pragma warning( disable : 4101 ) /* unused local variables */ -Index: m_pd.h -=================================================================== -RCS file: /cvsroot/pure-data/pd/src/m_pd.h,v -retrieving revision 1.8 -diff -u -w -r1.8 m_pd.h ---- m_pd.h 19 Aug 2005 23:28:03 -0000 1.8 -+++ m_pd.h 17 Nov 2005 23:29:25 -0000 -@@ -17,12 +17,13 @@ - #define MSW - #endif - --#ifdef MSW -+/* These pragmas are only used for MSVC, not MinGW or Cygwin */ -+#ifdef _MSC_VER - /* #pragma warning( disable : 4091 ) */ - #pragma warning( disable : 4305 ) /* uncast const double to float */ - #pragma warning( disable : 4244 ) /* uncast float/int conversion etc. */ - #pragma warning( disable : 4101 ) /* unused automatic variables */ --#endif /* MSW */ -+#endif /* _MSC_VER */ - - /* the external storage class is "extern" in UNIX; in MSW it's ugly. */ - #ifdef MSW -Index: t_tkcmd.c -=================================================================== -RCS file: /cvsroot/pure-data/pd/src/t_tkcmd.c,v -retrieving revision 1.6 -diff -u -w -r1.6 t_tkcmd.c ---- t_tkcmd.c 15 Oct 2005 23:14:28 -0000 1.6 -+++ t_tkcmd.c 17 Nov 2005 23:29:25 -0000 -@@ -30,7 +30,9 @@ - #include - #include - #endif --#ifdef MSW -+ -+/* These pragmas are only used for MSVC, not MinGW or Cygwin */ -+#ifdef _MSC_VER - #pragma warning( disable : 4305 ) /* uncast const double to float */ - #pragma warning( disable : 4244 ) /* uncast double to float */ - #pragma warning( disable : 4101 ) /* unused local variables */ diff --git a/packages/patches/win/win_font_tweaks.patch b/packages/patches/win/win_font_tweaks.patch deleted file mode 100644 index a7c9cd82..00000000 --- a/packages/patches/win/win_font_tweaks.patch +++ /dev/null @@ -1,25 +0,0 @@ -Index: u_main.tk -=================================================================== -RCS file: /cvsroot/pure-data/pd/src/u_main.tk,v -retrieving revision 1.7.2.4 -diff -u -w -r1.7.2.4 u_main.tk ---- u_main.tk 21 Feb 2005 04:20:20 -0000 1.7.2.4 -+++ u_main.tk 27 Nov 2005 04:08:45 -0000 -@@ -158,7 +158,7 @@ - - - frame .printout --text .printout.text -relief raised -bd 2 -font -*-courier-bold--normal--12-* \ -+text .printout.text -relief raised -bd 2 -font { courier 9 } \ - -yscrollcommand ".printout.scroll set" -width 80 - # .printout.text insert end "\n\n\n\n\n\n\n\n\n\n" - scrollbar .printout.scroll -command ".printout.text yview" -@@ -337,7 +337,7 @@ - global pd_myversion - set name [format ".help%d" $doc_number] - toplevel $name -- text $name.text -relief raised -bd 2 -font -*-courier-bold--normal--12-* \ -+ text $name.text -relief raised -bd 2 -font { helvetica 10 } \ - -yscrollcommand "$name.scroll set" -background white - scrollbar $name.scroll -command "$name.text yview" - pack $name.scroll -side right -fill y -- cgit v1.2.1