Merge branch 'sd/fixbuild' of github.com:JuliaGeometry/EarCut.jl into…

… sd/fixbuild
JuliaGeometry · Dec 7, 2017 · ede5f99 · ede5f99
2 parents 59f1a66 + 34e6ee5
commit ede5f99
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 123 deletions.
diff --git a/.gitignore b/.gitignore
@@ -4,3 +4,5 @@
 *.dll
 *.o
 *.so
+cwrapper.jl
+cwrapper.cpp
diff --git a/deps/build.jl b/deps/build.jl
@@ -1,13 +1,16 @@
+if is_windows()
+    using WinRPM
+end
+
 function find_gpp()
     if is_windows()
         #TODO, is this really the hardcoded way to get the WinRPM path to g++ ?
         gpp = Pkg.dir("WinRPM","deps","usr","x86_64-w64-mingw32","sys-root","mingw","bin","g++")
         if !isfile(gpp*".exe")
             info("g++ not found. installing gcc-c++ using WinRPM")
-            @eval using WinRPM
-            WinRPM.install("gcc-c++"; yes = true)
-            WinRPM.install("gcc"; yes = true)
-            WinRPM.install("headers"; yes = true)
+            WinRPM.install("gcc-c++", yes = true)
+            WinRPM.install("gcc", yes = true)
+            WinRPM.install("headers", yes = true)
         end
         RPMbindir = Pkg.dir("WinRPM","deps","usr","x86_64-w64-mingw32","sys-root","mingw","bin")
         incdir = Pkg.dir("WinRPM","deps","usr","x86_64-w64-mingw32","sys-root","mingw","include")

diff --git a/deps/cwrapper.cpp b/deps/cwrapper.cpp