don't define UNICODE for msvc2005

This commit is contained in:
Brad Parker 2017-08-09 23:33:57 -04:00
parent abf95744ee
commit ff98730906
2 changed files with 6 additions and 5 deletions

View File

@ -23,7 +23,10 @@
#define _WIN32_WINNT 0x0500 //_WIN32_WINNT_WIN2K
#endif
#if !defined(_MSC_VER) || _MSC_VER > 1400
#define UNICODE
#endif
#include <tchar.h>
#include <wchar.h>

View File

@ -27,6 +27,8 @@
#include "../include/d3d9/d3dx9core.h"
#endif
#include <tchar.h>
typedef struct
{
d3d_video_t *d3d;
@ -47,11 +49,7 @@ static void *d3dfonts_w32_init_font(void *video_data,
OUT_TT_PRECIS,
CLIP_DEFAULT_PRECIS,
DEFAULT_PITCH,
#if defined(_MSC_VER) && defined(UNICODE) /* MSVC needs w_char* if using Unicode */
L"Verdana" /* Hardcode FTL */
#else
"Verdana"
#endif
_T("Verdana") /* Hardcode FTL */
};
d3dfonts = (d3dfonts_t*)calloc(1, sizeof(*d3dfonts));