*** empty log message ***
authorClaus Gittinger <cg@exept.de>
Thu, 14 Mar 2013 01:32:07 +0100
changeset 1304 c66b66cb465d
parent 1303 b24bddd15722
child 1305 874217996e56
*** empty log message ***
h_win32.rc
--- a/h_win32.rc	Thu Feb 28 13:57:22 2013 +0100
+++ b/h_win32.rc	Thu Mar 14 01:32:07 2013 +0100
@@ -52,13 +52,15 @@
 	    ).
 
     tryPathesForBin := [:pathes |
-	|path|
-	pathes do:[:eachPath | |pI pL|
-	    (eachPath asFilename / 'bin') exists ifTrue:[
-		path := eachPath asFilename
+	|foundPath|
+	pathes do:[:eachPath |
+	    |thisPath|
+
+	    ((thisPath := eachPath asFilename) / 'bin') exists ifTrue:[
+		foundPath := thisPath
 	    ].
 	].
-	path
+	foundPath
     ].
 
     "/
@@ -70,7 +72,7 @@
     "/ uncomment one of the following
     bccPath := 'C:\borland\bcc55\bin'.
     msvcPath := 'C:\Programme\Microsoft Visual Studio 10.0\VC\BIN'.
-    mingw64Path := 'C:\mingw64\bin'.
+    mingw64Path := 'C:\mingw64'.
 
     "/ or take a look what we find installed:
     path := (OperatingSystem getEnvironment:'PATH') asCollectionOfSubstringsSeparatedBy:$;.
@@ -79,10 +81,10 @@
 	mingw64Path isNil ifTrue:[
 	    mingw64Path := tryPathesForBin value:
 			    #(
-				'C:\Programme\mingw64\bin'
-				'C:\Programs\mingw64\bin'
-				'C:\Program Files\mingw64\bin'
-				'C:\mingw64\bin'
+				'C:\Programme\mingw64'
+				'C:\Programs\mingw64'
+				'C:\Program Files\mingw64'
+				'C:\mingw64'
 			    ).
 	].
     ] ifFalse:[
@@ -90,24 +92,24 @@
 	bccPath isNil ifTrue:[
 	    bccPath := tryPathesForBin value:
 			    #(
-				'C:\Programme\borland\bcc55\bin'
-				'C:\Programs\borland\bcc55\bin'
-				'C:\Program Files\borland\bcc55\bin'
-				'C:\borland\bcc55\bin'
+				'C:\Programme\borland\bcc55'
+				'C:\Programs\borland\bcc55'
+				'C:\Program Files\borland\bcc55'
+				'C:\borland\bcc55'
 			    ).
 	].
 
 	msvcPath isNil ifTrue:[
 	    msvcPath := tryPathesForBin value:
 			    #(
-				'C:\Programme\Microsoft Visual Studio 11.0\VC\BIN'
-				'C:\Programme\Microsoft Visual Studio 10.0\VC\BIN'
-				'C:\Programme\Microsoft Visual Studio 9.0\VC\BIN'
-				'C:\Programme\Microsoft Visual Studio 8.0\VC\BIN'
-				'C:\Program Files\Microsoft Visual Studio 11.0\VC\BIN'
-				'C:\Program Files\Microsoft Visual Studio 10.0\VC\BIN'
-				'C:\Program Files\Microsoft Visual Studio 9.0\VC\BIN'
-				'C:\Program Files\Microsoft Visual Studio 8.0\VC\BIN'
+				'C:\Programme\Microsoft Visual Studio 11.0\VC'
+				'C:\Programme\Microsoft Visual Studio 10.0\VC'
+				'C:\Programme\Microsoft Visual Studio 9.0\VC'
+				'C:\Programme\Microsoft Visual Studio 8.0\VC'
+				'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'
+				'C:\Program Files\Microsoft Visual Studio 8.0\VC'
 			    ).
 	].
     ].
@@ -119,8 +121,8 @@
 	] ifFalse:[
 	    'host.rc [info]: setup for borland bcc32 compiler' infoPrintCR.
 	    bccPath := bccPath asFilename.
-	    ccCommand := (bccPath / 'bcc32') pathName.
-	    linkCommand := (bccPath / 'ilink32') pathName.
+	    ccCommand := (bccPath / 'bin' / 'bcc32') pathName.
+	    linkCommand := (bccPath / 'bin' / 'ilink32') pathName.
 	    bccPath := bccPath directory.
 
 	    libs := #(
@@ -149,8 +151,8 @@
 	] ifFalse:[
 	    'host.rc [info]: setup for msvc compiler' infoPrintCR.
 	    msvcPath := msvcPath asFilename.
-	    ccCommand := (msvcPath / 'cl') pathName.
-	    linkCommand := (msvcPath / 'ilink32') pathName.
+	    ccCommand := (msvcPath / 'bin' / 'cl') pathName.
+	    linkCommand := (msvcPath / 'bin' / 'ilink32') pathName.
 	    ccCompilationOptions := '/O1'.
 	    searchedLibraries := #('import32.lib' 'odbc32.lib' 'glu32.lib' 'opengl32.lib').
 
@@ -170,14 +172,14 @@
 		"/ mingw64
 		'host.rc [info]: setup for mingw64 compiler' infoPrintCR.
 		mingw64Path := mingw64Path asFilename.
-		ccCommand := (mingw64Path / 'gcc') pathName.
-		linkCommand := (mingw64Path / 'gcc') pathName.
+		ccCommand := (mingw64Path / 'bin' / 'gcc') pathName.
+		linkCommand := (mingw64Path / 'bin' / 'gcc') pathName.
 		ccCompilationOptions := ''.
 		searchedLibraries := #('-lodbc32' '-lglu32' '-lopengl32').
 
 		libs := {
 			    '-L..\..\lib\mingw' .
-			    ( '-L',(mingw64Path / '..' / 'lib') pathName ) .
+			    ( '-L',(mingw64Path / 'lib') pathName ) .
 			}.
 		libs := libs asStringWith:Character space.
 		linkArgs := (libs).
@@ -189,14 +191,14 @@
 		"/ mingw32
 		'host.rc [info]: setup for mingw32 compiler' infoPrintCR.
 		mingw32Path := mingw32Path asFilename.
-		ccCommand := (mingw32Path / 'gcc') pathName.
-		linkCommand := (mingw32Path / 'gcc') pathName.
+		ccCommand := (mingw32Path / 'bin' / 'gcc') pathName.
+		linkCommand := (mingw32Path / 'bin' / 'gcc') pathName.
 		ccCompilationOptions := ''.
 		searchedLibraries := #('-lodbc32' '-lglu32' '-lopengl32').
 
 		libs := {
 			    '-L..\..\lib\mingw' .
-			    ( '-L',(mingw64Path / '..' / 'lib') pathName ) .
+			    ( '-L',(mingw64Path / 'lib') pathName ) .
 			}.
 		libs := libs asStringWith:Character space.
 		linkArgs := (libs).