Merge branch 'meta23-master'

1 files changed, 29 insertions, 4 deletions

diff --git a/openscad.pro b/openscad.pro
index ee237c5..d83606f 100644
--- a/openscad.pro
+++ b/openscad.pro
@@ -14,7 +14,30 @@ win32 {
   isEmpty(VERSION) VERSION = $$system(date "+%Y.%m.%d")
 }
 
+#configure lex / yacc
+win32 {
+  include(flex.pri)
+  include(bison.pri)
+  FLEXSOURCES = src/lexer.l
+  BISONSOURCES = src/parser.y
+} else {
+  LEXSOURCES += src/lexer.l
+  YACCSOURCES += src/parser.y
+}
+
+#configure additional directories
+win32 {
+    INCLUDEPATH += $$(MPIRDIR)
+    INCLUDEPATH += $$(MPFRDIR)
+}
+
 DEFINES += OPENSCAD_VERSION=$$VERSION
+win32:DEFINES += _USE_MATH_DEFINES NOMINMAX _CRT_SECURE_NO_WARNINGS
+
+#disable warning about too long decorated names
+win32:QMAKE_CXXFLAGS += -wd4503
+
+
 TEMPLATE = app
 RESOURCES = openscad.qrc
 
@@ -60,6 +83,7 @@ macx:CONFIG += mdi
 CONFIG += cgal
 CONFIG += opencsg
 CONFIG += progresswidget
+CONFIG += boost
 
 #Uncomment the following line to enable QCodeEdit
 #CONFIG += qcodeedit
@@ -79,6 +103,7 @@ progresswidget {
 include(cgal.pri)
 include(opencsg.pri)
 include(eigen2.pri)
+include(boost.pri)
 
 # Standard include path for misc external libs
 #macx {
@@ -89,8 +114,6 @@ include(eigen2.pri)
 # QMAKE_CXXFLAGS += -pg
 # QMAKE_LFLAGS   += -pg
 
-LEXSOURCES += src/lexer.l
-YACCSOURCES += src/parser.y
 
 FORMS   += src/MainWindow.ui \
            src/Preferences.ui
@@ -118,7 +141,8 @@ HEADERS += src/CGAL_renderer.h \
            src/printutils.h \
            src/value.h \
            src/progress.h \
-           src/editor.h
+           src/editor.h \
+           src/mathc99.h
 
 SOURCES += src/openscad.cc \
            src/mainwin.cc \
@@ -155,7 +179,8 @@ SOURCES += src/openscad.cc \
            src/nef2dxf.cc \
            src/Preferences.cc \
            src/progress.cc \
-           src/editor.cc
+           src/editor.cc \
+           src/mathc99.cc
 
 macx {
   HEADERS += src/AppleEvents.h \