pandory500/SDL-mirror
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merged r3094:3095 from branches/SDL-1.2: Visual C++ 6.0 fixes.

Browse source 
--HG--
extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/trunk%402372
This commit is contained in:
Ryan C. Gordon 2007-06-21 18:21:49 +00:00
parent 5bb1d2ceb7
commit 04255e0015
2 changed files with 33 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

10
include/SDL_config_win32.h
View file

@ -45,6 +45,16 @@ typedef unsigned __int64 uintptr_t;
typedef unsigned int uintptr_t; typedef unsigned int uintptr_t;
#endif #endif
#define _UINTPTR_T_DEFINED #define _UINTPTR_T_DEFINED
/* Older Visual C++ headers don't have the Win64-compatible typedefs... */
#if ((_MSC_VER <= 1200) && (!defined(DWORD_PTR)))
#define DWORD_PTR DWORD
#endif
#if ((_MSC_VER <= 1200) && (!defined(LONG_PTR)))
#define LONG_PTR LONG
#endif
#ifndef GWLP_HINSTANCE
#define GWLP_HINSTANCE GWL_HINSTANCE
#endif
#endif #endif
#else /* !__GNUC__ && !_MSC_VER */ #else /* !__GNUC__ && !_MSC_VER */
typedef signed char int8_t; typedef signed char int8_t;

30
src/video/SDL_blit_A.c
View file

@ -24,14 +24,30 @@
#include "SDL_video.h" #include "SDL_video.h"
#include "SDL_blit.h" #include "SDL_blit.h"
/*
In Visual C, VC6 has mmintrin.h in the "Processor Pack" add-on.
Checking if _mm_free is #defined in malloc.h is is the only way to
determine if the Processor Pack is installed, as far as I can tell.
*/
#if SDL_ASSEMBLY_ROUTINES #if SDL_ASSEMBLY_ROUTINES
#if defined(__GNUC__) && (defined(__i386__) || defined(__x86_64__)) # if defined(__GNUC__) && (defined(__i386__) || defined(__x86_64__))
#define MMX_ASMBLIT 1 # define MMX_ASMBLIT 1
#define GCC_ASMBLIT 1 # define GCC_ASMBLIT 1
#elif defined(_MSC_VER) && (_MSC_VER >= 1200) && defined(_M_IX86) # elif defined(_MSC_VER) && defined(_M_IX86)
#define MMX_ASMBLIT 1 # if (_MSC_VER <= 1200)
#define MSVC_ASMBLIT 1 # include <malloc.h>
#endif # if defined(_mm_free)
# define HAVE_MMINTRIN_H 1
# endif
# else /* Visual Studio > VC6 always has mmintrin.h */
# define HAVE_MMINTRIN_H 1
# endif
# if HAVE_MMINTRIN_H
# define MMX_ASMBLIT 1
# define MSVC_ASMBLIT 1
# endif
# endif
#endif /* SDL_ASSEMBLY_ROUTINES */ #endif /* SDL_ASSEMBLY_ROUTINES */
/* Function to check the CPU flags */ /* Function to check the CPU flags */