Skip to content
This repository has been archived by the owner. It is now read-only.
Permalink
Browse files

Fixed compile errors on Windows

  • Loading branch information
slouken committed Mar 6, 2013
1 parent 956d061 commit 3803c52d02bb1e5b0bc97b0644a448e19981bc54
Showing with 6 additions and 4 deletions.
  1. +1 −0 src/joystick/windows/SDL_dxjoystick.c
  2. +5 −4 src/render/direct3d/SDL_render_d3d.c
@@ -42,6 +42,7 @@
#include "SDL_timer.h"
#include "SDL_mutex.h"
#include "SDL_events.h"
#include "SDL_hints.h"
#if !SDL_EVENTS_DISABLED
#include "../../events/SDL_events_c.h"
#endif
@@ -476,10 +476,11 @@ D3D_CreateRenderer(SDL_Window * window, Uint32 flags)
}

for (d3dxVersion=50;d3dxVersion>0;d3dxVersion--) {
SDL_snprintf(d3dxDLLFile, 49, "D3DX9_%02d.dll", d3dxVersion);
LPTSTR tmpstr = WIN_UTF8ToString(d3dxDLLFile);
data->d3dxDLL = (void *)LoadLibrary(tmpstr); /* not using SDL_LoadObject() as we want silently fail - no error message */
SDL_free(tmpstr);
LPTSTR dllName;
SDL_snprintf(d3dxDLLFile, sizeof(d3dxDLLFile), "D3DX9_%02d.dll", d3dxVersion);
dllName = WIN_UTF8ToString(d3dxDLLFile);
data->d3dxDLL = (void *)LoadLibrary(dllName); /* not using SDL_LoadObject() as we want silently fail - no error message */
SDL_free(dllName);
if (data->d3dxDLL) {
HRESULT (WINAPI *D3DXCreateMatrixStack) (DWORD Flags, LPD3DXMATRIXSTACK* ppStack);
D3DXCreateMatrixStack = (HRESULT (WINAPI *) (DWORD, LPD3DXMATRIXSTACK*)) SDL_LoadFunction(data->d3dxDLL, "D3DXCreateMatrixStack");

0 comments on commit 3803c52

Please sign in to comment.