Pulled changes from test mingw branch

* include fixes
* syntax fixes for MinGW
* fixed encoding of restext.cpp
* temporary fix for MinGW in joystick.cpp

Successfully compiles under MinGW :)

1 files changed, 4 insertions, 2 deletions

diff --git a/src/d3denum.cpp b/src/d3denum.cpp
index bd125d6..46497d8 100644
--- a/src/d3denum.cpp
+++ b/src/d3denum.cpp
@@ -107,6 +107,8 @@ static HRESULT WINAPI DeviceEnumCallback( TCHAR* strDesc, TCHAR* strName,
                                           D3DDEVICEDESC7* pDesc,

                                           VOID* pParentInfo )

 {

+    DWORD i;

+

     // Keep track of # of devices that were enumerated

     g_dwNumDevicesEnumerated++;

 

@@ -152,7 +154,7 @@ static HRESULT WINAPI DeviceEnumCallback( TCHAR* strDesc, TCHAR* strName,
             return D3DENUMRET_OK;

 

     // Build list of supported modes for the device

-    for( DWORD i=0; i<pDriverInfo->dwNumModes; i++ )

+    for( i=0; i<pDriverInfo->dwNumModes; i++ )

     {

         DDSURFACEDESC2 ddsdMode = pDriverInfo->pddsdModes[i];

         DWORD dwRenderDepths    = pDeviceInfo->ddDeviceDesc.dwDeviceRenderBitDepth;

@@ -177,7 +179,7 @@ static HRESULT WINAPI DeviceEnumCallback( TCHAR* strDesc, TCHAR* strName,
         return D3DENUMRET_OK;

 

     // Find a 640x480x16 mode for the default fullscreen mode

-    for( DWORD i=0; i<pDeviceInfo->dwNumModes; i++ )

+    for( i=0; i<pDeviceInfo->dwNumModes; i++ )

     {

         if( ( pDeviceInfo->pddsdModes[i].dwWidth == 640 ) &&

             ( pDeviceInfo->pddsdModes[i].dwHeight == 480 ) &&