enable deprecated warning for msvc
git-svn-id: http://www.openmesh.org/svnrepo/OpenMesh/trunk@925 fdac6126-5c0c-442c-9429-916003d36597
This commit is contained in:
@@ -25,6 +25,7 @@ include (ACGOutput)
|
|||||||
if (WIN32)
|
if (WIN32)
|
||||||
add_definitions(
|
add_definitions(
|
||||||
-D_USE_MATH_DEFINES -DNOMINMAX
|
-D_USE_MATH_DEFINES -DNOMINMAX
|
||||||
|
-D_CRT_SECURE_NO_WARNINGS
|
||||||
)
|
)
|
||||||
endif ()
|
endif ()
|
||||||
|
|
||||||
|
|||||||
@@ -85,7 +85,6 @@
|
|||||||
# define OM_PARTIAL_SPECIALIZATION 1
|
# define OM_PARTIAL_SPECIALIZATION 1
|
||||||
# define OM_INCLUDE_TEMPLATES 1
|
# define OM_INCLUDE_TEMPLATES 1
|
||||||
# elif (_MSC_VER >= 1400) // settings for .NET 2005 (NOTE: not fully tested)
|
# elif (_MSC_VER >= 1400) // settings for .NET 2005 (NOTE: not fully tested)
|
||||||
# pragma warning(disable : 4996)
|
|
||||||
# define OM_TYPENAME
|
# define OM_TYPENAME
|
||||||
# define OM_OUT_OF_CLASS_TEMPLATE 1
|
# define OM_OUT_OF_CLASS_TEMPLATE 1
|
||||||
# define OM_PARTIAL_SPECIALIZATION 1
|
# define OM_PARTIAL_SPECIALIZATION 1
|
||||||
|
|||||||
@@ -42,8 +42,23 @@
|
|||||||
#include <OpenMesh/Core/System/config.hh>
|
#include <OpenMesh/Core/System/config.hh>
|
||||||
#include <OpenMesh/Tools/Utils/conio.hh>
|
#include <OpenMesh/Tools/Utils/conio.hh>
|
||||||
|
|
||||||
|
// ----------------------------------------------------------------- MSVC Compiler ----
|
||||||
|
#ifdef _MSC_VER
|
||||||
|
|
||||||
|
#include <conio.h>
|
||||||
|
|
||||||
|
namespace OpenMesh {
|
||||||
|
namespace Utils {
|
||||||
|
|
||||||
|
int kbhit() { return ::_kbhit(); }
|
||||||
|
int getch() { return ::_getch(); }
|
||||||
|
int getche() { return ::_getche(); }
|
||||||
|
|
||||||
|
} // Tools
|
||||||
|
} // AS
|
||||||
|
|
||||||
// ----------------------------------------------------------------- Win32 ----
|
// ----------------------------------------------------------------- Win32 ----
|
||||||
#ifdef WIN32
|
#elif defined(WIN32)
|
||||||
|
|
||||||
#include <conio.h>
|
#include <conio.h>
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user