Index: config_office/set_soenv.in
===================================================================
RCS file: /cvs/tools/config_office/set_soenv.in,v
retrieving revision 1.3.2.2.2.9
diff -u -r1.3.2.2.2.9 set_soenv.in
--- config_office/set_soenv.in	2 Jan 2003 07:53:23 -0000	1.3.2.2.2.9
+++ config_office/set_soenv.in	15 Jan 2003 11:16:18 -0000
@@ -86,7 +86,7 @@
      $STAR_REGISTRY, $STAR_RESOURCEPATH, $DMAKEROOT, $CLASSPATH, $XCLASSPATH, $COMPATH, $COMPATH_ROOT, 
      $LD_LIBRARY_PATH, $PATH, $SOLARDEF, $SOLAREXTRAINC, $SOLAREXTRALIB, $SOLARINCLUDES, $SOLARLIB, 
      $SOLARINC, $LOCALINI, $MAC_LIB, $PATHEXTRA, $FRAMEWORKSHOME, $COMEX, $MULTITHREAD_OBJ, $PERL, 
-     $COMP_ENV, $IENV, $ILIB, $WIN_INCLUDE, $JAVAHOME, $WIN_LIB, $WIN_HOME, $PSDK_HOME,
+     $COMP_ENV, $IENV, $ILIB, $WIN_INCLUDE, $JAVAHOME, $WIN_LIB, $WIN_HOME, $PSDK_HOME, $USE_NEW_SDK,
      $BISON_HAIRY, $BISON_SIMPLE, $TEMP, $COMMON_BUILD_TOOLS, $WIN_GREP, $WIN_FIND, $WIN_LS,
      $WIN_GNUCOPY, $WIN_TOUCH, $STLPORT4, $USE_GCC3, $ENABLE_DEBUG );
 #
@@ -503,6 +503,7 @@
 { 
       $COMPATH        = PosixFormat('@COMPATH@');
       $PSDK_HOME      = PosixFormat('@PSDK_HOME@');
+      $USE_NEW_SDK    = "TRUE";
       $CPUNAME        = "INTEL";
       $CPU            = "I";
       $GUI            = "WNT";
@@ -991,8 +992,8 @@
 {  $SOLARINCLUDES     = $I.$SOLARVER.$INC.
                         $I.$SOLARENV.$ds.$INPATH.$INC.
                         $I.$SOLARENV.$INC.
-                        $I.'$COMPATH'.$ds."include".
-                        $I."'".$PSDK_HOME.$INCLUDE."'"; # This must be the last
+                        $I."'".$PSDK_HOME.$INCLUDE."'".
+                        $I.'$COMPATH'.$ds."include";
 }
 elsif ($platform eq "$Macosx")
 {  $SOLARINCLUDES     = $I.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$INC.
@@ -1011,16 +1012,16 @@
                         $ps.$SOLARVER.$ds.$UPD.$ds.$INPATH.$INC.
                         $ps.$SOLARENV.$ds.$OUTPATH.$INC.
                         $ps.$SOLARENV.$INC.
-                        $ps.'$COMPATH'.$INCLUDE.
-                        $ps.'$PSDK_HOME'.$INCLUDE; # This must be the last.
+                        $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.'$COMPATH'.$LIB.
-                        $ps.'$PSDK_HOME'.$LIB;
+                        $ps.'$PSDK_HOME'.$LIB.
+                        $ps.'$COMPATH'.$LIB;
 
    if ( $JAVA_HOME ne "" )
    {
@@ -1299,8 +1300,8 @@
 {  $SOLARINC         .= $STLPORT_stlport.
                         $I.'$JAVA_HOME'.$ds."include".$ds."win32".
                         $I.'$JAVA_HOME'.$ds."include".
-                        $I.'$COMPATH'.$ds."include".
-                        $I."'".$PSDK_HOME.$INCLUDE."'"; # This must be the last.
+                        $I."'".$PSDK_HOME.$INCLUDE."'".
+                        $I.'$COMPATH'.$ds."include";
 }
 elsif ($platform eq "$Macosx")
 {  $SOLARINC         .= $STLPORT_stlport.
@@ -1640,6 +1641,7 @@
 if ( $platform eq "$Winnt" )
 {  ToFile( "CYGWIN",            $CYGWIN,            "e" );
    ToFile( "PSDK_HOME",         $PSDK_HOME,         "e" );
+   ToFile( "USE_NEW_SDK",       $USE_NEW_SDK,       "e" );
 }
 ToFile( "PERL",              $PERL,              "e" );
 ToFile( "GNUMAKE",           "@GNUMAKE@",        "e" );