project: Update for 2.0.2 merge.

ShiftMediaProject · Sep 27, 2016 · bad7423 · bad7423
1 parent 70a047d
commit bad7423
Show file tree

Hide file tree

Showing 2 changed files with 53 additions and 0 deletions.
diff --git a/SMP/libsdl.vcxproj b/SMP/libsdl.vcxproj
@@ -54,6 +54,7 @@
     <ClInclude Include="..\include\SDL_config_windows.h" />
     <ClInclude Include="..\include\SDL_copying.h" />
     <ClInclude Include="..\include\SDL_cpuinfo.h" />
+    <ClInclude Include="..\include\SDL_egl.h" />
     <ClInclude Include="..\include\SDL_endian.h" />
     <ClInclude Include="..\include\SDL_error.h" />
     <ClInclude Include="..\include\SDL_events.h" />
@@ -94,6 +95,9 @@
     <ClInclude Include="..\include\SDL_video.h" />
     <ClInclude Include="..\include\SDL_gamecontroller.h" />
     <ClInclude Include="..\src\core\windows\SDL_windows.h" />
+    <ClInclude Include="..\src\dynapi\SDL_dynapi.h" />
+    <ClInclude Include="..\src\dynapi\SDL_dynapi_overrides.h" />
+    <ClInclude Include="..\src\dynapi\SDL_dynapi_procs.h" />
     <ClInclude Include="..\src\events\blank_cursor.h" />
     <ClInclude Include="..\src\events\default_cursor.h" />
     <ClInclude Include="..\src\audio\directsound\directx.h" />
@@ -126,6 +130,7 @@
     <ClInclude Include="..\src\video\SDL_blit_auto.h" />
     <ClInclude Include="..\src\video\SDL_blit_copy.h" />
     <ClInclude Include="..\src\video\SDL_blit_slow.h" />
+    <ClInclude Include="..\src\video\SDL_egl_c.h" />
     <ClInclude Include="..\src\video\SDL_shape_internals.h" />
     <ClInclude Include="..\src\audio\winmm\SDL_winmm.h" />
     <ClInclude Include="..\src\audio\disk\SDL_diskaudio.h" />
@@ -160,6 +165,7 @@
     <ClInclude Include="..\src\video\windows\SDL_windowsmodes.h" />
     <ClInclude Include="..\src\video\windows\SDL_windowsmouse.h" />
     <ClInclude Include="..\src\video\windows\SDL_windowsopengl.h" />
+    <ClInclude Include="..\src\video\windows\SDL_windowsopengles.h" />
     <ClInclude Include="..\src\video\windows\SDL_windowsshape.h" />
     <ClInclude Include="..\src\video\windows\SDL_windowsvideo.h" />
     <ClInclude Include="..\src\video\windows\SDL_windowswindow.h" />
@@ -168,6 +174,7 @@
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\src\core\windows\SDL_windows.c" />
+    <ClCompile Include="..\src\dynapi\SDL_dynapi.c" />
     <ClCompile Include="..\src\events\SDL_clipboardevents.c" />
     <ClCompile Include="..\src\events\SDL_gesture.c" />
     <ClCompile Include="..\src\events\SDL_touch.c" />
@@ -188,6 +195,8 @@
     <ClCompile Include="..\src\libm\s_scalbn.c" />
     <ClCompile Include="..\src\libm\s_sin.c" />
     <ClCompile Include="..\src\render\direct3d\SDL_render_d3d.c" />
+    <ClCompile Include="..\src\render\opengles2\SDL_render_gles2.c" />
+    <ClCompile Include="..\src\render\opengles2\SDL_shaders_gles2.c" />
     <ClCompile Include="..\src\render\opengl\SDL_render_gl.c" />
     <ClCompile Include="..\src\render\opengl\SDL_shaders_gl.c" />
     <ClCompile Include="..\src\render\SDL_render.c" />
@@ -222,6 +231,7 @@
     <ClCompile Include="..\src\video\SDL_bmp.c" />
     <ClCompile Include="..\src\cpuinfo\SDL_cpuinfo.c" />
     <ClCompile Include="..\src\video\SDL_clipboard.c" />
+    <ClCompile Include="..\src\video\SDL_egl.c" />
     <ClCompile Include="..\src\video\SDL_shape.c" />
     <ClCompile Include="..\src\audio\winmm\SDL_winmm.c" />
     <ClCompile Include="..\src\audio\disk\SDL_diskaudio.c" />
@@ -276,6 +286,7 @@
     <ClCompile Include="..\src\video\windows\SDL_windowsmodes.c" />
     <ClCompile Include="..\src\video\windows\SDL_windowsmouse.c" />
     <ClCompile Include="..\src\video\windows\SDL_windowsopengl.c" />
+    <ClCompile Include="..\src\video\windows\SDL_windowsopengles.c" />
     <ClCompile Include="..\src\video\windows\SDL_windowsshape.c" />
     <ClCompile Include="..\src\video\windows\SDL_windowsvideo.c" />
     <ClCompile Include="..\src\video\windows\SDL_windowswindow.c" />

diff --git a/SMP/libsdl.vcxproj.filters b/SMP/libsdl.vcxproj.filters
@@ -184,6 +184,15 @@
     <Filter Include="Source Files\filesystem\windows">
       <UniqueIdentifier>{124d93fa-71ff-4287-b22f-d24fa99b8168}</UniqueIdentifier>
     </Filter>
+    <Filter Include="Source Files\dynapi">
+      <UniqueIdentifier>{493a60e4-bedc-4bf1-abad-aaee8ffa2220}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Header Files\src\dynapi">
+      <UniqueIdentifier>{7b2fe885-4098-4cca-9cd6-cfd27cfe83a2}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\render\opengles2">
+      <UniqueIdentifier>{316512b1-458e-4880-b915-36dad8cf3f54}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\include\SDL_audio.h">
@@ -552,6 +561,24 @@
     <ClInclude Include="..\include\SDL_filesystem.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="..\src\dynapi\SDL_dynapi.h">
+      <Filter>Header Files\src\dynapi</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\dynapi\SDL_dynapi_overrides.h">
+      <Filter>Header Files\src\dynapi</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\dynapi\SDL_dynapi_procs.h">
+      <Filter>Header Files\src\dynapi</Filter>
+    </ClInclude>
+    <ClInclude Include="..\include\SDL_egl.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\video\SDL_egl_c.h">
+      <Filter>Header Files\src\video</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\video\windows\SDL_windowsopengles.h">
+      <Filter>Header Files\src\video\windows</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\src\libm\e_log.c">
@@ -896,6 +923,21 @@
     <ClCompile Include="..\src\filesystem\windows\SDL_sysfilesystem.c">
       <Filter>Source Files\filesystem\windows</Filter>
     </ClCompile>
+    <ClCompile Include="..\src\dynapi\SDL_dynapi.c">
+      <Filter>Source Files\dynapi</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\video\windows\SDL_windowsopengles.c">
+      <Filter>Source Files\video\windows</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\video\SDL_egl.c">
+      <Filter>Source Files\video</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\render\opengles2\SDL_shaders_gles2.c">
+      <Filter>Source Files\render\opengles2</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\render\opengles2\SDL_render_gles2.c">
+      <Filter>Source Files\render\opengles2</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="..\src\main\windows\version.rc">