Skip to content
This repository has been archived by the owner on Feb 11, 2021. It is now read-only.

Commit

Permalink
WinRT: moved contents of platform-specific SDLmain into SDL.dll, wher…
Browse files Browse the repository at this point in the history 
…e it should probably have been in the first place
  • Loading branch information
@DavidLudwig
DavidLudwig committed Oct 28, 2012
1 parent 579e39c commit b24da31
Show file tree
Hide file tree
Showing 13 changed files with 41 additions and 200 deletions.
36 changes: 36 additions & 0 deletions VisualC/SDL/SDL_VS2012_WinRT.vcxproj
View file
Expand Up @@ -101,6 +101,30 @@
<ClCompile Include="..\..\src\video\SDL_stretch.c" />
<ClCompile Include="..\..\src\video\SDL_surface.c" />
<ClCompile Include="..\..\src\video\SDL_video.c" />
<ClCompile Include="..\..\src\video\windowsrt\CubeRenderer.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\video\windowsrt\Direct3DBase.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\video\windowsrt\SDL_WinRTApp.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>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\..\include\begin_code.h" />
Expand Down Expand Up @@ -204,6 +228,12 @@
<ClInclude Include="..\..\src\video\SDL_RLEaccel_c.h" />
<ClInclude Include="..\..\src\video\SDL_shape_internals.h" />
<ClInclude Include="..\..\src\video\SDL_sysvideo.h" />
<ClInclude Include="..\..\src\video\windowsrt\BasicTimer.h" />
<ClInclude Include="..\..\src\video\windowsrt\CubeRenderer.h" />
<ClInclude Include="..\..\src\video\windowsrt\Direct3DBase.h" />
<ClInclude Include="..\..\src\video\windowsrt\DirectXHelper.h" />
<ClInclude Include="..\..\src\video\windowsrt\SDLmain_WinRT_common.h" />
<ClInclude Include="..\..\src\video\windowsrt\SDL_WinRTApp.h" />
</ItemGroup>
<PropertyGroup Label="Globals">
<ProjectGuid>{aeaea3a2-d4e6-45b1-8ec6-53d84287fc14}</ProjectGuid>
Expand Down Expand Up @@ -310,6 +340,7 @@
<SubSystem>Console</SubSystem>
<IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
<GenerateWindowsMetadata>false</GenerateWindowsMetadata>
<AdditionalDependencies>d2d1.lib; d3d11.lib; dxgi.lib; ole32.lib; windowscodecs.lib; dwrite.lib; kernel32.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
Expand All @@ -323,6 +354,7 @@
<SubSystem>Console</SubSystem>
<IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
<GenerateWindowsMetadata>false</GenerateWindowsMetadata>
<AdditionalDependencies>d2d1.lib; d3d11.lib; dxgi.lib; ole32.lib; windowscodecs.lib; dwrite.lib; kernel32.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|arm'">
Expand All @@ -336,6 +368,7 @@
<SubSystem>Console</SubSystem>
<IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
<GenerateWindowsMetadata>false</GenerateWindowsMetadata>
<AdditionalDependencies>d2d1.lib; d3d11.lib; dxgi.lib; ole32.lib; windowscodecs.lib; dwrite.lib; kernel32.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|arm'">
Expand All @@ -349,6 +382,7 @@
<SubSystem>Console</SubSystem>
<IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
<GenerateWindowsMetadata>false</GenerateWindowsMetadata>
<AdditionalDependencies>d2d1.lib; d3d11.lib; dxgi.lib; ole32.lib; windowscodecs.lib; dwrite.lib; kernel32.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
Expand All @@ -362,6 +396,7 @@
<SubSystem>Console</SubSystem>
<IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
<GenerateWindowsMetadata>false</GenerateWindowsMetadata>
<AdditionalDependencies>d2d1.lib; d3d11.lib; dxgi.lib; ole32.lib; windowscodecs.lib; dwrite.lib; kernel32.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
Expand All @@ -375,6 +410,7 @@
<SubSystem>Console</SubSystem>
<IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
<GenerateWindowsMetadata>false</GenerateWindowsMetadata>
<AdditionalDependencies>d2d1.lib; d3d11.lib; dxgi.lib; ole32.lib; windowscodecs.lib; dwrite.lib; kernel32.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
Expand Down
199 changes: 0 additions & 199 deletions VisualC/SDLmain/SDLmain_VS2012_WinRT.vcxproj
View file

This file was deleted.

0 src/main/windowsrt/BasicTimer.h → src/video/windowsrt/BasicTimer.h
View file
File renamed without changes.
0 src/main/windowsrt/CubeRenderer.cpp → src/video/windowsrt/CubeRenderer.cpp
View file
File renamed without changes.
0 src/main/windowsrt/CubeRenderer.h → src/video/windowsrt/CubeRenderer.h
View file
File renamed without changes.
0 src/main/windowsrt/Direct3DBase.cpp → src/video/windowsrt/Direct3DBase.cpp
View file
File renamed without changes.
0 src/main/windowsrt/Direct3DBase.h → src/video/windowsrt/Direct3DBase.h
View file
File renamed without changes.
0 src/main/windowsrt/DirectXHelper.h → src/video/windowsrt/DirectXHelper.h
View file
File renamed without changes.
6 changes: 5 additions & 1 deletion src/main/windowsrt/SDL_WinRTApp.cpp → src/video/windowsrt/SDL_WinRTApp.cpp
View file
Expand Up @@ -57,8 +57,12 @@ void SDL_WinRTApp::Load(Platform::String^ entryPoint)
{
}

#include "SDL.h"

void SDL_WinRTApp::Run()
{
SDL_Init(0);

BasicTimer^ timer = ref new BasicTimer();

while (!m_windowClosed)
Expand Down Expand Up @@ -140,7 +144,7 @@ IFrameworkView^ Direct3DApplicationSource::CreateView()
return ref new SDL_WinRTApp();
}

int SDL_WinRT_RunApplication(/*Platform::Array<Platform::String^>^*/)
__declspec(dllexport) int SDL_WinRT_RunApplication(/*Platform::Array<Platform::String^>^*/)
{
auto direct3DApplicationSource = ref new Direct3DApplicationSource();
CoreApplication::Run(direct3DApplicationSource);
Expand Down
0 src/main/windowsrt/SDL_WinRTApp.h → src/video/windowsrt/SDL_WinRTApp.h
View file
File renamed without changes.
0 src/main/windowsrt/SDLmain_WinRT_common.h → src/video/windowsrt/SDLmain_WinRT_common.h
View file
File renamed without changes.
0 src/main/windowsrt/SimplePixelShader.hlsl → src/video/windowsrt/SimplePixelShader.hlsl
View file
File renamed without changes.
0 src/main/windowsrt/SimpleVertexShader.hlsl → src/video/windowsrt/SimpleVertexShader.hlsl
View file
File renamed without changes.

0 comments on commit b24da31

Please sign in to comment.