--- a/ProjectBuilder.st	Thu Oct 22 23:45:23 2009 +0200
+++ b/ProjectBuilder.st	Fri Oct 23 14:47:28 2009 +0200
@@ -5,7 +5,7 @@
 Object subclass:#ProjectBuilder
 	instanceVariableNames:'package projectDefinitionClass sourceCodeManager buildDirectory
 		myWorkingDirectory mySTXTopDirectory myTopDirectory outputStream
-		makeExeOnly'
+		makeExeOnly usedCompiler'
 	classVariableNames:'PreviousBuildDirectory'
 	poolDictionaries:''
 	category:'System-Support-Projects'
@@ -70,6 +70,10 @@
 
 projectDefinitionClass:something
     projectDefinitionClass := something.
+!
+
+usedCompiler:something
+    usedCompiler := something.
 ! !
 
 !ProjectBuilder methodsFor:'building'!
@@ -565,14 +569,19 @@
 !
 
 makeWithOutputTo:stdOut errorTo:stdErr
-    |module directory|
+    |module directory compilerFlag makeCommand|
 
     module := package module.
     directory := package directory.
 
+    makeCommand := ParserFlags makeCommand.
+    usedCompiler = 'vc' ifTrue:[ makeCommand := 'vcmake'. compilerFlag := 'USEVC=1' ].
+    usedCompiler = 'lcc' ifTrue:[ makeCommand := 'lcmake'. compilerFlag := 'USELCC=1' ].
+    usedCompiler = 'gcc' ifTrue:[ makeCommand := 'make'. ].
+
     projectDefinitionClass isLibraryDefinition ifTrue:[
         OperatingSystem
-            executeCommand:(ParserFlags makeCommand,' classLibRule')
+            executeCommand:(makeCommand,' classLibRule')
             inputFrom:nil
             outputTo:stdOut
             errorTo:stdErr
@@ -580,7 +589,7 @@
             onError:[:status| self error:'make failed'].
     ] ifFalse:[
         OperatingSystem
-            executeCommand:(ParserFlags makeCommand,' exe')
+            executeCommand:(makeCommand,' exe')
             inputFrom:nil
             outputTo:stdOut
             errorTo:stdErr
@@ -589,7 +598,7 @@
 
         (makeExeOnly ? false) ifFalse:[
             OperatingSystem
-                executeCommand:(ParserFlags makeCommand,' setup')
+                executeCommand:(makeCommand,' setup')
                 inputFrom:nil
                 outputTo:stdOut
                 errorTo:stdErr