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

(-)config_office/set_soenv.in (-9 / +11 lines)
Lines 86-92 Link Here
86
     $STAR_REGISTRY, $STAR_RESOURCEPATH, $DMAKEROOT, $CLASSPATH, $XCLASSPATH, $COMPATH, $COMPATH_ROOT, 
86
     $STAR_REGISTRY, $STAR_RESOURCEPATH, $DMAKEROOT, $CLASSPATH, $XCLASSPATH, $COMPATH, $COMPATH_ROOT, 
87
     $LD_LIBRARY_PATH, $PATH, $SOLARDEF, $SOLAREXTRAINC, $SOLAREXTRALIB, $SOLARINCLUDES, $SOLARLIB, 
87
     $LD_LIBRARY_PATH, $PATH, $SOLARDEF, $SOLAREXTRAINC, $SOLAREXTRALIB, $SOLARINCLUDES, $SOLARLIB, 
88
     $SOLARINC, $LOCALINI, $MAC_LIB, $PATHEXTRA, $FRAMEWORKSHOME, $COMEX, $MULTITHREAD_OBJ, $PERL, 
88
     $SOLARINC, $LOCALINI, $MAC_LIB, $PATHEXTRA, $FRAMEWORKSHOME, $COMEX, $MULTITHREAD_OBJ, $PERL, 
89
     $COMP_ENV, $IENV, $ILIB, $WIN_INCLUDE, $JAVAHOME, $WIN_LIB, $WIN_HOME, $PSDK_HOME,
89
     $COMP_ENV, $IENV, $ILIB, $WIN_INCLUDE, $JAVAHOME, $WIN_LIB, $WIN_HOME, $PSDK_HOME, $USE_NEW_SDK,
90
     $BISON_HAIRY, $BISON_SIMPLE, $TEMP, $COMMON_BUILD_TOOLS, $WIN_GREP, $WIN_FIND, $WIN_LS,
90
     $BISON_HAIRY, $BISON_SIMPLE, $TEMP, $COMMON_BUILD_TOOLS, $WIN_GREP, $WIN_FIND, $WIN_LS,
91
     $WIN_GNUCOPY, $WIN_TOUCH, $STLPORT4, $USE_GCC3, $ENABLE_DEBUG );
91
     $WIN_GNUCOPY, $WIN_TOUCH, $STLPORT4, $USE_GCC3, $ENABLE_DEBUG );
92
#
92
#
Lines 503-508 Link Here
503
{ 
503
{ 
504
      $COMPATH        = PosixFormat('@COMPATH@');
504
      $COMPATH        = PosixFormat('@COMPATH@');
505
      $PSDK_HOME      = PosixFormat('@PSDK_HOME@');
505
      $PSDK_HOME      = PosixFormat('@PSDK_HOME@');
506
      $USE_NEW_SDK    = "TRUE";
506
      $CPUNAME        = "INTEL";
507
      $CPUNAME        = "INTEL";
507
      $CPU            = "I";
508
      $CPU            = "I";
508
      $GUI            = "WNT";
509
      $GUI            = "WNT";
Lines 991-998 Link Here
991
{  $SOLARINCLUDES     = $I.$SOLARVER.$INC.
992
{  $SOLARINCLUDES     = $I.$SOLARVER.$INC.
992
                        $I.$SOLARENV.$ds.$INPATH.$INC.
993
                        $I.$SOLARENV.$ds.$INPATH.$INC.
993
                        $I.$SOLARENV.$INC.
994
                        $I.$SOLARENV.$INC.
994
                        $I.'$COMPATH'.$ds."include".
995
                        $I."'".$PSDK_HOME.$INCLUDE."'".
995
                        $I."'".$PSDK_HOME.$INCLUDE."'"; # This must be the last
996
                        $I.'$COMPATH'.$ds."include";
996
}
997
}
997
elsif ($platform eq "$Macosx")
998
elsif ($platform eq "$Macosx")
998
{  $SOLARINCLUDES     = $I.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$INC.
999
{  $SOLARINCLUDES     = $I.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$INC.
Lines 1011-1026 Link Here
1011
                        $ps.$SOLARVER.$ds.$UPD.$ds.$INPATH.$INC.
1012
                        $ps.$SOLARVER.$ds.$UPD.$ds.$INPATH.$INC.
1012
                        $ps.$SOLARENV.$ds.$OUTPATH.$INC.
1013
                        $ps.$SOLARENV.$ds.$OUTPATH.$INC.
1013
                        $ps.$SOLARENV.$INC.
1014
                        $ps.$SOLARENV.$INC.
1014
                        $ps.'$COMPATH'.$INCLUDE.
1015
                        $ps.'$PSDK_HOME'.$INCLUDE.
1015
                        $ps.'$PSDK_HOME'.$INCLUDE; # This must be the last.
1016
                        $ps.'$COMPATH'.$INCLUDE;
1016
1017
1017
   $WIN_LIB             = $cur_dir.$ps_STLPORT_LIB.$ps.
1018
   $WIN_LIB             = $cur_dir.$ps_STLPORT_LIB.$ps.
1018
                        $ps.$SOLARVER.$ds.$UPD.$LIB.
1019
                        $ps.$SOLARVER.$ds.$UPD.$LIB.
1019
                        $ps.$SOLARVER.$ds.$UPD.$ds.$INPATH.$LIB.
1020
                        $ps.$SOLARVER.$ds.$UPD.$ds.$INPATH.$LIB.
1020
                        $ps.$SOLARENV.$ds.$OUTPATH.$LIB.
1021
                        $ps.$SOLARENV.$ds.$OUTPATH.$LIB.
1021
                        $ps.$JAVA_HOME.$LIB.
1022
                        $ps.$JAVA_HOME.$LIB.
1022
                        $ps.'$COMPATH'.$LIB.
1023
                        $ps.'$PSDK_HOME'.$LIB.
1023
                        $ps.'$PSDK_HOME'.$LIB;
1024
                        $ps.'$COMPATH'.$LIB;
1024
1025
1025
   if ( $JAVA_HOME ne "" )
1026
   if ( $JAVA_HOME ne "" )
1026
   {
1027
   {
Lines 1299-1306 Link Here
1299
{  $SOLARINC         .= $STLPORT_stlport.
1300
{  $SOLARINC         .= $STLPORT_stlport.
1300
                        $I.'$JAVA_HOME'.$ds."include".$ds."win32".
1301
                        $I.'$JAVA_HOME'.$ds."include".$ds."win32".
1301
                        $I.'$JAVA_HOME'.$ds."include".
1302
                        $I.'$JAVA_HOME'.$ds."include".
1302
                        $I.'$COMPATH'.$ds."include".
1303
                        $I."'".$PSDK_HOME.$INCLUDE."'".
1303
                        $I."'".$PSDK_HOME.$INCLUDE."'"; # This must be the last.
1304
                        $I.'$COMPATH'.$ds."include";
1304
}
1305
}
1305
elsif ($platform eq "$Macosx")
1306
elsif ($platform eq "$Macosx")
1306
{  $SOLARINC         .= $STLPORT_stlport.
1307
{  $SOLARINC         .= $STLPORT_stlport.
Lines 1640-1645 Link Here
1640
if ( $platform eq "$Winnt" )
1641
if ( $platform eq "$Winnt" )
1641
{  ToFile( "CYGWIN",            $CYGWIN,            "e" );
1642
{  ToFile( "CYGWIN",            $CYGWIN,            "e" );
1642
   ToFile( "PSDK_HOME",         $PSDK_HOME,         "e" );
1643
   ToFile( "PSDK_HOME",         $PSDK_HOME,         "e" );
1644
   ToFile( "USE_NEW_SDK",       $USE_NEW_SDK,       "e" );
1643
}
1645
}
1644
ToFile( "PERL",              $PERL,              "e" );
1646
ToFile( "PERL",              $PERL,              "e" );
1645
ToFile( "GNUMAKE",           "@GNUMAKE@",        "e" );
1647
ToFile( "GNUMAKE",           "@GNUMAKE@",        "e" );

Return to issue 10681