Commit 76f0d13b authored by Matthias Möller's avatar Matthias Möller
Browse files

enable deprecated warning for msvc

git-svn-id: http://www.openmesh.org/svnrepo/OpenMesh/trunk@925 fdac6126-5c0c-442c-9429-916003d36597
parent a974ed9d
...@@ -25,6 +25,7 @@ include (ACGOutput) ...@@ -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 @@ ...@@ -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 @@ ...@@ -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>
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment