diff --git a/VisualC/SDL/SDL_VS2012_WinRT.vcxproj b/VisualC/SDL/SDL_VS2012_WinRT.vcxproj
index 7d1e46b52..687b462ea 100644
--- a/VisualC/SDL/SDL_VS2012_WinRT.vcxproj
+++ b/VisualC/SDL/SDL_VS2012_WinRT.vcxproj
@@ -101,6 +101,30 @@
+
+ true
+ true
+ true
+ true
+ true
+ true
+
+
+ true
+ true
+ true
+ true
+ true
+ true
+
+
+ true
+ true
+ true
+ true
+ true
+ true
+
@@ -204,6 +228,12 @@
+
+
+
+
+
+
{aeaea3a2-d4e6-45b1-8ec6-53d84287fc14}
@@ -310,6 +340,7 @@
Console
false
false
+ d2d1.lib; d3d11.lib; dxgi.lib; ole32.lib; windowscodecs.lib; dwrite.lib; kernel32.lib;%(AdditionalDependencies)
@@ -323,6 +354,7 @@
Console
false
false
+ d2d1.lib; d3d11.lib; dxgi.lib; ole32.lib; windowscodecs.lib; dwrite.lib; kernel32.lib;%(AdditionalDependencies)
@@ -336,6 +368,7 @@
Console
false
false
+ d2d1.lib; d3d11.lib; dxgi.lib; ole32.lib; windowscodecs.lib; dwrite.lib; kernel32.lib;%(AdditionalDependencies)
@@ -349,6 +382,7 @@
Console
false
false
+ d2d1.lib; d3d11.lib; dxgi.lib; ole32.lib; windowscodecs.lib; dwrite.lib; kernel32.lib;%(AdditionalDependencies)
@@ -362,6 +396,7 @@
Console
false
false
+ d2d1.lib; d3d11.lib; dxgi.lib; ole32.lib; windowscodecs.lib; dwrite.lib; kernel32.lib;%(AdditionalDependencies)
@@ -375,6 +410,7 @@
Console
false
false
+ d2d1.lib; d3d11.lib; dxgi.lib; ole32.lib; windowscodecs.lib; dwrite.lib; kernel32.lib;%(AdditionalDependencies)
diff --git a/VisualC/SDLmain/SDLmain_VS2012_WinRT.vcxproj b/VisualC/SDLmain/SDLmain_VS2012_WinRT.vcxproj
deleted file mode 100644
index 200bbd478..000000000
--- a/VisualC/SDLmain/SDLmain_VS2012_WinRT.vcxproj
+++ /dev/null
@@ -1,199 +0,0 @@
-
-
-
-
- Debug
- ARM
-
-
- Debug
- Win32
-
-
- Debug
- x64
-
-
- Release
- ARM
-
-
- Release
- Win32
-
-
- Release
- x64
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {48666378-b527-43f5-8968-f867a6f8d2a3}
- Win32Proj
- SDLmain_VS2012_WinRT
- SDLmain_VS2012_WinRT
- en-US
- 11.0
- true
-
-
-
- StaticLibrary
- true
- v110
-
-
- StaticLibrary
- true
- v110
-
-
- StaticLibrary
- true
- v110
-
-
- StaticLibrary
- false
- true
- v110
-
-
- StaticLibrary
- false
- true
- v110
-
-
- StaticLibrary
- false
- true
- v110
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- false
-
-
- false
-
-
- false
-
-
- false
-
-
- false
-
-
- false
-
-
-
- NotUsing
- true
- true
-
-
- Console
- false
- false
-
-
-
-
- NotUsing
- true
- true
-
-
- Console
- false
- false
-
-
-
-
- Use
- false
- true
-
-
- Console
- false
- false
-
-
-
-
- Use
- false
- true
-
-
- Console
- false
- false
-
-
-
-
- Use
- false
- true
-
-
- Console
- false
- false
-
-
-
-
- Use
- false
- true
-
-
- Console
- false
- false
-
-
-
-
-
-
\ No newline at end of file
diff --git a/src/main/windowsrt/BasicTimer.h b/src/video/windowsrt/BasicTimer.h
similarity index 100%
rename from src/main/windowsrt/BasicTimer.h
rename to src/video/windowsrt/BasicTimer.h
diff --git a/src/main/windowsrt/CubeRenderer.cpp b/src/video/windowsrt/CubeRenderer.cpp
similarity index 100%
rename from src/main/windowsrt/CubeRenderer.cpp
rename to src/video/windowsrt/CubeRenderer.cpp
diff --git a/src/main/windowsrt/CubeRenderer.h b/src/video/windowsrt/CubeRenderer.h
similarity index 100%
rename from src/main/windowsrt/CubeRenderer.h
rename to src/video/windowsrt/CubeRenderer.h
diff --git a/src/main/windowsrt/Direct3DBase.cpp b/src/video/windowsrt/Direct3DBase.cpp
similarity index 100%
rename from src/main/windowsrt/Direct3DBase.cpp
rename to src/video/windowsrt/Direct3DBase.cpp
diff --git a/src/main/windowsrt/Direct3DBase.h b/src/video/windowsrt/Direct3DBase.h
similarity index 100%
rename from src/main/windowsrt/Direct3DBase.h
rename to src/video/windowsrt/Direct3DBase.h
diff --git a/src/main/windowsrt/DirectXHelper.h b/src/video/windowsrt/DirectXHelper.h
similarity index 100%
rename from src/main/windowsrt/DirectXHelper.h
rename to src/video/windowsrt/DirectXHelper.h
diff --git a/src/main/windowsrt/SDL_WinRTApp.cpp b/src/video/windowsrt/SDL_WinRTApp.cpp
similarity index 93%
rename from src/main/windowsrt/SDL_WinRTApp.cpp
rename to src/video/windowsrt/SDL_WinRTApp.cpp
index 970fac2ef..842c591ad 100644
--- a/src/main/windowsrt/SDL_WinRTApp.cpp
+++ b/src/video/windowsrt/SDL_WinRTApp.cpp
@@ -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)
@@ -140,7 +144,7 @@ IFrameworkView^ Direct3DApplicationSource::CreateView()
return ref new SDL_WinRTApp();
}
-int SDL_WinRT_RunApplication(/*Platform::Array^*/)
+__declspec(dllexport) int SDL_WinRT_RunApplication(/*Platform::Array^*/)
{
auto direct3DApplicationSource = ref new Direct3DApplicationSource();
CoreApplication::Run(direct3DApplicationSource);
diff --git a/src/main/windowsrt/SDL_WinRTApp.h b/src/video/windowsrt/SDL_WinRTApp.h
similarity index 100%
rename from src/main/windowsrt/SDL_WinRTApp.h
rename to src/video/windowsrt/SDL_WinRTApp.h
diff --git a/src/main/windowsrt/SDLmain_WinRT_common.h b/src/video/windowsrt/SDLmain_WinRT_common.h
similarity index 100%
rename from src/main/windowsrt/SDLmain_WinRT_common.h
rename to src/video/windowsrt/SDLmain_WinRT_common.h
diff --git a/src/main/windowsrt/SimplePixelShader.hlsl b/src/video/windowsrt/SimplePixelShader.hlsl
similarity index 100%
rename from src/main/windowsrt/SimplePixelShader.hlsl
rename to src/video/windowsrt/SimplePixelShader.hlsl
diff --git a/src/main/windowsrt/SimpleVertexShader.hlsl b/src/video/windowsrt/SimpleVertexShader.hlsl
similarity index 100%
rename from src/main/windowsrt/SimpleVertexShader.hlsl
rename to src/video/windowsrt/SimpleVertexShader.hlsl