blender
/
blender
134
400
Fork 583
Code Issues 6.3k Pull Requests 757 Projects 19 Wiki Activity

Cleanup: Remove special code for Visual Studio 2008. 

Goodbye VC2008, it has been a pleasure (more or less) :D SCons / CMake cleaenup will follow.
Differential Revision: https://developer.blender.org/D715
This commit is contained in:
Thomas Dinges 2014-08-07 13:51:05 +02:00
parent f82dda557c
commit e3ed13cbd4
15 changed files with 7 additions and 181 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
intern/cycles/util/util_math.h
View File

@ -76,17 +76,6 @@ CCL_NAMESPACE_BEGIN
#ifdef _WIN32
#ifndef __KERNEL_GPU__
#if defined(_MSC_VER) && (_MSC_VER < 1800)
# define copysignf(x, y) ((float)_copysign(x, y))
# define hypotf(x, y) _hypotf(x, y)
# define isnan(x) _isnan(x)
# define isfinite(x) _finite(x)
#endif
#endif
#ifndef __KERNEL_OPENCL__
ccl_device_inline float fmaxf(float a, float b)

7
intern/cycles/util/util_optimization.h
View File

@ -69,13 +69,6 @@
#define WITH_CYCLES_OPTIMIZED_KERNEL_AVX2
#endif
/* MSVC 2008, no SSE41 (broken blendv intrinsic) and no AVX support */
#if defined(_MSC_VER) && (_MSC_VER < 1700)
#undef WITH_CYCLES_OPTIMIZED_KERNEL_SSE41
#undef WITH_CYCLES_OPTIMIZED_KERNEL_AVX
#undef WITH_CYCLES_OPTIMIZED_KERNEL_AVX2
#endif
#endif
/* SSE Experiment

2
intern/ghost/intern/GHOST_WindowWin32.cpp
View File

@ -183,7 +183,7 @@ GHOST_WindowWin32::GHOST_WindowWin32(
MONITORINFO monitor;
GHOST_TUns32 tw, th;
#if !defined(_MSC_VER) || _MSC_VER < 1700
#ifndef _MSC_VER
int cxsizeframe = GetSystemMetrics(SM_CXSIZEFRAME);
int cysizeframe = GetSystemMetrics(SM_CYSIZEFRAME);
#else

4
intern/smoke/intern/tnt/tnt_math_utils.h
View File

@ -7,10 +7,6 @@
/* needed for fabs, sqrt() below */
#include <cmath>
#if defined(_MSC_VER) && (_MSC_VER < 1800)
#define hypot _hypot
#endif
namespace TNT
{
/**

7
source/blender/blenkernel/intern/writeffmpeg.c
View File

@ -30,13 +30,6 @@
#include <string.h>
#include <stdio.h>
#if defined(_WIN32) && defined(DEBUG) && !defined(__MINGW32__) && !defined(__CYGWIN__)
/* This does not seem necessary or present on MSVC 8, but may be needed in earlier versions? */
# if _MSC_VER < 1400
# include <stdint.h>
# endif
#endif
#include <stdlib.h>
#include <libavformat/avformat.h>

2
source/blender/blenlib/BLI_fileops.h
View File

@ -62,7 +62,7 @@ int BLI_create_symlink(const char *path, const char *to);
/* keep in sync with the definition of struct direntry in BLI_fileops_types.h */
#ifdef WIN32
# if (defined(_MSC_VER) && (_MSC_VER >= 1500)) || defined(__MINGW64__)
# if defined(_MSC_VER) || defined(__MINGW64__)
typedef struct _stat64 BLI_stat_t;
# elif defined(__MINGW32__)
typedef struct _stati64 BLI_stat_t;

2
source/blender/blenlib/BLI_fileops_types.h
View File

@ -46,7 +46,7 @@ struct direntry {
char *relname;
char *path;
#ifdef WIN32 /* keep in sync with the definition of BLI_stat_t in BLI_fileops.h */
# if (defined(_MSC_VER) && (_MSC_VER >= 1500)) || defined(__MINGW64__)
# if defined(_MSC_VER) || defined(__MINGW64__)
struct _stat64 s;
# elif defined(__MINGW32__)
struct _stati64 s;

11
source/blender/blenlib/BLI_math_base.h
View File

@ -147,13 +147,7 @@ static const int NAN_INT = 0x7FC00000;
#ifdef WIN32
# if defined(_MSC_VER)
# if (_MSC_VER < 1800) && !defined(isnan)
# define isnan(n) _isnan(n)
# endif
# define finite(n) _finite(n)
# if (_MSC_VER < 1800) && !defined(hypot)
# define hypot(a, b) _hypot(a, b)
# endif
# endif
#endif
@ -241,11 +235,6 @@ MINLINE int mod_i(int i, int n);
MINLINE unsigned int highest_order_bit_i(unsigned int n);
MINLINE unsigned short highest_order_bit_s(unsigned short n);
#if defined(_MSC_VER) && (_MSC_VER < 1800)
extern double copysign(double x, double y);
extern double round(double x);
#endif
double double_round(double x, int ndigits);
#ifdef BLI_MATH_GCC_WARN_PRAGMA

124
source/blender/blenlib/BLI_sys_types.h
View File

@ -47,127 +47,7 @@
extern "C" {
#endif
/* MSVC 2010 and 2012 (>=1600) have stdint.h so we should use this for consistency */
#if defined(_WIN32) && defined(_MSC_VER) && _MSC_VER <= 1500
/* The __intXX are built-in types of the visual compiler! So we don't
* need to include anything else here. */
typedef signed __int8 int8_t;
typedef signed __int16 int16_t;
typedef signed __int32 int32_t;
typedef signed __int64 int64_t;
typedef unsigned __int8 uint8_t;
typedef unsigned __int16 uint16_t;
typedef unsigned __int32 uint32_t;
typedef unsigned __int64 uint64_t;
// 7.18.2 Limits of specified-width integer types
#if !defined(__cplusplus) || defined(__STDC_LIMIT_MACROS) // [ See footnote 220 at page 257 and footnote 221 at page 259
// 7.18.2.1 Limits of exact-width integer types
#define INT8_MIN ((int8_t)_I8_MIN)
#define INT8_MAX _I8_MAX
#define INT16_MIN ((int16_t)_I16_MIN)
#define INT16_MAX _I16_MAX
#define INT32_MIN ((int32_t)_I32_MIN)
#define INT32_MAX _I32_MAX
#define INT64_MIN ((int64_t)_I64_MIN)
#define INT64_MAX _I64_MAX
#define UINT8_MAX _UI8_MAX
#define UINT16_MAX _UI16_MAX
#define UINT32_MAX _UI32_MAX
#define UINT64_MAX _UI64_MAX
// 7.18.2.2 Limits of minimum-width integer types
#define INT_LEAST8_MIN INT8_MIN
#define INT_LEAST8_MAX INT8_MAX
#define INT_LEAST16_MIN INT16_MIN
#define INT_LEAST16_MAX INT16_MAX
#define INT_LEAST32_MIN INT32_MIN
#define INT_LEAST32_MAX INT32_MAX
#define INT_LEAST64_MIN INT64_MIN
#define INT_LEAST64_MAX INT64_MAX
#define UINT_LEAST8_MAX UINT8_MAX
#define UINT_LEAST16_MAX UINT16_MAX
#define UINT_LEAST32_MAX UINT32_MAX
#define UINT_LEAST64_MAX UINT64_MAX
// 7.18.2.3 Limits of fastest minimum-width integer types
#define INT_FAST8_MIN INT8_MIN
#define INT_FAST8_MAX INT8_MAX
#define INT_FAST16_MIN INT16_MIN
#define INT_FAST16_MAX INT16_MAX
#define INT_FAST32_MIN INT32_MIN
#define INT_FAST32_MAX INT32_MAX
#define INT_FAST64_MIN INT64_MIN
#define INT_FAST64_MAX INT64_MAX
#define UINT_FAST8_MAX UINT8_MAX
#define UINT_FAST16_MAX UINT16_MAX
#define UINT_FAST32_MAX UINT32_MAX
#define UINT_FAST64_MAX UINT64_MAX
// 7.18.2.4 Limits of integer types capable of holding object pointers
#ifdef _WIN64 // [
# define INTPTR_MIN INT64_MIN
# define INTPTR_MAX INT64_MAX
# define UINTPTR_MAX UINT64_MAX
#else // _WIN64 ][
# define INTPTR_MIN INT32_MIN
# define INTPTR_MAX INT32_MAX
# define UINTPTR_MAX UINT32_MAX
#endif // _WIN64 ]
// 7.18.2.5 Limits of greatest-width integer types
#define INTMAX_MIN INT64_MIN
#define INTMAX_MAX INT64_MAX
#define UINTMAX_MAX UINT64_MAX
// 7.18.3 Limits of other integer types
#ifdef _WIN64 // [
# define PTRDIFF_MIN _I64_MIN
# define PTRDIFF_MAX _I64_MAX
#else // _WIN64 ][
# define PTRDIFF_MIN _I32_MIN
# define PTRDIFF_MAX _I32_MAX
#endif // _WIN64 ]
#define SIG_ATOMIC_MIN INT_MIN
#define SIG_ATOMIC_MAX INT_MAX
#ifndef SIZE_MAX // [
# ifdef _WIN64 // [
# define SIZE_MAX _UI64_MAX
# else // _WIN64 ][
# define SIZE_MAX _UI32_MAX
# endif // _WIN64 ]
#endif // SIZE_MAX ]
#endif // __STDC_LIMIT_MACROS ]
#ifndef _INTPTR_T_DEFINED
#ifdef _WIN64
typedef __int64 intptr_t;
#else
typedef long intptr_t;
#endif
#define _INTPTR_T_DEFINED
#endif
#ifndef _UINTPTR_T_DEFINED
#ifdef _WIN64
typedef unsigned __int64 uintptr_t;
#else
typedef unsigned long uintptr_t;
#endif
#define _UINTPTR_T_DEFINED
#endif
#elif defined(__linux__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__FreeBSD_kernel__) || defined(__GNU__)
#if defined(__linux__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__FreeBSD_kernel__) || defined(__GNU__)
/* Linux-i386, Linux-Alpha, Linux-ppc */
#include <stdint.h>
@ -186,7 +66,7 @@ typedef uint64_t u_int64_t;
#include <inttypes.h>
/* MinGW and MSVC >= 2010 */
#elif defined(FREE_WINDOWS) || (defined(_MSC_VER) && _MSC_VER >= 1600)
#elif defined(FREE_WINDOWS) || defined(_MSC_VER)
#include <stdint.h>
#else

2
source/blender/blenlib/intern/storage.c
View File

@ -515,7 +515,7 @@ int BLI_stat(const char *path, BLI_stat_t *buffer)
int BLI_wstat(const wchar_t *path, BLI_stat_t *buffer)
{
#if (defined(_MSC_VER) && (_MSC_VER >= 1500)) || defined(__MINGW64__)
#if defined(_MSC_VER) || defined(__MINGW64__)
return _wstat64(path, buffer);
#elif defined(__MINGW32__)
return _wstati64(path, buffer);

2
source/blender/freestyle/intern/geometry/Grid.h
View File

@ -30,9 +30,7 @@
#include <cstring> // for memset
#include <float.h>
#if !defined(_MSC_VER) || _MSC_VER >= 1700
#include <stdint.h> // For SET_UINT_IN_POINTER, i.e. uintptr_t.
#endif
#include <vector>
#include "Geom.h"

4
source/blender/imbuf/intern/cineon/cineonlib.c
View File

@ -39,10 +39,6 @@
#include "BLI_fileops.h"
#include "BLI_utildefines.h"
#if defined(_MSC_VER) && (_MSC_VER <= 1500)
#include "BLI_math_base.h"
#endif
#include "MEM_guardedalloc.h"
/*

4
source/blender/imbuf/intern/cineon/dpxlib.c
View File

@ -39,10 +39,6 @@
#include "BLI_fileops.h"
#include "BLI_utildefines.h"
#if defined(_MSC_VER) && (_MSC_VER <= 1500)
#include "BLI_math_base.h"
#endif
#include "MEM_guardedalloc.h"
/*

4
source/blender/imbuf/intern/util.c
View File

@ -254,10 +254,6 @@ static int isqtime(const char *name)
#ifdef WITH_FFMPEG
#if defined(_MSC_VER) && _MSC_VER < 1800
#define va_copy(dst, src) ((dst) = (src))
#endif
/* BLI_vsnprintf in ffmpeg_log_callback() causes invalid warning */
#ifdef __GNUC__
# pragma GCC diagnostic push

2
source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.cpp
View File

@ -84,7 +84,7 @@ void DrawRasterizerLine(const float* from,const float* to,int color);
// This was copied from the old KX_ConvertPhysicsObjects
#ifdef WIN32
#if defined(_MSC_VER) && (_MSC_VER >= 1310)
#ifdef _MSC_VER
//only use SIMD Hull code under Win32
//#define TEST_HULL 1
#ifdef TEST_HULL