Merge pull request #686 from sschuberth/misc

On the way to fix / improve the Windows build

Author: arthurschreiber

ext/rugged/extconf.rb

@@ -20,11 +20,14 @@ def sys(cmd)
   ret
 end
 
-def windows?
-  RbConfig::CONFIG['host_os'] =~ /mswin|mingw/
+MAKE = if Gem.win_platform?
+  # On Windows, Ruby-DevKit only has 'make'.
+  find_executable('make')
+else
+  find_executable('gmake') || find_executable('make')
 end
 
-if !(MAKE = find_executable('gmake') || find_executable('make'))
+if !MAKE
   abort "ERROR: GNU make is required to build Rugged."
 end
 
@@ -64,7 +67,7 @@ def windows?
     abort "ERROR: CMake is required to build Rugged."
   end
 
-  if !windows? && !find_executable('pkg-config')
+  if !Gem.win_platform? && !find_executable('pkg-config')
     abort "ERROR: pkg-config is required to build Rugged."
   end
 
@@ -73,14 +76,14 @@ def windows?
 
     Dir.chdir("build") do
       # On Windows, Ruby-DevKit is MSYS-based, so ensure to use MSYS Makefiles.
-      generator = "-G \"MSYS Makefiles\"" if windows?
+      generator = "-G \"MSYS Makefiles\"" if Gem.win_platform?
       sys("cmake .. -DBUILD_CLAR=OFF -DTHREADSAFE=ON -DBUILD_SHARED_LIBS=OFF -DCMAKE_C_FLAGS=-fPIC -DCMAKE_BUILD_TYPE=RelWithDebInfo #{generator}")
       sys(MAKE)
 
       # "normal" libraries (and libgit2 builds) get all these when they build but we're doing it
       # statically so we put the libraries in by hand. It's important that we put the libraries themselves
       # in $LIBS or the final linking stage won't pick them up
-      if windows?
+      if Gem.win_platform?
         $LDFLAGS << " " + "-L#{Dir.pwd}/deps/winhttp"
         $LIBS << " -lwinhttp -lcrypt32 -lrpcrt4 -lole32 -lz"
       else