Simplify yacc/lex config

GilesBathgate · Jul 20, 2024 · db6e2b9 · db6e2b9
1 parent 81b17e2
commit db6e2b9
Showing 1 changed file with 10 additions and 4 deletions.
diff --git a/rapcad.pro b/rapcad.pro
@@ -53,9 +53,6 @@ win32 {
 	INCLUDEPATH += $$DXFLIBROOT
 	LIBS += -L$$DXFLIBROOT/release -ldxflib
 	}
-	QMAKE_YACC = win_bison
-	QMAKE_YACCFLAGS += "-b y"
-	QMAKE_LEX = win_flex
 } else {
 
 	exists( /usr/lib/x86_64-linux-gnu/libCGAL* ) {
@@ -71,7 +68,6 @@ win32 {
 	contains(DEFINES,USE_DXF) {
 	LIBS += -ldxflib
 	}
-	QMAKE_YACC = bison
   macx {
 	ICON = icons/AppIcon.icns
 	INCLUDEPATH += $$(CGAL_DIR)/include
@@ -88,6 +84,16 @@ win32 {
   }
 }
 
+# Configure yacc/lex
+win32 {
+	QMAKE_YACC = win_bison
+	QMAKE_YACCFLAGS += "-b y"
+	QMAKE_LEX = win_flex
+} else {
+	QMAKE_YACC = bison
+	QMAKE_LEX = flex
+}
+
 BISON_VERSION = $$system($$QMAKE_YACC --version)
 BISON_VERSION = $$find(BISON_VERSION, [0-9]+.[0-9]+.[0-9]+)
 BISON_VERSIONS = $$split(BISON_VERSION, ".")