Attachment #4304 for issue #10681

View | Details | Raw Unified | Return to issue 10681
Collapse All | Expand All




{  $SOLARINCLUDES     = $I.$SOLARVER.$INC.
                        $I.$SOLARENV.$ds.$INPATH.$INC.
                        $I.$SOLARENV.$INC.
                        $I."'".$PSDK_HOME.$INCLUDE."'".
                        $I.'$COMPATH'.$ds."include";
}
elsif ($platform eq "$Macosx")
{  $SOLARINCLUDES     = $I.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$INC.

                        $ps.$SOLARVER.$ds.$UPD.$ds.$INPATH.$INC.
                        $ps.$SOLARENV.$ds.$OUTPATH.$INC.
                        $ps.$SOLARENV.$INC.
                        $ps.'$PSDK_HOME'.$INCLUDE.
                        $ps.'$COMPATH'.$INCLUDE;

   $WIN_LIB             = $cur_dir.$ps_STLPORT_LIB.$ps.
                        $ps.$SOLARVER.$ds.$UPD.$LIB.
                        $ps.$SOLARVER.$ds.$UPD.$ds.$INPATH.$LIB.
                        $ps.$SOLARENV.$ds.$OUTPATH.$LIB.
                        $ps.$JAVA_HOME.$LIB.
                        $ps.'$PSDK_HOME'.$LIB.
                        $ps.'$COMPATH'.$LIB;

   if ( $JAVA_HOME ne "" )
   {

{  $SOLARINC         .= $STLPORT_stlport.
                        $I.'$JAVA_HOME'.$ds."include".$ds."win32".
                        $I.'$JAVA_HOME'.$ds."include".
                        $I."'".$PSDK_HOME.$INCLUDE."'".
                        $I.'$COMPATH'.$ds."include";
}
elsif ($platform eq "$Macosx")
{  $SOLARINC         .= $STLPORT_stlport.

Return to issue 10681

Lines 991-998 Link Here

(-)config_office/set_soenv.in (-8 / +8 lines)
991	{ $SOLARINCLUDES = $I.$SOLARVER.$INC.	991	{ $SOLARINCLUDES = $I.$SOLARVER.$INC.
992	$I.$SOLARENV.$ds.$INPATH.$INC.	992	$I.$SOLARENV.$ds.$INPATH.$INC.
993	$I.$SOLARENV.$INC.	993	$I.$SOLARENV.$INC.
994	$I.'$COMPATH'.$ds."include".	994	$I."'".$PSDK_HOME.$INCLUDE."'".
995	$I."'".$PSDK_HOME.$INCLUDE."'"; # This must be the last	995	$I.'$COMPATH'.$ds."include";
996	}	996	}
997	elsif ($platform eq "$Macosx")	997	elsif ($platform eq "$Macosx")
998	{ $SOLARINCLUDES = $I.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$INC.	998	{ $SOLARINCLUDES = $I.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$INC.
Lines 1011-1026 Link Here
1011	$ps.$SOLARVER.$ds.$UPD.$ds.$INPATH.$INC.	1011	$ps.$SOLARVER.$ds.$UPD.$ds.$INPATH.$INC.
1012	$ps.$SOLARENV.$ds.$OUTPATH.$INC.	1012	$ps.$SOLARENV.$ds.$OUTPATH.$INC.
1013	$ps.$SOLARENV.$INC.	1013	$ps.$SOLARENV.$INC.
1014	$ps.'$COMPATH'.$INCLUDE.	1014	$ps.'$PSDK_HOME'.$INCLUDE.
1015	$ps.'$PSDK_HOME'.$INCLUDE; # This must be the last.	1015	$ps.'$COMPATH'.$INCLUDE;
1016		1016
1017	$WIN_LIB = $cur_dir.$ps_STLPORT_LIB.$ps.	1017	$WIN_LIB = $cur_dir.$ps_STLPORT_LIB.$ps.
1018	$ps.$SOLARVER.$ds.$UPD.$LIB.	1018	$ps.$SOLARVER.$ds.$UPD.$LIB.
1019	$ps.$SOLARVER.$ds.$UPD.$ds.$INPATH.$LIB.	1019	$ps.$SOLARVER.$ds.$UPD.$ds.$INPATH.$LIB.
1020	$ps.$SOLARENV.$ds.$OUTPATH.$LIB.	1020	$ps.$SOLARENV.$ds.$OUTPATH.$LIB.
1021	$ps.$JAVA_HOME.$LIB.	1021	$ps.$JAVA_HOME.$LIB.
1022	$ps.'$COMPATH'.$LIB.	1022	$ps.'$PSDK_HOME'.$LIB.
1023	$ps.'$PSDK_HOME'.$LIB;	1023	$ps.'$COMPATH'.$LIB;
1024		1024
1025	if ( $JAVA_HOME ne "" )	1025	if ( $JAVA_HOME ne "" )
1026	{	1026	{
Lines 1299-1306 Link Here
1299	{ $SOLARINC .= $STLPORT_stlport.	1299	{ $SOLARINC .= $STLPORT_stlport.
1300	$I.'$JAVA_HOME'.$ds."include".$ds."win32".	1300	$I.'$JAVA_HOME'.$ds."include".$ds."win32".
1301	$I.'$JAVA_HOME'.$ds."include".	1301	$I.'$JAVA_HOME'.$ds."include".
1302	$I.'$COMPATH'.$ds."include".	1302	$I."'".$PSDK_HOME.$INCLUDE."'".
1303	$I."'".$PSDK_HOME.$INCLUDE."'"; # This must be the last.	1303	$I.'$COMPATH'.$ds."include";
1304	}	1304	}
1305	elsif ($platform eq "$Macosx")	1305	elsif ($platform eq "$Macosx")
1306	{ $SOLARINC .= $STLPORT_stlport.	1306	{ $SOLARINC .= $STLPORT_stlport.