Преглед на файлове

Fixed MinGW path related issues.

woollybah преди 6 години
родител
ревизия
91b59dbcb3
променени са 1 файла, в които са добавени 8 реда и са изтрити 18 реда
  1. 8 18
      maxide.bmx

+ 8 - 18
maxide.bmx

@@ -590,10 +590,9 @@ Type TAboutRequester Extends TRequester
 		?Win32
 		?Win32
 		strHeadings:+["{{about_label_mingwpath}}:"]
 		strHeadings:+["{{about_label_mingwpath}}:"]
 		' check For Local mingw32 dir First
 		' check For Local mingw32 dir First
-		If FileType(BlitzMaxPath() + "/MinGW32") = FILETYPE_DIR Then
-			strValues:+[(BlitzMaxPath() + "/MinGW32").Replace("/","\")]
-		Else If getenv_("MINGW") Then
-			strValues:+[getenv_("MINGW")]
+		Local path:String = MinGWPath()
+		If path Then
+			strValues:+[path.Replace("/", "\")]
 		Else
 		Else
 			strValues:+[LocalizeString("{{about_error_unavailable}}")]
 			strValues:+[LocalizeString("{{about_error_unavailable}}")]
 		EndIf
 		EndIf
@@ -663,11 +662,8 @@ Type TAboutRequester Extends TRequester
 
 
 	Method GetGCC$()
 	Method GetGCC$()
 		?Win32
 		?Win32
-		Local gccPath:String = BlitzMaxPath() + "/MinGW32"
-		If Not FileType(gccPath) Then
-			gccPath = getenv_("MinGW")
-			If Not gccPath Then Return LocalizeString("{{about_error_notapplicable}}")
-		End If
+		Local gccPath:String = MinGWPath()
+		If Not gccPath Then Return LocalizeString("{{about_error_notapplicable}}")
 		gccPath :+ "/bin/gcc"
 		gccPath :+ "/bin/gcc"
 		gccPath = gccPath.Replace("/", "\")
 		gccPath = gccPath.Replace("/", "\")
 		? Not win32
 		? Not win32
@@ -678,11 +674,8 @@ Type TAboutRequester Extends TRequester
 
 
 	Method GetGpp$()
 	Method GetGpp$()
 		?Win32
 		?Win32
-		Local gppPath:String = BlitzMaxPath() + "/MinGW32"
-		If Not FileType(gppPath) Then
-			gppPath = getenv_("MinGW")
-			If Not gppPath Then Return LocalizeString("{{about_error_notapplicable}}")
-		End If
+		Local gppPath:String = MinGWPath()
+		If Not gppPath Then Return LocalizeString("{{about_error_notapplicable}}")
 		gppPath:+ "/bin/g++"
 		gppPath:+ "/bin/g++"
 		gppPath = gppPath.Replace("/", "\")
 		gppPath = gppPath.Replace("/", "\")
 		? Not win32
 		? Not win32
@@ -7098,10 +7091,7 @@ Type TCodePlay
 		'UpdateArchitectureMenus()
 		'UpdateArchitectureMenus()
 
 
 ?Win32
 ?Win32
-		Local mingw$=BlitzMaxPath() + "/MinGW32"
-		If Not FileType(mingw) Then
-			mingw = getenv_("MINGW")
-		End If
+		Local mingw:String = MinGWPath()
 		If Not mingw
 		If Not mingw
 			DisableMenu buildmods
 			DisableMenu buildmods
 			DisableMenu buildallmods
 			DisableMenu buildallmods