teamnwah/openmw-tes3coop
2
0
Fork 1
forked from mirror/openmw-tes3mp
Code Issues Pull requests 1 Releases Wiki Activity

Minimal set of fixes to build with MinGW.

Browse source
This commit is contained in:
Yuri Krupenin 2011-01-03 17:00:53 +03:00
parent f3ae1ea737
commit 6b6ee5440e
3 changed files with 18 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
components/esm/esm_reader.hpp
View file

@ -1,6 +1,8 @@
#ifndef _ESM_READER_H #ifndef _ESM_READER_H
#define _ESM_READER_H #define _ESM_READER_H
#include <string.h>
#include <string> #include <string>
#include <libs/platform/stdint.h> #include <libs/platform/stdint.h>
#include <libs/platform/string.h> #include <libs/platform/string.h>

4
libs/platform/string.h
View file

@ -1,9 +1,9 @@
// Wrapper for string.h on Mac // Wrapper for string.h on Mac and MinGW
#ifndef _STRING_WRAPPER_H #ifndef _STRING_WRAPPER_H
#define _STRING_WRAPPER_H #define _STRING_WRAPPER_H
#include <string.h> #include <string.h>
#ifdef __APPLE__ #if defined(__APPLE__) || defined(__MINGW32__)
// need our own implementation of strnlen // need our own implementation of strnlen
static size_t strnlen(const char *s, size_t n) static size_t strnlen(const char *s, size_t n)
{ {

23
libs/platform/strings.h
View file

@ -1,13 +1,18 @@
// Wrapper for MSVC // Wrapper for MSVC/GCC
#ifndef _STRINGS_WRAPPER_H #ifndef _STRINGS_WRAPPER_H
#define _STRINGS_WRAPPER_H #define _STRINGS_WRAPPER_H
#ifdef WIN32
#pragma warning(disable: 4996)
#define strcasecmp stricmp
#define snprintf _snprintf
#else
#include <strings.h>
#endif
#endif // For GCC, just use strings.h (this applies to mingw too)
#if defined(__GNUC__)
# include <strings.h>
#elif defined(MSVC)
# pragma warning(disable: 4996)
# define strcasecmp stricmp
# define snprintf _snprintf
#else
# warning "Unable to determine your compiler, you should probably take a look here."
# include <strings.h> // Just take a guess
#endif
#endif /* _STRINGS_WRAPPER_H */