Fixed compiling with Visual Studio
authorSam Lantinga <slouken@libsdl.org>
Tue, 19 Jun 2012 13:50:14 -0400
changeset 6332 019660f4cc2b
parent 6331 5732e1a80bde
child 6333 8d541aa4e1da
Fixed compiling with Visual Studio
VisualC/SDL/SDL_VS2008.vcproj
VisualC/SDL/SDL_VS2010.vcxproj
src/render/direct3d/SDL_render_d3d.c
src/render/software/SDL_render_sw.c
--- a/VisualC/SDL/SDL_VS2008.vcproj	Tue Jun 19 14:19:05 2012 -0300
+++ b/VisualC/SDL/SDL_VS2008.vcproj	Tue Jun 19 13:50:14 2012 -0400
@@ -1001,6 +1001,14 @@
 			>
 		</File>
 		<File
+			RelativePath="..\..\src\render\software\SDL_rotate.c"
+			>
+		</File>
+		<File
+			RelativePath="..\..\src\render\software\SDL_rotate.h"
+			>
+		</File>
+		<File
 			RelativePath="..\..\src\file\SDL_rwops.c"
 			>
 		</File>
--- a/VisualC/SDL/SDL_VS2010.vcxproj	Tue Jun 19 14:19:05 2012 -0300
+++ b/VisualC/SDL/SDL_VS2010.vcxproj	Tue Jun 19 13:50:14 2012 -0400
@@ -273,6 +273,7 @@
     <ClInclude Include="..\..\src\render\software\SDL_drawline.h" />
     <ClInclude Include="..\..\src\render\software\SDL_drawpoint.h" />
     <ClInclude Include="..\..\src\render\software\SDL_render_sw_c.h" />
+    <ClInclude Include="..\..\src\render\software\SDL_rotate.h" />
     <ClInclude Include="..\..\src\video\dummy\SDL_nullframebuffer_c.h" />
     <ClInclude Include="..\..\src\video\SDL_blit.h" />
     <ClInclude Include="..\..\src\video\SDL_blit_auto.h" />
@@ -356,6 +357,7 @@
     <ClCompile Include="..\..\src\render\software\SDL_drawline.c" />
     <ClCompile Include="..\..\src\render\software\SDL_drawpoint.c" />
     <ClCompile Include="..\..\src\render\software\SDL_render_sw.c" />
+    <ClCompile Include="..\..\src\render\software\SDL_rotate.c" />
     <ClCompile Include="..\..\src\SDL.c" />
     <ClCompile Include="..\..\src\SDL_assert.c" />
     <ClCompile Include="..\..\src\atomic\SDL_atomic.c" />
@@ -441,4 +443,4 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
+</Project>
\ No newline at end of file
--- a/src/render/direct3d/SDL_render_d3d.c	Tue Jun 19 14:19:05 2012 -0300
+++ b/src/render/direct3d/SDL_render_d3d.c	Tue Jun 19 13:50:14 2012 -0400
@@ -1320,7 +1320,7 @@
     // Rotate and translate
     ID3DXMatrixStack_Push(data->matrixStack);
     ID3DXMatrixStack_LoadIdentity(data->matrixStack);
-    ID3DXMatrixStack_RotateYawPitchRoll(data->matrixStack, 0.0, 0.0, M_PI * (float) angle / 180.0f);
+    ID3DXMatrixStack_RotateYawPitchRoll(data->matrixStack, 0.0, 0.0, (float)(M_PI * (float) angle / 180.0f));
     ID3DXMatrixStack_Translate(data->matrixStack, (float)dstrect->x + centerx, (float)dstrect->y + centery, (float)0.0);
     IDirect3DDevice9_SetTransform(data->device, D3DTS_VIEW, (D3DMATRIX*)ID3DXMatrixStack_GetTop(data->matrixStack));
 
--- a/src/render/software/SDL_render_sw.c	Tue Jun 19 14:19:05 2012 -0300
+++ b/src/render/software/SDL_render_sw.c	Tue Jun 19 13:50:14 2012 -0400
@@ -521,7 +521,6 @@
     SDL_Surface *src = (SDL_Surface *) texture->driverdata;
     SDL_Rect final_rect = *dstrect, tmp_rect;
     SDL_Surface *surface_rotated, *surface_scaled;
-    SDL_Point final_rect_center;
     Uint32 colorkey;
     int retval, dstwidth, dstheight, abscenterx, abscentery;
     double cangle, sangle, px, py, p1x, p1y, p2x, p2y, p3x, p3y, p4x, p4y;