Fix merge issue, use correct order of libs for CGAL.

openscad · Sep 5, 2018 · 40af343 · 40af343
1 parent 27c476d
commit 40af343
Showing 1 changed file with 4 additions and 12 deletions.
diff --git a/features/cgal.prf b/features/cgal.prf
@@ -9,18 +9,10 @@ CGAL_DIR = $$(CGALDIR)
   message("CGAL location: $$CGAL_DIR")
 }
 
-CONFIG(mingw-cross-env)|CONFIG(mingw-cross-env-shared) {
-  LIBS += -lgmp -lmpfr -lCGAL
-  QMAKE_CXXFLAGS += -frounding-math 
-} else {
-  win* {
-    *-g++* { 
-      QMAKE_CXXFLAGS += -frounding-math 
-    }
-  } else {
-    QMAKE_CXXFLAGS += -frounding-math 
-  }
-  LIBS += -lCGAL -lmpfr -lgmp
+LIBS += -lCGAL -lmpfr -lgmp
+
+*g++* {
+  QMAKE_CXXFLAGS += -frounding-math
 }
 
 *clang* {