CVS: tvision config.pl,1.86.2.21.2.2,1.86.2.21.2.3 conflib.pl,1.35.2.8.2.1,1.35.2.8.2.2

[Grzegorz A. H. <gr...@us...>]

Update of /cvsroot/tvision/tvision
In directory sc8-pr-cvs1:/tmp/cvs-serv26402

Modified Files:
      Tag: r2_0_1a
	config.pl conflib.pl 
Log Message:
Added some linker flags.

Index: config.pl
===================================================================
RCS file: /cvsroot/tvision/tvision/config.pl,v
retrieving revision 1.86.2.21.2.2
retrieving revision 1.86.2.21.2.3
diff -C2 -d -r1.86.2.21.2.2 -r1.86.2.21.2.3
*** config.pl	3 Dec 2003 19:50:35 -0000	1.86.2.21.2.2
--- config.pl	4 Dec 2003 22:16:29 -0000	1.86.2.21.2.3
***************
*** 166,169 ****
--- 166,173 ----
     $MakeDefsRHIDE[0]='RHIDE_STDINC=';
     $MakeDefsRHIDE[2].=' gdi32'; # Needed for WinGr driver
+    if ($conf{'alcon'} eq 'yes')
+      {
+       $MakeDefsRHIDE[2].=' kernel32 user32 comdlg32 ole32 dinput ddraw dxguid winmm dsound moldname msvcrt';
+      }
     $MakeDefsRHIDE[3]='TVOBJ=../../makes ';
     $MakeDefsRHIDE[3].=$here.'/makes ' unless $conf{'libs-here'} eq 'no';
***************
*** 180,183 ****
--- 184,188 ----
  $MakeDefsRHIDE[6].='-L/lib' if ($OSf eq 'QNXRtP');
  $MakeDefsRHIDE[6].=' -shared -Wl,-soname,librhtv.so.'.$Version;
+ $MakeDefsRHIDE[6].=' ESTO NO FUNCIONA -L/usr/lib/mingw -L/lib/mingw' if ($conf{'MinGW_under_cygwin'} eq 'yes');
  $libs=$conf{'X11Lib'};
  $libs=~s/(\S+)/-l$1/g;

Index: conflib.pl
===================================================================
RCS file: /cvsroot/tvision/tvision/conflib.pl,v
retrieving revision 1.35.2.8.2.1
retrieving revision 1.35.2.8.2.2
diff -C2 -d -r1.35.2.8.2.1 -r1.35.2.8.2.2
*** conflib.pl	3 Dec 2003 19:50:35 -0000	1.35.2.8.2.1
--- conflib.pl	4 Dec 2003 22:16:29 -0000	1.35.2.8.2.2
***************
*** 243,246 ****
--- 243,247 ----
           {
            @lista=split(/:/,@ENV{'PATH'});
+           @conf{'MinGW_under_cygwin'} = 'yes';
           }
         else
***************
*** 1013,1017 ****
      $text.="RHIDE_GCC=$GCC\n";
      $text.="RHIDE_GXX=$GXX\n";
!     $text.="RHIDE_LD=$GXX\n";
      $text.="RHIDE_AR=$GAR\n" if ($GAR);
      $rep ='rc';
--- 1014,1025 ----
      $text.="RHIDE_GCC=$GCC\n";
      $text.="RHIDE_GXX=$GXX\n";
!     if ($conf{'alcon'} eq 'yes')
!       {
!        $text.="RHIDE_LD=$GXX --subsystem,windows \n";
!       }
!     else
!       {
!        $text.="RHIDE_LD=$GXX\n";
!       }
      $text.="RHIDE_AR=$GAR\n" if ($GAR);
      $rep ='rc';