mirror of https://github.com/vitalif/openscad
Build with -DNOGDI by default to prevent name conflicts with windows.h.
parent
80f1a31143
commit
092b9eeddc
|
@ -19,7 +19,7 @@ CONFIG(mingw-cross-env) {
|
||||||
LIBS += mingw-cross-env/lib/libexpat.a
|
LIBS += mingw-cross-env/lib/libexpat.a
|
||||||
LIBS += mingw-cross-env/lib/libintl.a
|
LIBS += mingw-cross-env/lib/libintl.a
|
||||||
LIBS += mingw-cross-env/lib/libiconv.a
|
LIBS += mingw-cross-env/lib/libiconv.a
|
||||||
QMAKE_CXXFLAGS += -fpermissive
|
QMAKE_CXXFLAGS += -fpermissive -DNOGDI
|
||||||
WINSTACKSIZE = 8388608 # 8MB # github issue 116
|
WINSTACKSIZE = 8388608 # 8MB # github issue 116
|
||||||
QMAKE_CXXFLAGS += -Wl,--stack,$$WINSTACKSIZE
|
QMAKE_CXXFLAGS += -Wl,--stack,$$WINSTACKSIZE
|
||||||
LIBS += -Wl,--stack,$$WINSTACKSIZE
|
LIBS += -Wl,--stack,$$WINSTACKSIZE
|
||||||
|
|
|
@ -44,6 +44,7 @@ const bool cull_backfaces = false;
|
||||||
const bool color_backfaces = false;
|
const bool color_backfaces = false;
|
||||||
|
|
||||||
#ifdef _WIN32
|
#ifdef _WIN32
|
||||||
|
#include <windows.h> // For the CALLBACK macro
|
||||||
#define CGAL_GLU_TESS_CALLBACK CALLBACK
|
#define CGAL_GLU_TESS_CALLBACK CALLBACK
|
||||||
#else
|
#else
|
||||||
#define CGAL_GLU_TESS_CALLBACK
|
#define CGAL_GLU_TESS_CALLBACK
|
||||||
|
|
|
@ -11,6 +11,7 @@ For more info:
|
||||||
http://blogs.msdn.com/b/oldnewthing/archive/2006/12/04/1205831.aspx by Tom
|
http://blogs.msdn.com/b/oldnewthing/archive/2006/12/04/1205831.aspx by Tom
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
#undef NOGDI
|
||||||
#include <windows.h>
|
#include <windows.h>
|
||||||
#include <vector>
|
#include <vector>
|
||||||
|
|
||||||
|
|
|
@ -3,6 +3,7 @@
|
||||||
#ifndef _WIN32_WINNT
|
#ifndef _WIN32_WINNT
|
||||||
#define _WIN32_WINNT 0x0501
|
#define _WIN32_WINNT 0x0501
|
||||||
#endif
|
#endif
|
||||||
|
#undef NOGDI
|
||||||
#include <windows.h>
|
#include <windows.h>
|
||||||
#ifndef _WIN32_IE
|
#ifndef _WIN32_IE
|
||||||
#define _WIN32_IE 0x0501 // SHGFP_TYPE_CURRENT
|
#define _WIN32_IE 0x0501 // SHGFP_TYPE_CURRENT
|
||||||
|
|
|
@ -3,6 +3,8 @@
|
||||||
#include "printutils.h"
|
#include "printutils.h"
|
||||||
#include "PlatformUtils.h"
|
#include "PlatformUtils.h"
|
||||||
|
|
||||||
|
#include <boost/property_tree/json_parser.hpp>
|
||||||
|
|
||||||
static const char *DEFAULT_COLOR_SCHEME_NAME = "Cornfield";
|
static const char *DEFAULT_COLOR_SCHEME_NAME = "Cornfield";
|
||||||
|
|
||||||
// See http://lolengine.net/blog/2013/01/13/fast-rgb-to-hsv
|
// See http://lolengine.net/blog/2013/01/13/fast-rgb-to-hsv
|
||||||
|
@ -298,4 +300,4 @@ ColorMap::colorscheme_set_t ColorMap::enumerateColorSchemes()
|
||||||
enumerateColorSchemesInPath(result_set, PlatformUtils::userConfigPath());
|
enumerateColorSchemesInPath(result_set, PlatformUtils::userConfigPath());
|
||||||
|
|
||||||
return result_set;
|
return result_set;
|
||||||
}
|
}
|
||||||
|
|
|
@ -8,7 +8,6 @@
|
||||||
#include <boost/shared_ptr.hpp>
|
#include <boost/shared_ptr.hpp>
|
||||||
#include <boost/filesystem.hpp>
|
#include <boost/filesystem.hpp>
|
||||||
#include <boost/property_tree/ptree.hpp>
|
#include <boost/property_tree/ptree.hpp>
|
||||||
#include <boost/property_tree/json_parser.hpp>
|
|
||||||
|
|
||||||
namespace fs = boost::filesystem;
|
namespace fs = boost::filesystem;
|
||||||
|
|
||||||
|
|
|
@ -8,9 +8,6 @@
|
||||||
#else
|
#else
|
||||||
#include <GL/gl.h>
|
#include <GL/gl.h>
|
||||||
#include <GL/glu.h>
|
#include <GL/glu.h>
|
||||||
#ifdef _WIN32
|
|
||||||
#include <windows.h> // For the CALLBACK macro
|
|
||||||
#endif
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#else // NULLGL
|
#else // NULLGL
|
||||||
|
|
Loading…
Reference in New Issue