--- a/ParserFlags.st	Fri Sep 28 18:19:43 2012 +0200
+++ b/ParserFlags.st	Fri Sep 28 18:22:35 2012 +0200
@@ -1520,8 +1520,8 @@
 
         (bccTop notNil and:[bccTop asFilename exists]) ifTrue:[
             STCCompilationIncludes := STCCompilationIncludes,' -I',bccTop,'\Include'.
-            LibDirectory := topDir,'\libbc'.
-            LinkArgs := '-L',topDir,'\libbc'.
+            LibDirectory := topDir,'\lib\bc'.
+            LinkArgs := '-L',topDir,'\lib\bc'.
             LinkArgs := LinkArgs,' -L',bccTop,'\Lib -r -c -ap -Tpd -Gi -w-dup'.
             CCPath := 'bcc32'.
             MakeCommand := 'bmake'.
@@ -1531,7 +1531,9 @@
         ] ifFalse:[
             (vcTop := VCTop) isNil ifTrue:[
                 vcTop := #(
+                            'C:\Program Files\Microsoft Visual Studio 11.0\VC'
                             'C:\Program Files\Microsoft Visual Studio 10.0\VC'
+                            'C:\Program Files\Microsoft Visual Studio 9.0\VC'
                           ) detect:[:path | path asFilename exists and:[(path asFilename construct:'bin/cl.exe') exists]] ifNone:nil.
             ].
             (vcTop notNil and:[vcTop asFilename exists]) ifTrue:[
@@ -1540,25 +1542,26 @@
 
                 (sdkTop := SDKTop) isNil ifTrue:[
                     sdkTop := #(
+                                'C:\Program Files\Microsoft SDKs\Windows\v7.0A'
                                 'C:\Program Files\Microsoft SDKs\Windows\v6.0A'
                               ) detect:[:path | path asFilename exists and:[(path asFilename construct:'include') exists]] ifNone:nil.
                 ].
                 (sdkTop notNil and:[sdkTop asFilename exists]) ifTrue:[
                     STCCompilationIncludes := STCCompilationIncludes,' -I',sdkTop,'\include'.
                 ].
-                LibDirectory := topDir,'\libvc'.
-                LinkArgs := '-L',topDir,'\libvc'.
-                LinkArgs := LinkArgs,' -LC:\Borland\bcc55\Lib -r -c -ap -Tpd -Gi -w-dup'.
+                LibDirectory := topDir,'\lib\vc'.
+                LinkArgs := '-L',topDir,'\lib\vc'.
+                LinkArgs := LinkArgs,' -r -c -ap -Tpd -Gi -w-dup'.
                 CCPath := vcTop,'\bin\cl.exe'.
                 LinkCommand := 'ilink32'.
                 MakeCommand := 'vcmake'.
                 CCCompilationOptions := '/nologo /ZI  /w /GF /EHsc /FR.\objvc\'.
             ] ifFalse:[
                 "/ add definitions for lcc, mingc etc. 
-                STCCompilationIncludes := STCCompilationIncludes,' -IC:\Borland\xxxxx\Include'.
-                LibDirectory := topDir,'\libbc'.
-                LinkArgs := '-L',topDir,'\libbc'.
-                LinkArgs := LinkArgs,' -LC:\Borland\xxxxx\Lib -r -c -ap -Tpd -Gi -w-dup'.
+                STCCompilationIncludes := STCCompilationIncludes,' -IC:\xxxxx\Include'.
+                LibDirectory := topDir,'\lib\vc'.
+                LinkArgs := '-L',topDir,'\lib\vc'.
+                LinkArgs := LinkArgs,' -r -c -ap -Tpd -Gi -w-dup'.
             ].
         ].
         STCCompilationDefines := '-DWIN32'.
@@ -2471,11 +2474,11 @@
 !ParserFlags class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libcomp/ParserFlags.st,v 1.91 2012-09-26 12:24:16 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libcomp/ParserFlags.st,v 1.92 2012-09-28 16:22:35 cg Exp $'
 !
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libcomp/ParserFlags.st,v 1.91 2012-09-26 12:24:16 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libcomp/ParserFlags.st,v 1.92 2012-09-28 16:22:35 cg Exp $'
 ! !
 
 ParserFlags initialize!