Merge branch 'master' of ssh://free-cad.git.sourceforge.net/gitroot/free-cad/free-cad

This commit is contained in:
Yorik van Havre
2012-02-24 00:13:17 -02:00
11 changed files with 104 additions and 58 deletions

View File

@@ -28,15 +28,21 @@
// Importing of App classes
#ifdef FC_OS_WIN32
# define PartExport __declspec(dllimport)
# define MeshExport __declspec(dllimport)
# define PartExport __declspec(dllimport)
# define MeshPartAppExport __declspec(dllimport)
# define MeshPartGuiExport __declspec(dllexport)
#else // for Linux
# define MeshExport
# define PartExport
# define MeshPartAppExport
# define MeshPartGuiExport
#endif
#ifdef _MSC_VER
# pragma warning(disable : 4290)
# pragma warning(disable : 4275)
#endif
#ifdef _PreComp_