+ fix build problems with Python & MacOSX

This commit is contained in:
wmayer 2014-10-13 22:02:57 +02:00
parent a53a239f2f
commit a96f390097
9 changed files with 26 additions and 15 deletions

View File

@ -29,7 +29,6 @@
#include "Document.h"
#include <Base/FileInfo.h>
#include <Base/PyTools.h>
#include "DocumentObject.h"
#include "DocumentObjectPy.h"

View File

@ -26,7 +26,6 @@
#include "PreCompiled.h"
#ifndef _PreComp_
# include <Python.h>
# include <sstream>
# include <boost/regex.hpp>
#endif

View File

@ -35,6 +35,16 @@
#include <Python.h>
#ifdef FC_OS_MACOSX
#undef toupper
#undef tolower
#undef isupper
#undef islower
#undef isspace
#undef isalpha
#undef isalnum
#endif
// Std. configurations
#include <string>
#include <map>

View File

@ -36,9 +36,21 @@
// Include files
#include <Python.h>
#ifdef FC_OS_MACOSX
#undef toupper
#undef tolower
#undef isupper
#undef islower
#undef isspace
#undef isalpha
#undef isalnum
#endif
#ifdef FC_OS_LINUX
#include <sstream>
#endif
#include <map>
#include <vector>
#include <xercesc/util/XercesDefs.hpp>

View File

@ -24,16 +24,8 @@
#ifndef BASE_UNITSAPI_H
#define BASE_UNITSAPI_H
// (re-)defined in pyconfig.h
#if defined (_POSIX_C_SOURCE)
# undef _POSIX_C_SOURCE
#endif
#if defined (_XOPEN_SOURCE)
# undef _XOPEN_SOURCE
#endif
#include <CXX/WrapPython.h>
#include <string>
#include <Python.h>
#include <QString>
#include "UnitsSchema.h"
#include "Quantity.h"

View File

@ -24,7 +24,6 @@
#include "PreCompiled.h"
#ifndef _PreComp_
# include <Python.h>
#endif
#include <CXX/Objects.hxx>

View File

@ -23,7 +23,6 @@
#include "PreCompiled.h"
#ifndef _PreComp_
# include <Python.h>
# include <QApplication>
# include <QClipboard>
# include <QDialogButtonBox>
@ -38,6 +37,7 @@
#include "Splashscreen.h"
#include "ui_AboutApplication.h"
#include <Base/Console.h>
#include <CXX/WrapPython.h>
#include <App/Application.h>
#include <Gui/MainWindow.h>

View File

@ -27,7 +27,6 @@
# include <config.h>
#endif // HAVE_CONFIG_H
#include <Python.h>
#include <QApplication>
#include <QIcon>
#include <QThread>
@ -37,6 +36,7 @@
#include <QX11EmbedWidget>
#endif
// FreeCAD Base header
#include <CXX/WrapPython.h>
#include <Base/Exception.h>
#include <Base/Factory.h>
#include <Base/Interpreter.h>

View File

@ -23,7 +23,6 @@
#include "PreCompiled.h"
#ifndef _PreComp_
#include <Python.h>
#include <gp_Ax1.hxx>
#include <gp_Ax3.hxx>
#include <gp_Dir.hxx>
@ -37,6 +36,7 @@
#include <Inventor/events/SoMouseButtonEvent.h>
#endif
#include <CXX/WrapPython.h>
#include <Base/Interpreter.h>
#include <Base/Rotation.h>
#include <Base/Tools.h>