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

(-)config_office/set_soenv.in (-1 / +16 lines)
Lines 83-89 Link Here
83
     $LD_LIBRARY_PATH, $PATH, $SOLAREXTRAINC, $SOLAREXTRALIB, $SOLARLIB, 
83
     $LD_LIBRARY_PATH, $PATH, $SOLAREXTRAINC, $SOLAREXTRALIB, $SOLARLIB, 
84
     $SOLARINC, $LOCALINI, $PATHEXTRA, $FRAMEWORKSHOME, $COMEX, $PERL, 
84
     $SOLARINC, $LOCALINI, $PATHEXTRA, $FRAMEWORKSHOME, $COMEX, $PERL, 
85
     $COMP_ENV, $ILIB, $JAVAHOME, $PSDK_HOME, $DIRECTXSDK_LIB, $USE_NEW_SDK, $FRAME_HOME, 
85
     $COMP_ENV, $ILIB, $JAVAHOME, $PSDK_HOME, $DIRECTXSDK_LIB, $USE_NEW_SDK, $FRAME_HOME, 
86
     $ATL_LIB, $ATL_INCLUDE, $MFC_LIB, $MFC_INCLUDE, $NO_HIDS, $TEMP, $COMMON_BUILD_TOOLS, $WIN_GREP, $WIN_FIND, $WIN_LS,
86
     $USE_DIRECTX5, $ATL_LIB, $ATL_INCLUDE, $MFC_LIB, $MFC_INCLUDE, $NO_HIDS, $TEMP,
87
     $COMMON_BUILD_TOOLS, $WIN_GREP, $WIN_FIND, $WIN_LS,
87
     $WIN_GNUCOPY, $WIN_TOUCH, $STLPORT4, $MOZILLA_VERSION, $MOZILLA_TOOLKIT, $PREBUILD_MOZAB,
88
     $WIN_GNUCOPY, $WIN_TOUCH, $STLPORT4, $MOZILLA_VERSION, $MOZILLA_TOOLKIT, $PREBUILD_MOZAB,
88
	 $PROEXT,
89
	 $PROEXT,
89
     $SYSTEM_PYTHON, $PYTHONPATH, $PYTHONHOME, $SYSTEM_MOZILLA, $EPM_FLAGS);
90
     $SYSTEM_PYTHON, $PYTHONPATH, $PYTHONHOME, $SYSTEM_MOZILLA, $EPM_FLAGS);
Lines 617-622 Link Here
617
      $CSC_PATH       = PosixFormat('@CSC_PATH@');
618
      $CSC_PATH       = PosixFormat('@CSC_PATH@');
618
      $PSDK_HOME      = PosixFormat('@PSDK_HOME@');
619
      $PSDK_HOME      = PosixFormat('@PSDK_HOME@');
619
      $DIRECTXSDK_LIB = PosixFormat('@DIRECTXSDK_LIB@');
620
      $DIRECTXSDK_LIB = PosixFormat('@DIRECTXSDK_LIB@');
621
      $USE_DIRECTX5   = "";
620
      $FRAME_HOME     = PosixFormat('@FRAME_HOME@');
622
      $FRAME_HOME     = PosixFormat('@FRAME_HOME@');
621
      $USE_NEW_SDK    = "TRUE";
623
      $USE_NEW_SDK    = "TRUE";
622
      $CPUNAME        = "INTEL";
624
      $CPUNAME        = "INTEL";
Lines 1134-1139 Link Here
1134
                        $ps.'$COMPATH'.$LIB;
1136
                        $ps.'$COMPATH'.$LIB;
1135
      if ( '@ENABLE_DIRECTX@' ne "" ) {
1137
      if ( '@ENABLE_DIRECTX@' ne "" ) {
1136
          $ILIB   .= $ps.$DIRECTXSDK_LIB;
1138
          $ILIB   .= $ps.$DIRECTXSDK_LIB;
1139
          if ( '@COMEX@' eq "10" ) {
1140
              # .NET2003 provides and compiles against DirectX 5 libraries and is
1141
              # hereby still Win9x compatible.
1142
              $ILIB .= $ps.'$COMPATH'.$ds.'PlatformSDK'.$LIB;
1143
              $USE_DIRECTX5 = "YES";
1144
          }
1145
1137
      }
1146
      }
1138
   }
1147
   }
1139
   elsif ( $COM eq "GCC" )
1148
   elsif ( $COM eq "GCC" )
Lines 1452-1457 Link Here
1452
                         $I.'$COMPATH'.$ds."include";
1461
                         $I.'$COMPATH'.$ds."include";
1453
      if ( '@ENABLE_DIRECTX@' ne "" ) {
1462
      if ( '@ENABLE_DIRECTX@' ne "" ) {
1454
          $SOLARINC   .= $I.PosixFormat('@DIRECTXSDK_HOME@').$INCLUDE;
1463
          $SOLARINC   .= $I.PosixFormat('@DIRECTXSDK_HOME@').$INCLUDE;
1464
          if ( '@COMEX@' eq "10" ) {
1465
              # .NET2003 provides and compiles against DirectX 5 libraries and is
1466
              # hereby still Win9x compatible.
1467
              $SOLARINC .= $I.'$COMPATH'.$ds.'PlatformSDK'.$ds."include";
1468
          }
1455
      }
1469
      }
1456
   }
1470
   }
1457
   elsif ( $COM eq "GCC" )
1471
   elsif ( $COM eq "GCC" )
Lines 1754-1759 Link Here
1754
{  ToFile( "CYGWIN_PATH",       $CYGWIN_PATH,       "e" );
1768
{  ToFile( "CYGWIN_PATH",       $CYGWIN_PATH,       "e" );
1755
   ToFile( "PSDK_HOME",         $PSDK_HOME,         "e" );
1769
   ToFile( "PSDK_HOME",         $PSDK_HOME,         "e" );
1756
   ToFile( "DIRECTXSDK_LIB",    $DIRECTXSDK_LIB,    "e" );
1770
   ToFile( "DIRECTXSDK_LIB",    $DIRECTXSDK_LIB,    "e" );
1771
   ToFile( "USE_DIRECTX5",      $USE_DIRECTX5,      "e" );
1757
   ToFile( "ATL_LIB",           $ATL_LIB,         "e" );
1772
   ToFile( "ATL_LIB",           $ATL_LIB,         "e" );
1758
   if ( $MINGW ne "yes" )
1773
   if ( $MINGW ne "yes" )
1759
   {  ToFile( "ATL_INCLUDE",       $ATL_INCLUDE,       "e" );
1774
   {  ToFile( "ATL_INCLUDE",       $ATL_INCLUDE,       "e" );

Return to issue 83430