Rolled back my LoadLibrary change. The first failed call causes a dialog to pop up in Windows apps (but not console apps) and that's really bad. I'll have to deal with this in my app.

This commit is contained in:
Sam Lantinga 2013-09-28 14:06:39 -07:00
parent dfa53e7e3c
commit d0a57ea2b5

View File

@ -34,19 +34,6 @@ SDL_LoadObject(const char *sofile)
{
LPTSTR tstr = WIN_UTF8ToString(sofile);
void *handle = (void *) LoadLibrary(tstr);
/* By default LoadLibrary uses the current working directory
* as the first item on the search path for implicit dependencies
* of whatever it's loading. That is somewhat inconsistent with
* what dlopen does on other platforms, so we will try again
* with LoadLibraryEx and a slightly different search path. This
* causes Windows to search for dependencies in the directory
* that the module itself lives in. */
if(handle == NULL)
{
handle = (void *) LoadLibraryEx(tstr, NULL, LOAD_WITH_ALTERED_SEARCH_PATH);
}
SDL_free(tstr);
/* Generate an error message if all loads failed */