Browse Source

build fixes for most WinRT-related files

Still TODO: getting the D3D11 renderer back up and running in VC 2012.
David Ludwig 11 years ago
parent
commit
e8eb142748

+ 2 - 8
VisualC-WinRT/SDL/SDL-WinRT_VS2012.vcxproj

@@ -96,14 +96,7 @@
     <ClCompile Include="..\..\src\joystick\SDL_joystick.c" />
     <ClCompile Include="..\..\src\joystick\SDL_joystick.c" />
     <ClCompile Include="..\..\src\joystick\winrt\SDL_xinputjoystick.c" />
     <ClCompile Include="..\..\src\joystick\winrt\SDL_xinputjoystick.c" />
     <ClCompile Include="..\..\src\loadso\windows\SDL_sysloadso.c" />
     <ClCompile Include="..\..\src\loadso\windows\SDL_sysloadso.c" />
-    <ClCompile Include="..\..\src\render\direct3d11\SDL_render_d3d11.cpp">
-      <CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</CompileAsWinRT>
-      <CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</CompileAsWinRT>
-      <CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</CompileAsWinRT>
-      <CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</CompileAsWinRT>
-      <CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</CompileAsWinRT>
-      <CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</CompileAsWinRT>
-    </ClCompile>
+    <ClCompile Include="..\..\src\render\direct3d11\SDL_render_d3d11.c" />
     <ClCompile Include="..\..\src\render\opengles2\SDL_render_gles2.c" />
     <ClCompile Include="..\..\src\render\opengles2\SDL_render_gles2.c" />
     <ClCompile Include="..\..\src\render\opengles2\SDL_shaders_gles2.c" />
     <ClCompile Include="..\..\src\render\opengles2\SDL_shaders_gles2.c" />
     <ClCompile Include="..\..\src\render\SDL_render.c" />
     <ClCompile Include="..\..\src\render\SDL_render.c" />
@@ -301,6 +294,7 @@
     <ClInclude Include="..\..\src\SDL_error_c.h" />
     <ClInclude Include="..\..\src\SDL_error_c.h" />
     <ClInclude Include="..\..\src\SDL_fatal.h" />
     <ClInclude Include="..\..\src\SDL_fatal.h" />
     <ClInclude Include="..\..\src\SDL_hints_c.h" />
     <ClInclude Include="..\..\src\SDL_hints_c.h" />
+    <ClInclude Include="..\..\src\SDL_internal.h" />
     <ClInclude Include="..\..\src\thread\SDL_systhread.h" />
     <ClInclude Include="..\..\src\thread\SDL_systhread.h" />
     <ClInclude Include="..\..\src\thread\SDL_thread_c.h" />
     <ClInclude Include="..\..\src\thread\SDL_thread_c.h" />
     <ClInclude Include="..\..\src\thread\stdcpp\SDL_sysmutex_c.h" />
     <ClInclude Include="..\..\src\thread\stdcpp\SDL_sysmutex_c.h" />

+ 6 - 3
VisualC-WinRT/SDL/SDL-WinRT_VS2012.vcxproj.filters

@@ -229,9 +229,6 @@
     <ClCompile Include="..\..\src\cpuinfo\SDL_cpuinfo.c">
     <ClCompile Include="..\..\src\cpuinfo\SDL_cpuinfo.c">
       <Filter>Source Files</Filter>
       <Filter>Source Files</Filter>
     </ClCompile>
     </ClCompile>
-    <ClCompile Include="..\..\src\render\direct3d11\SDL_render_d3d11.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\src\joystick\SDL_gamecontroller.c">
     <ClCompile Include="..\..\src\joystick\SDL_gamecontroller.c">
       <Filter>Source Files</Filter>
       <Filter>Source Files</Filter>
     </ClCompile>
     </ClCompile>
@@ -280,6 +277,9 @@
     <ClCompile Include="..\..\src\render\opengles2\SDL_shaders_gles2.c">
     <ClCompile Include="..\..\src\render\opengles2\SDL_shaders_gles2.c">
       <Filter>Source Files</Filter>
       <Filter>Source Files</Filter>
     </ClCompile>
     </ClCompile>
+    <ClCompile Include="..\..\src\render\direct3d11\SDL_render_d3d11.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
   </ItemGroup>
   <ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\include\begin_code.h">
     <ClInclude Include="..\..\include\begin_code.h">
@@ -633,6 +633,9 @@
     <ClInclude Include="..\..\src\render\opengles2\SDL_shaders_gles2.h">
     <ClInclude Include="..\..\src\render\opengles2\SDL_shaders_gles2.h">
       <Filter>Source Files</Filter>
       <Filter>Source Files</Filter>
     </ClInclude>
     </ClInclude>
+    <ClInclude Include="..\..\src\SDL_internal.h">
+      <Filter>Source Files</Filter>
+    </ClInclude>
   </ItemGroup>
   </ItemGroup>
   <ItemGroup>
   <ItemGroup>
     <Filter Include="Header Files">
     <Filter Include="Header Files">

+ 1 - 0
src/core/winrt/SDL_winrtapp_direct3d.cpp

@@ -26,6 +26,7 @@ using namespace Windows::Phone::UI::Input;
 
 
 /* SDL includes */
 /* SDL includes */
 extern "C" {
 extern "C" {
+#include "../../SDL_internal.h"
 #include "SDL_assert.h"
 #include "SDL_assert.h"
 #include "SDL_events.h"
 #include "SDL_events.h"
 #include "SDL_hints.h"
 #include "SDL_hints.h"

+ 1 - 0
src/core/winrt/SDL_winrtapp_xaml.cpp

@@ -29,6 +29,7 @@
 
 
 
 
 /* SDL includes */
 /* SDL includes */
+#include "../../SDL_internal.h"
 #include "SDL.h"
 #include "SDL.h"
 #include "../../video/winrt/SDL_winrtevents_c.h"
 #include "../../video/winrt/SDL_winrtevents_c.h"
 #include "../../video/winrt/SDL_winrtvideo_cpp.h"
 #include "../../video/winrt/SDL_winrtvideo_cpp.h"

+ 1 - 1
src/filesystem/winrt/SDL_sysfilesystem.cpp

@@ -2,7 +2,7 @@
    TODO, WinRT: remove the need to compile this with C++/CX (/ZW) extensions, and if possible, without C++ at all
    TODO, WinRT: remove the need to compile this with C++/CX (/ZW) extensions, and if possible, without C++ at all
 */
 */
 
 
-#include "SDL_config.h"
+#include "../../SDL_internal.h"
 
 
 #ifdef __WINRT__
 #ifdef __WINRT__
 
 

+ 1 - 1
src/thread/stdcpp/SDL_syscond.cpp

@@ -18,7 +18,7 @@
      misrepresented as being the original software.
      misrepresented as being the original software.
   3. This notice may not be removed or altered from any source distribution.
   3. This notice may not be removed or altered from any source distribution.
 */
 */
-#include "SDL_config.h"
+#include "../../SDL_internal.h"
 
 
 extern "C" {
 extern "C" {
 #include "SDL_thread.h"
 #include "SDL_thread.h"

+ 1 - 1
src/thread/stdcpp/SDL_sysmutex.cpp

@@ -18,7 +18,7 @@
      misrepresented as being the original software.
      misrepresented as being the original software.
   3. This notice may not be removed or altered from any source distribution.
   3. This notice may not be removed or altered from any source distribution.
 */
 */
-#include "SDL_config.h"
+#include "../../SDL_internal.h"
 
 
 extern "C" {
 extern "C" {
 #include "SDL_thread.h"
 #include "SDL_thread.h"

+ 1 - 1
src/thread/stdcpp/SDL_systhread.cpp

@@ -18,7 +18,7 @@
      misrepresented as being the original software.
      misrepresented as being the original software.
   3. This notice may not be removed or altered from any source distribution.
   3. This notice may not be removed or altered from any source distribution.
 */
 */
-#include "SDL_config.h"
+#include "../../SDL_internal.h"
 
 
 /* Thread management routines for SDL */
 /* Thread management routines for SDL */
 
 

+ 1 - 1
src/video/winrt/SDL_winrtkeyboard.cpp

@@ -18,7 +18,7 @@
      misrepresented as being the original software.
      misrepresented as being the original software.
   3. This notice may not be removed or altered from any source distribution.
   3. This notice may not be removed or altered from any source distribution.
 */
 */
-#include "SDL_config.h"
+#include "../../SDL_internal.h"
 
 
 #if SDL_VIDEO_DRIVER_WINRT
 #if SDL_VIDEO_DRIVER_WINRT
 
 

+ 1 - 1
src/video/winrt/SDL_winrtmouse.cpp

@@ -19,7 +19,7 @@
   3. This notice may not be removed or altered from any source distribution.
   3. This notice may not be removed or altered from any source distribution.
 */
 */
 
 
-#include "SDL_config.h"
+#include "../../SDL_internal.h"
 
 
 #if SDL_VIDEO_DRIVER_WINRT
 #if SDL_VIDEO_DRIVER_WINRT
 
 

+ 1 - 1
src/video/winrt/SDL_winrtvideo.cpp

@@ -18,7 +18,7 @@
      misrepresented as being the original software.
      misrepresented as being the original software.
   3. This notice may not be removed or altered from any source distribution.
   3. This notice may not be removed or altered from any source distribution.
 */
 */
-#include "SDL_config.h"
+#include "../../SDL_internal.h"
 
 
 #if SDL_VIDEO_DRIVER_WINRT
 #if SDL_VIDEO_DRIVER_WINRT