diff options
| -rw-r--r-- | boost.pri | 13 | ||||
| -rw-r--r-- | cgal.pri | 14 | ||||
| -rw-r--r-- | eigen2.pri | 7 | ||||
| -rw-r--r-- | glew.pri | 1 | ||||
| -rw-r--r-- | openscad.pro | 10 | ||||
| -rw-r--r-- | src/CSGTermEvaluator.h | 4 | ||||
| -rw-r--r-- | src/lexer.l | 7 |
7 files changed, 43 insertions, 13 deletions
@@ -10,9 +10,14 @@ boost { } } - win32 { - LIBS += -llibboost_thread-vc90-mt-s-1_46_1 -llibboost_program_options-vc90-mt-s-1_46_1 - } else { - LIBS += -lboost_thread -lboost_program_options + CONFIG(mingw-cross-env) { + LIBS += -lboost_thread_win32-mt -lboost_program_options-mt + } + else { + win32 { + LIBS += -llibboost_thread-vc90-mt-s-1_46_1 -llibboost_program_options-vc90-mt-s-1_46_1 + } else { + LIBS += -lboost_thread -lboost_program_options + } } } @@ -1,5 +1,6 @@ cgal { DEFINES += ENABLE_CGAL + CONFIG(mingw-cross-env):DEFINES += BOOST_STATIC BOOST_THREAD_USE_LIB Boost_USE_STATIC_LIBS isEmpty(DEPLOYDIR) { # Optionally specify location of CGAL using the @@ -13,10 +14,15 @@ cgal { } } - win32 { - LIBS += $$CGAL_DIR/auxiliary/gmp/lib/libmpfr-4.lib -lCGAL-vc90-mt-s - } else { - LIBS += -lgmp -lmpfr -lCGAL + CONFIG(mingw-cross-env) { + LIBS += -lgmp -lmpfr -lCGAL + } + else { + win32 { + LIBS += $$CGAL_DIR/auxiliary/gmp/lib/libmpfr-4.lib -lCGAL-vc90-mt-s + } else { + LIBS += -lgmp -lmpfr -lCGAL + } } QMAKE_CXXFLAGS += -frounding-math } @@ -9,6 +9,11 @@ else { INCLUDEPATH += /opt/local/include/eigen2 } else { - INCLUDEPATH += /usr/include/eigen2 + CONFIG(mingw-cross-env) { + INCLUDEPATH += mingw-cross-env/include/eigen2 + } + else { + INCLUDEPATH += /usr/include/eigen2 + } } } @@ -16,4 +16,5 @@ glew { unix:LIBS += -lGLEW win32:LIBS += -lglew32s + CONFIG(mingw-cross-env):DEFINES += GLEW_STATIC } diff --git a/openscad.pro b/openscad.pro index 3a41800..361525a 100644 --- a/openscad.pro +++ b/openscad.pro @@ -39,8 +39,14 @@ DEFINES += OPENSCAD_VERSION=$$VERSION OPENSCAD_YEAR=$$VERSION_YEAR OPENSCAD_MONT !isEmpty(VERSION_DAY): DEFINES += OPENSCAD_DAY=$$VERSION_DAY 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 +CONFIG(mingw-cross-env) { + LIBS += mingw-prefix/lib/libglew32s.a mingw-prefix/lib/libglut.a mingw-prefix/lib/libopengl32.a mingw-prefix/lib/libGLEW.a mingw-prefix/lib/libglaux.a mingw-prefix/lib/libglu32.a mingw-prefix/lib/libopencsg.a mingw-prefix/lib/libmpfr.a mingw-prefix/lib/libCGAL.a + QMAKE_CXXFLAGS += -fpermissive +} +else { + #disable warning about too long decorated names + win32:QMAKE_CXXFLAGS += -wd4503 +} TEMPLATE = app diff --git a/src/CSGTermEvaluator.h b/src/CSGTermEvaluator.h index cca6c91..b359f5b 100644 --- a/src/CSGTermEvaluator.h +++ b/src/CSGTermEvaluator.h @@ -6,6 +6,10 @@ #include <vector> #include "visitor.h" +#if defined __WIN32__ && ! defined _MSC_VER +#include <cstddef> +#endif + class CSGTermEvaluator : public Visitor { public: diff --git a/src/lexer.l b/src/lexer.l index 3cd4a19..cf5cb6d 100644 --- a/src/lexer.l +++ b/src/lexer.l @@ -35,8 +35,11 @@ #include <QDir> #include <assert.h> -//isatty for visual c++ -#ifdef _MSC_VER +//isatty for visual c++ and mingw-cross-env +#if defined __WIN32__ && ! defined _MSC_VER +#include "unistd.h" +#endif +#if defined __WIN32__ || defined _MSC_VER extern "C" int __cdecl _isatty(int _FileHandle); #define isatty _isatty #endif |