6 files changed, 25 insertions, 11 deletions
diff --git a/bison.pri b/bison.pri
index cf67768..003e09b 100644
--- a/bison.pri
+++ b/bison.pri
@@ -1,15 +1,17 @@
 #setup bison for qmake
 bison.name = Bison ${QMAKE_FILE_IN}
 bison.input = BISONSOURCES
-bison.output = ${QMAKE_FILE_PATH}/${QMAKE_FILE_BASE}.parser.cpp
-bison.commands = bison -d -o ${QMAKE_FILE_PATH}/${QMAKE_FILE_BASE}.parser.cpp ${QMAKE_FILE_IN}
+bison.output = ${QMAKE_FILE_PATH}/${QMAKE_FILE_BASE}_yacc.cpp
+bison.commands = bison -d -p ${QMAKE_FILE_BASE} -o ${QMAKE_FILE_PATH}/${QMAKE_FILE_BASE}_yacc.cpp ${QMAKE_FILE_IN}
+bison.commands += && mv ${QMAKE_FILE_PATH}/${QMAKE_FILE_BASE}_yacc.hpp ${QMAKE_FILE_PATH}/${QMAKE_FILE_BASE}_yacc.h
 bison.CONFIG += target_predeps
 bison.variable_out = GENERATED_SOURCES
 silent:bison.commands = @echo Bison ${QMAKE_FILE_IN} && $$bison.commands
 QMAKE_EXTRA_COMPILERS += bison
 bison_header.input = BISONSOURCES
-bison_header.output = ${QMAKE_FILE_PATH}/${QMAKE_FILE_BASE}.parser.hpp
-bison_header.commands = bison -d -o ${QMAKE_FILE_PATH}/${QMAKE_FILE_BASE}.parser.cpp ${QMAKE_FILE_IN}
+bison_header.output = ${QMAKE_FILE_PATH}/${QMAKE_FILE_BASE}_yacc.h
+bison_header.commands = bison -d -p ${QMAKE_FILE_BASE} -o ${QMAKE_FILE_PATH}/${QMAKE_FILE_BASE}_yacc.cpp ${QMAKE_FILE_IN}
+bison_header.commands += && mv ${QMAKE_FILE_PATH}/${QMAKE_FILE_BASE}_yacc.hpp ${QMAKE_FILE_PATH}/${QMAKE_FILE_BASE}_yacc.h
 bison_header.CONFIG += target_predeps no_link
 silent:bison_header.commands = @echo Bison ${QMAKE_FILE_IN} && $$bison.commands
 QMAKE_EXTRA_COMPILERS += bison_header
diff --git a/boost.pri b/boost.pri
index 8907b2d..165f071 100644
--- a/boost.pri
+++ b/boost.pri
@@ -6,6 +6,14 @@ boost {
     !isEmpty(BOOST_DIR) {
       INCLUDEPATH += $$BOOST_DIR
       message("boost location: $$BOOST_DIR")
+      win32:LIBS += -L$$BOOST_DIR/libs/program_options/build/msvc-10.0/release/link-static/threading-multi
+      win32:LIBS += -L$$BOOST_DIR/libs/thread/build/msvc-10.0/release/link-static/threading-multi
     }
   }
+
+  win32 {
+     LIBS += -llibboost_thread-vc100-mt-1_45 -llibboost_program_options-vc100-mt-1_45
+  } else {
+     LIBS += -lboost_thread -lboost_program_options
+  }
 }
diff --git a/cgal.pri b/cgal.pri
index ed01a44..bdd236a 100644
--- a/cgal.pri
+++ b/cgal.pri
@@ -7,16 +7,20 @@ cgal {
     CGAL_DIR = $$(CGALDIR)
     !isEmpty(CGAL_DIR) {
       INCLUDEPATH += $$CGAL_DIR/include
-      LIBS += -L$$CGAL_DIR/lib
+      win32 {
+         LIBS += -L$$CGAL_DIR/build/lib -L$$(MPFRDIR)/build.vc10/lib/Win32/Release -L$$(MPIRDIR)
+      } else {
+         LIBS += -L$$CGAL_DIR/lib
+      }
       message("CGAL location: $$CGAL_DIR")
     }
   }
 
-  LIBS += -lCGAL -lmpfr -lboost_thread
+  LIBS += -lmpfr
   win32 {
-    LIBS += -lmpir
+    LIBS += -lmpir -lCGAL-vc100-mt
   } else {
-    LIBS += -lgmp
+    LIBS += -lgmp -lCGAL
   }
   QMAKE_CXXFLAGS += -frounding-math
 }
diff --git a/flex.pri b/flex.pri
index 11f6878..15fccd0 100644
--- a/flex.pri
+++ b/flex.pri
@@ -3,7 +3,7 @@
 flex.name = Flex ${QMAKE_FILE_IN}
 flex.input = FLEXSOURCES
 flex.output = ${QMAKE_FILE_PATH}/${QMAKE_FILE_BASE}.lexer.cpp
-flex.commands = flex -o ${QMAKE_FILE_PATH}/${QMAKE_FILE_BASE}.lexer.cpp ${QMAKE_FILE_IN}
+flex.commands = flex -P ${QMAKE_FILE_BASE} -o ${QMAKE_FILE_PATH}/${QMAKE_FILE_BASE}.lexer.cpp ${QMAKE_FILE_IN}
 flex.CONFIG += target_predeps
 flex.variable_out = GENERATED_SOURCES
 silent:flex.commands = @echo Lex ${QMAKE_FILE_IN} && $$flex.commands
diff --git a/glew.pri b/glew.pri
index 189b953..f2aca4e 100644
--- a/glew.pri
+++ b/glew.pri
@@ -15,5 +15,5 @@ glew {
   }
 
   unix:LIBS += -lGLEW
-  win32:LIBS += -lglew32
+  win32:LIBS += -lglew32s
 }
diff --git a/openscad.pro b/openscad.pro
index 95c860b..e81cb36 100644
--- a/openscad.pro
+++ b/openscad.pro
@@ -22,7 +22,7 @@ win32 {
 }
 
 DEFINES += OPENSCAD_VERSION=$$VERSION
-win32:DEFINES += _USE_MATH_DEFINES NOMINMAX _CRT_SECURE_NO_WARNINGS
+win32:DEFINES += _USE_MATH_DEFINES NOMINMAX _CRT_SECURE_NO_WARNINGS YY_NO_UNISTD_H
 
 #disable warning about too long decorated names
 win32:QMAKE_CXXFLAGS += -wd4503