diff options
| author | don bright <hugh.m.bright@gmail.com> | 2011-10-24 03:41:03 (GMT) |
|---|---|---|
| committer | don bright <hugh.m.bright@gmail.com> | 2011-10-24 03:41:03 (GMT) |
| commit | 82ff5a12ec876c80a626357557fa8afdbf0721cc (patch) | |
| tree | 97fcce1759b6813ec369d528862390795f74e196 | |
| parent | cbde518369b906febe816b199fd8e9d4d75231c0 (diff) | |
fdef getopt.h for MSVC, cleanup makefile, ignore another msvc warning
| -rw-r--r-- | openscad.pro | 25 | ||||
| -rw-r--r-- | tests/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | tests/echotest.cc | 2 |
3 files changed, 19 insertions, 10 deletions
diff --git a/openscad.pro b/openscad.pro index f5c5449..40c7d3d 100644 --- a/openscad.pro +++ b/openscad.pro @@ -8,11 +8,13 @@ } } -win32 { # for debugging link problems (use nmake -f Makefile.Release > log.txt) -# QMAKE_LFLAGS += -VERBOSE +win32 { + # QMAKE_LFLAGS += -VERBOSE } +# get VERSION from system date + isEmpty(VERSION) { win32 { # @@ -97,14 +99,17 @@ 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 - -#disable warning about casting int to bool -win32:QMAKE_CXXFLAGS += -wd4800 - -#disable warning about CGAL's unreferenced formal parameters -win32:QMAKE_CXXFLAGS += -wd4100 +# disable MSVC warnings that are of very low importance +win32:*msvc* { + # disable warning about too long decorated names + QMAKE_CXXFLAGS += -wd4503 + # CGAL casting int to bool + QMAKE_CXXFLAGS += -wd4800 + # CGAL's unreferenced formal parameters + QMAKE_CXXFLAGS += -wd4100 + # lexer uses strdup() & other POSIX stuff + QMAKE_CXXFLAGS += -D_CRT_NONSTDC_NO_DEPRECATE +} # disable Eigen SIMD optimizations for non-Mac OSX !macx { diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 22d4f96..bc0d071 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -42,6 +42,8 @@ if(WIN32) set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /wd4100") # fopen_s advertisement set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -D_CRT_SECURE_NO_DEPRECATE") + # lexer uses strdup & other POSIX stuff + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -D_CRT_NONSTDC_NO_DEPRECATE") # M_PI set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -D_USE_MATH_DEFINES") endif() diff --git a/tests/echotest.cc b/tests/echotest.cc index c53e47f..5b216f4 100644 --- a/tests/echotest.cc +++ b/tests/echotest.cc @@ -37,7 +37,9 @@ #include <QFile> #include <QDir> #include <QSet> +#ifndef _MSC_VER #include <getopt.h> +#endif #include <assert.h> #include <iostream> #include <sstream> |