File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff line change @@ -297,29 +297,21 @@ private boolean installPortableGcc() {
297297 }
298298
299299 private java .util .List <String > detectWindowsMissing () {
300- String pacman = findWindowsPacman ();
301- boolean haveGpp = pacman != null ? false : commandExists ("g++" , "--version" );
302- if (pacman == null ) {
300+ // Check for g++ at all known locations including portable WinLibs install.
301+ boolean haveGpp = commandExists ("g++" , "--version" );
302+ if (! haveGpp ) {
303303 for (String p : new String [] {
304304 "C:\\ msys64\\ mingw64\\ bin\\ g++.exe" ,
305305 "C:\\ msys2\\ mingw64\\ bin\\ g++.exe" ,
306- System .getProperty ("user.home" ) + "\\ msys64\\ mingw64\\ bin\\ g++.exe" }) {
306+ System .getProperty ("user.home" ) + "\\ msys64\\ mingw64\\ bin\\ g++.exe" ,
307+ getPortableGpp ().getAbsolutePath ()}) {
307308 if (new File (p ).exists ()) { haveGpp = true ; break ; }
308309 }
309310 }
310-
311+ // GLFW and GLEW are bundled in libs/windows-x64/ -- no MSYS2 needed for them.
312+ // Only report them missing if the bundled DLLs aren't present AND MSYS2 doesn't have them.
311313 java .util .List <String > missing = new java .util .ArrayList <>();
312- if (pacman == null ) {
313- missing .add ("MSYS2" );
314- missing .add ("g++" );
315- missing .add ("glfw" );
316- missing .add ("glew" );
317- } else {
318- if (!haveGpp ) missing .add ("g++" );
319- boolean [] libs = windowsLibsPresentDetailed ();
320- if (!libs [0 ]) missing .add ("glfw" );
321- if (!libs [1 ]) missing .add ("glew" );
322- }
314+ if (!haveGpp ) missing .add ("g++" );
323315 return missing ;
324316 }
325317
You can’t perform that action at this time.
0 commit comments