actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

More MinGW fixes (this time I'm testing it)

Browse Source
This commit is contained in:
Ben Anderson
2005-06-26 00:51:02 +00:00
parent d58b3186f0
commit 9d57dc658e
1 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/archutils/Win32/arch_setup.h
+10 -9
View File
@@ -3,6 +3,8 @@
#define HAVE_FFMPEG #define HAVE_FFMPEG
#if defined(_MSC_VER)
/* Fix VC breakage. */ /* Fix VC breakage. */
#define PATH_MAX _MAX_PATH #define PATH_MAX _MAX_PATH
@@ -26,6 +28,8 @@
/* If this isn't defined to 0, VC fails to define things like stat and alloca. */ /* If this isn't defined to 0, VC fails to define things like stat and alloca. */
#define __STDC__ 0 #define __STDC__ 0
#endif
#include <direct.h> /* has stuff that should be in unistd.h */ #include <direct.h> /* has stuff that should be in unistd.h */
#include <wchar.h> /* needs to be included before our fixes below */ #include <wchar.h> /* needs to be included before our fixes below */
@@ -84,29 +88,26 @@ static inline int64_t llabs( int64_t i ) { return i >= 0? i: -i; }
#define NOMINMAX /* make sure Windows doesn't try to define this */ #define NOMINMAX /* make sure Windows doesn't try to define this */
/* Windows is missing some basic math functions: */ /* Windows is missing some basic math functions: */
// But MinGW isn't.
#if !defined(__MINGW32__)
#define NEED_TRUNCF #define NEED_TRUNCF
#define NEED_ROUNDF #define NEED_ROUNDF
#define NEED_STRTOF #define NEED_STRTOF
#define MISSING_STDINT_H #define MISSING_STDINT_H
#endif
// MinGW provides us with this function already
#if !defined(__MINGW32__)
inline int lrintf( float f ) inline int lrintf( float f )
{ {
int retval; int retval;
#if defined(__GNUC__) // MinGW or similar
asm (
"fld %0\n"
"fistp %1"
:
: "r" (f), "r" (retval)
);
#else
_asm fld f; _asm fld f;
_asm fistp retval; _asm fistp retval;
#endif
return retval; return retval;
} }
#endif
/* For RageLog. */ /* For RageLog. */
#define HAVE_VERSION_INFO #define HAVE_VERSION_INFO