Mercurial > sdl-ios-xcode
view test/automated/SDL_at.c @ 4426:1bceff8f008f
Fixed bug #943
Ozkan Sezer 2010-02-06 12:31:06 PST
Hi:
Here are some small fixes for compiling SDL against mingw-w64.
(see http://mingw-w64.sourceforge.net/ . Despite the name, it
supports both win32 and win64.)
src/audio/windx5/directx.h and src/video/windx5/directx.h (both
SDL-1.2 and SDL-1.3.) I get compilation errors about some union
not having a member named u1 and alike, because of other system
headers being included before this one and them already defining
DUMMYUNIONNAME and stuff. This header probably assumes that those
stuff are defined in windef.h, but mingw-w64 headers define them
in _mingw.h. Easily fixed by moving NONAMELESSUNION definition to
the top of the file.
src/thread/win32/SDL_systhread.c (both SDL-1.2 and SDL-1.3.) :
The __GNUC__ case for pfnSDL_CurrentBeginThread is 32-bit centric
because _beginthreadex returns uintptr_t, not unsigned long which
is 32 bits in win64. Changing the return type to uintptr_t fixes
it.
video/SDL_blit.h (and configure.in) (SDL-1.3-only) : MinGW-w64
uses msvcrt version of _aligned_malloc and _aligned_free and
they are defined in intrin.h (similar to VC). Adding proper
ifdefs fixes it. (Notes about macros to check: __MINGW32__ is
defined for both mingw.org and for mingw-w64 for both win32 and
win64, __MINGW64__ is only defined for _WIN64, so __MINGW64__
can't be used to detect mingw-w64: including _mingw.h and then
checking for __MINGW64_VERSION_MAJOR does the trick.)
SDL_win32video.h (SDL-1.3-only) : Tweaked the VINWER definition
and location in order to avoid multiple redefinition warnings.
Hope these are useful. Thanks.
author | Sam Lantinga <slouken@libsdl.org> |
---|---|
date | Wed, 10 Mar 2010 15:02:58 +0000 |
parents | 78db4f7ae2f3 |
children |
line wrap: on
line source
/* * Common code for automated test suite. * * Written by Edgar Simo "bobbens" * * Released under Public Domain. */ #include "SDL_at.h" #include "SDL_stdinc.h" #include "SDL_error.h" #include <stdio.h> /* printf/fprintf */ #include <stdarg.h> /* va_list */ /* * Internal usage SDL_AT variables. */ static char *at_suite_msg = NULL; /**< Testsuite message. */ static char *at_test_msg = NULL; /**< Testcase message. */ static int at_success = 0; /**< Number of successful testcases. */ static int at_failure = 0; /**< Number of failed testcases. */ /* * Global properties. */ static int at_verbose = 0; /**< Verbosity. */ static int at_quiet = 0; /**< Quietness. */ /* * Prototypes. */ static void SDL_ATcleanup (void); static void SDL_ATendWith( int success ); static void SDL_ATassertFailed( const char *msg ); /** * @brief Cleans up the automated testsuite state. */ static void SDL_ATcleanup (void) { if (at_suite_msg != NULL) SDL_free(at_suite_msg); at_suite_msg = NULL; if (at_test_msg != NULL) SDL_free(at_test_msg); at_test_msg = NULL; at_success = 0; at_failure = 0; } /** * @brief Begin testsuite. */ void SDL_ATinit( const char *suite ) { /* Do not open twice. */ if (at_suite_msg) { SDL_ATprintErr( "AT suite '%s' not closed before opening suite '%s'\n", at_suite_msg, suite ); } /* Must have a name. */ if (suite == NULL) { SDL_ATprintErr( "AT testsuite does not have a name.\n"); } SDL_ATcleanup(); at_suite_msg = SDL_strdup(suite); /* Verbose message. */ SDL_ATprintVerbose( 2, "--+---> Started Test Suite '%s'\n", at_suite_msg ); } /** * @brief Finish testsuite. */ int SDL_ATfinish (void) { int failed; /* Make sure initialized. */ if (at_suite_msg == NULL) { SDL_ATprintErr("Ended testcase without initializing.\n"); return 1; } /* Finished without closing testcase. */ if (at_test_msg) { SDL_ATprintErr( "AT suite '%s' finished without closing testcase '%s'\n", at_suite_msg, at_test_msg ); } /* Verbose message. */ SDL_ATprintVerbose( 2, "<-+---- Finished Test Suite '%s'\n", at_suite_msg ); /* Display message if verbose on failed. */ failed = at_failure; if (at_failure > 0) { SDL_ATprintErr( "%s : Failed %d out of %d testcases!\n", at_suite_msg, at_failure, at_failure+at_success ); } else { SDL_ATprint( "%s : All tests successful (%d)\n", at_suite_msg, at_success ); } /* Clean up. */ SDL_ATcleanup(); /* Return failed. */ return failed; } /** * @brief Sets a property. */ void SDL_ATseti( int property, int value ) { switch (property) { case SDL_AT_VERBOSE: at_verbose = value; break; case SDL_AT_QUIET: at_quiet = value; break; } } /** * @brief Gets a property. */ void SDL_ATgeti( int property, int *value ) { switch (property) { case SDL_AT_VERBOSE: *value = at_verbose; break; case SDL_AT_QUIET: *value = at_quiet; break; } } /** * @brief Begin testcase. */ void SDL_ATbegin( const char *testcase ) { /* Do not open twice. */ if (at_test_msg) { SDL_ATprintErr( "AT testcase '%s' not closed before opening testcase '%s'\n", at_test_msg, testcase ); } /* Must have a name. */ if (testcase == NULL) { SDL_ATprintErr( "AT testcase does not have a name.\n"); } at_test_msg = SDL_strdup(testcase); /* Verbose message. */ SDL_ATprintVerbose( 2, " +---> StartedTest Case '%s'\n", testcase ); } /** * @brief Ends the testcase with a succes or failure. */ static void SDL_ATendWith( int success ) { /* Make sure initialized. */ if (at_test_msg == NULL) { SDL_ATprintErr("Ended testcase without initializing.\n"); return; } /* Mark as success or failure. */ if (success) at_success++; else at_failure++; /* Verbose message. */ SDL_ATprintVerbose( 2, " +---- Finished Test Case '%s'\n", at_test_msg ); /* Clean up. */ if (at_test_msg != NULL) SDL_free(at_test_msg); at_test_msg = NULL; } /** * @brief Display failed assert message. */ static void SDL_ATassertFailed( const char *msg ) { /* Print. */ SDL_ATprintErr( "Assert Failed!\n" ); SDL_ATprintErr( " %s\n", msg ); SDL_ATprintErr( " Test Case '%s'\n", at_test_msg ); SDL_ATprintErr( " Test Suite '%s'\n", at_suite_msg ); SDL_ATprintErr( " Last SDL error '%s'\n", SDL_GetError() ); /* End. */ SDL_ATendWith(0); } /** * @brief Testcase test. */ int SDL_ATassert( const char *msg, int condition ) { /* Condition failed. */ if (!condition) { /* Failed message. */ SDL_ATassertFailed(msg); } return !condition; } /** * @brief Testcase test. */ int SDL_ATvassert( int condition, const char *msg, ... ) { va_list args; char buf[256]; /* Condition failed. */ if (!condition) { /* Get message. */ va_start( args, msg ); SDL_vsnprintf( buf, sizeof(buf), msg, args ); va_end( args ); /* Failed message. */ SDL_ATassertFailed( buf ); } return !condition; } /** * @brief End testcase. */ void SDL_ATend (void) { SDL_ATendWith(1); } /** * @brief Displays an error. */ int SDL_ATprintErr( const char *msg, ... ) { va_list ap; int ret; /* Make sure there is something to print. */ if (msg == NULL) return 0; else { va_start(ap, msg); ret = vfprintf( stderr, msg, ap ); va_end(ap); } return ret; } /** * @brief Displays a message. */ int SDL_ATprint( const char *msg, ... ) { va_list ap; int ret; /* Only print if not quiet. */ if (at_quiet) return 0; /* Make sure there is something to print. */ if (msg == NULL) return 0; else { va_start(ap, msg); ret = vfprintf( stdout, msg, ap ); va_end(ap); } return ret; } /** * @brief Displays a verbose message. */ int SDL_ATprintVerbose( int level, const char *msg, ... ) { va_list ap; int ret; /* Only print if not quiet. */ if (at_quiet || (at_verbose < level)) return 0; /* Make sure there is something to print. */ if (msg == NULL) return 0; else { va_start(ap, msg); ret = vfprintf( stdout, msg, ap ); va_end(ap); } return ret; }