perl-win32-gui-cvscommit

[Robert M. <rob...@us...>]

Update of /cvsroot/perl-win32-gui/Win32-GUI
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24444

Modified Files:
	CHANGELOG Makefile.PL RichEdit.xs 
Log Message:
Fix build under cygwin

Index: RichEdit.xs
===================================================================
RCS file: /cvsroot/perl-win32-gui/Win32-GUI/RichEdit.xs,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** RichEdit.xs	11 Jan 2006 21:26:16 -0000	1.7
--- RichEdit.xs	25 Apr 2006 21:24:52 -0000	1.8
***************
*** 294,298 ****
          EXTEND(SP, 2);
          XST_mPV(si++, "-bold");
!         XST_mIV(si++, cf.dwEffects & CFE_BOLD > 0);
      }
      if(dwMask & CFM_COLOR) {
--- 294,298 ----
          EXTEND(SP, 2);
          XST_mPV(si++, "-bold");
!         XST_mIV(si++, (cf.dwEffects & CFE_BOLD) ? 1 : 0);
      }
      if(dwMask & CFM_COLOR) {
***************
*** 309,313 ****
          EXTEND(SP, 2);
          XST_mPV(si++, "-italic");
!         XST_mIV(si++, cf.dwEffects & CFE_ITALIC > 0);
      }
      if(dwMask & CFM_SIZE) {
--- 309,313 ----
          EXTEND(SP, 2);
          XST_mPV(si++, "-italic");
!         XST_mIV(si++, (cf.dwEffects & CFE_ITALIC) ? 1 : 0);
      }
      if(dwMask & CFM_SIZE) {
***************
*** 319,328 ****
          EXTEND(SP, 2);
          XST_mPV(si++, "-strikeout");
!         XST_mIV(si++, cf.dwEffects & CFE_STRIKEOUT > 0);
      }
      if(dwMask & CFM_UNDERLINE) {
          EXTEND(SP, 2);
          XST_mPV(si++, "-underline");
!         XST_mIV(si++, cf.dwEffects & CFE_UNDERLINE > 0);
      }
      XSRETURN(si);
--- 319,328 ----
          EXTEND(SP, 2);
          XST_mPV(si++, "-strikeout");
!         XST_mIV(si++, (cf.dwEffects & CFE_STRIKEOUT) ? 1 : 0);
      }
      if(dwMask & CFM_UNDERLINE) {
          EXTEND(SP, 2);
          XST_mPV(si++, "-underline");
!         XST_mIV(si++, (cf.dwEffects & CFE_UNDERLINE) ? 1 : 0);
      }
      XSRETURN(si);

Index: Makefile.PL
===================================================================
RCS file: /cvsroot/perl-win32-gui/Win32-GUI/Makefile.PL,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** Makefile.PL	13 Apr 2006 22:17:07 -0000	1.19
--- Makefile.PL	25 Apr 2006 21:24:52 -0000	1.20
***************
*** 3,7 ****
  
  use File::Spec();
! use ExtUtils::MakeMaker;
  use Config;
  
--- 3,10 ----
  
  use File::Spec();
! # Bug in ExUtils::MakeMaker 5.45 that ships with ActiveState Perl
! # 5.6.1, writes the subdirs target with dmake syntax, that breaks
! # nmake.  Fixed in EU::MM 5.47
! use ExtUtils::MakeMaker 5.47;
  use Config;
  
***************
*** 203,207 ****
      NAME            => 'Win32::GUI',
      VERSION_FROM    => 'GUI.pm',
!     LIBS            => [':nosearch -lcomctl32 -lcomdlg32 -lshell32 -lgdi32 -luser32'],
      PREREQ_PM       => {
                           'Test::More' => 0,
--- 206,210 ----
      NAME            => 'Win32::GUI',
      VERSION_FROM    => 'GUI.pm',
!     LIBS            => [':nosearch -lcomctl32 -lcomdlg32 -lshell32 -lgdi32 -luser32 -lversion'],
      PREREQ_PM       => {
                           'Test::More' => 0,
***************
*** 243,247 ****
  
  if ($main::BUILDENV eq "cygwin") {
!   $MakefileArgs{'LIBS'} = ['-L/usr/lib/w32api -lcomctl32 -lcomdlg32 -lshell32 -lgdi32 -luser32'];
    $MakefileArgs{'DEFINE'} = '-UWIN32';
    $MakefileArgs{'MYEXTLIB'} = './libcyg.a';
--- 246,250 ----
  
  if ($main::BUILDENV eq "cygwin") {
!   $MakefileArgs{'LIBS'} = ['-L/usr/lib/w32api -lcomctl32 -lcomdlg32 -lshell32 -lgdi32 -luser32 -lversion'];
    $MakefileArgs{'DEFINE'} = '-UWIN32';
    $MakefileArgs{'MYEXTLIB'} = './libcyg.a';
***************
*** 259,263 ****
  sub pasthru {
    my $inherited = shift->SUPER::pasthru(@_);
!   return "$inherited W32G_CORE=1";
  }
  
--- 262,268 ----
  sub pasthru {
    my $inherited = shift->SUPER::pasthru(@_);
!   chomp $inherited;
!   $inherited .= "\\\n\tW32G_CORE=1";
!   return $inherited;
  }
  

Index: CHANGELOG
===================================================================
RCS file: /cvsroot/perl-win32-gui/Win32-GUI/CHANGELOG,v
retrieving revision 1.79
retrieving revision 1.80
diff -C2 -d -r1.79 -r1.80
*** CHANGELOG	20 Apr 2006 22:20:20 -0000	1.79
--- CHANGELOG	25 Apr 2006 21:24:51 -0000	1.80
***************
*** 6,9 ****
--- 6,14 ----
  Win32-GUI ChangeLog
  ===================
+ + [Robert May] : 25 Apr 2006 - Fix build under cygwin/MSVC7
+     - RichEdit.xs fix precedence warning under VC7
+     - Makefile.PL fix LIBS under cygwin (add -lversion); fix
+       pasthru target under cygwin
+ 
  + [Robert May] : 20 Apr 2006 - Fix build under MinGW
      - GUI.xs correct typo in type definition (LPCTSTR vs LPTSTR);