Mercurial > love-experiments

changeset 1445:6975bf64c459

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Updated Visual Studio project files for image module changes (thanks Boolsheet)
author Alex Szpakowski <slime73@gmail.com>
date Sat, 13 Apr 2013 05:35:38 -0300
parents e952fc68069d
children 923a594c28d1 108ee2e81f65
files platform/msvc2010/liblove.vcxproj platform/msvc2010/liblove.vcxproj.filters platform/msvc2010/love.sln
diffstat 3 files changed, 90 insertions(+), 31 deletions(-) [+]
line wrap: on
line diff
--- a/platform/msvc2010/liblove.vcxproj	Fri Apr 12 15:40:53 2013 -0300
+++ b/platform/msvc2010/liblove.vcxproj	Sat Apr 13 05:35:38 2013 -0300
@@ -355,6 +355,7 @@
     <ClCompile Include="..\..\src\libraries\Box2D\Dynamics\Joints\b2WeldJoint.cpp" />
     <ClCompile Include="..\..\src\libraries\Box2D\Dynamics\Joints\b2WheelJoint.cpp" />
     <ClCompile Include="..\..\src\libraries\Box2D\Rope\b2Rope.cpp" />
+    <ClCompile Include="..\..\src\libraries\ddsparse\ddsparse.cpp" />
     <ClCompile Include="..\..\src\libraries\luasocket\libluasocket\auxiliar.c" />
     <ClCompile Include="..\..\src\libraries\luasocket\libluasocket\buffer.c" />
     <ClCompile Include="..\..\src\libraries\luasocket\libluasocket\except.c" />
@@ -421,9 +422,14 @@
     <ClCompile Include="..\..\src\modules\graphics\opengl\wrap_SpriteBatch.cpp" />
     <ClCompile Include="..\..\src\modules\graphics\Quad.cpp" />
     <ClCompile Include="..\..\src\modules\graphics\Volatile.cpp" />
-    <ClCompile Include="..\..\src\modules\image\devil\Image.cpp" />
-    <ClCompile Include="..\..\src\modules\image\devil\ImageData.cpp" />
+    <ClCompile Include="..\..\src\modules\image\CompressedData.cpp" />
     <ClCompile Include="..\..\src\modules\image\ImageData.cpp" />
+    <ClCompile Include="..\..\src\modules\image\magpie\CompressedData.cpp" />
+    <ClCompile Include="..\..\src\modules\image\magpie\ddsHandler.cpp" />
+    <ClCompile Include="..\..\src\modules\image\magpie\DevilHandler.cpp" />
+    <ClCompile Include="..\..\src\modules\image\magpie\Image.cpp" />
+    <ClCompile Include="..\..\src\modules\image\magpie\ImageData.cpp" />
+    <ClCompile Include="..\..\src\modules\image\wrap_CompressedData.cpp" />
     <ClCompile Include="..\..\src\modules\image\wrap_Image.cpp" />
     <ClCompile Include="..\..\src\modules\image\wrap_ImageData.cpp" />
     <ClCompile Include="..\..\src\modules\joystick\Joystick.cpp" />
@@ -581,6 +587,8 @@
     <ClInclude Include="..\..\src\libraries\Box2D\Dynamics\Joints\b2WeldJoint.h" />
     <ClInclude Include="..\..\src\libraries\Box2D\Dynamics\Joints\b2WheelJoint.h" />
     <ClInclude Include="..\..\src\libraries\Box2D\Rope\b2Rope.h" />
+    <ClInclude Include="..\..\src\libraries\ddsparse\ddsinfo.h" />
+    <ClInclude Include="..\..\src\libraries\ddsparse\ddsparse.h" />
     <ClInclude Include="..\..\src\libraries\luasocket\libluasocket\auxiliar.h" />
     <ClInclude Include="..\..\src\libraries\luasocket\libluasocket\buffer.h" />
     <ClInclude Include="..\..\src\libraries\luasocket\libluasocket\except.h" />
@@ -656,10 +664,16 @@
     <ClInclude Include="..\..\src\modules\graphics\opengl\wrap_SpriteBatch.h" />
     <ClInclude Include="..\..\src\modules\graphics\Quad.h" />
     <ClInclude Include="..\..\src\modules\graphics\Volatile.h" />
-    <ClInclude Include="..\..\src\modules\image\devil\Image.h" />
-    <ClInclude Include="..\..\src\modules\image\devil\ImageData.h" />
+    <ClInclude Include="..\..\src\modules\image\CompressedData.h" />
     <ClInclude Include="..\..\src\modules\image\Image.h" />
     <ClInclude Include="..\..\src\modules\image\ImageData.h" />
+    <ClInclude Include="..\..\src\modules\image\magpie\CompressedData.h" />
+    <ClInclude Include="..\..\src\modules\image\magpie\ddsHandler.h" />
+    <ClInclude Include="..\..\src\modules\image\magpie\DevilHandler.h" />
+    <ClInclude Include="..\..\src\modules\image\magpie\FormatHandler.h" />
+    <ClInclude Include="..\..\src\modules\image\magpie\Image.h" />
+    <ClInclude Include="..\..\src\modules\image\magpie\ImageData.h" />
+    <ClInclude Include="..\..\src\modules\image\wrap_CompressedData.h" />
     <ClInclude Include="..\..\src\modules\image\wrap_Image.h" />
     <ClInclude Include="..\..\src\modules\image\wrap_ImageData.h" />
     <ClInclude Include="..\..\src\modules\joystick\Joystick.h" />
--- a/platform/msvc2010/liblove.vcxproj.filters	Fri Apr 12 15:40:53 2013 -0300
+++ b/platform/msvc2010/liblove.vcxproj.filters	Sat Apr 13 05:35:38 2013 -0300
@@ -106,9 +106,6 @@
     <Filter Include="modules\graphics\opengl">
       <UniqueIdentifier>{72f85e75-dd35-4a93-9c39-258c8aee813b}</UniqueIdentifier>
     </Filter>
-    <Filter Include="modules\image\devil">
-      <UniqueIdentifier>{d39bd4fd-3bea-428a-813f-4b1c55aedac8}</UniqueIdentifier>
-    </Filter>
     <Filter Include="modules\joystick\sdl">
       <UniqueIdentifier>{806ac1d0-ed5c-47d5-8cdc-60e3fdbfe412}</UniqueIdentifier>
     </Filter>
@@ -139,6 +136,12 @@
     <Filter Include="modules\thread\sdl">
       <UniqueIdentifier>{5673936a-786e-40ee-96d2-1830e89c1532}</UniqueIdentifier>
     </Filter>
+    <Filter Include="libraries\ddsparse">
+      <UniqueIdentifier>{dd0ef317-7117-4ddc-b8ef-aaf58130c7bd}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="modules\image\magpie">
+      <UniqueIdentifier>{d39bd4fd-3bea-428a-813f-4b1c55aedac8}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\..\src\common\Matrix.cpp">
@@ -519,12 +522,6 @@
     <ClCompile Include="..\..\src\modules\image\wrap_ImageData.cpp">
       <Filter>modules\image</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\modules\image\devil\ImageData.cpp">
-      <Filter>modules\image\devil</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\modules\image\devil\Image.cpp">
-      <Filter>modules\image\devil</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\src\modules\joystick\Joystick.cpp">
       <Filter>modules\joystick</Filter>
     </ClCompile>
@@ -771,6 +768,30 @@
     <ClCompile Include="..\..\src\modules\math\MathModule.cpp">
       <Filter>modules\math</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\src\libraries\ddsparse\ddsparse.cpp">
+      <Filter>libraries\ddsparse</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\modules\image\magpie\DevilHandler.cpp">
+      <Filter>modules\image\magpie</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\modules\image\magpie\Image.cpp">
+      <Filter>modules\image\magpie</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\modules\image\magpie\ImageData.cpp">
+      <Filter>modules\image\magpie</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\modules\image\magpie\CompressedData.cpp">
+      <Filter>modules\image\magpie</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\modules\image\magpie\ddsHandler.cpp">
+      <Filter>modules\image\magpie</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\modules\image\CompressedData.cpp">
+      <Filter>modules\image</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\modules\image\wrap_CompressedData.cpp">
+      <Filter>modules\image</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <None Include="..\..\src\scripts\boot.lua">
@@ -1222,12 +1243,6 @@
     <ClInclude Include="..\..\src\modules\image\wrap_ImageData.h">
       <Filter>modules\image</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\modules\image\devil\Image.h">
-      <Filter>modules\image\devil</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\modules\image\devil\ImageData.h">
-      <Filter>modules\image\devil</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\src\modules\joystick\Joystick.h">
       <Filter>modules\joystick</Filter>
     </ClInclude>
@@ -1480,6 +1495,36 @@
     <ClInclude Include="..\..\src\modules\math\MathModule.h">
       <Filter>modules\math</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\src\libraries\ddsparse\ddsparse.h">
+      <Filter>libraries\ddsparse</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\libraries\ddsparse\ddsinfo.h">
+      <Filter>libraries\ddsparse</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\modules\image\magpie\ddsHandler.h">
+      <Filter>modules\image\magpie</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\modules\image\magpie\DevilHandler.h">
+      <Filter>modules\image\magpie</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\modules\image\magpie\FormatHandler.h">
+      <Filter>modules\image\magpie</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\modules\image\magpie\Image.h">
+      <Filter>modules\image\magpie</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\modules\image\magpie\ImageData.h">
+      <Filter>modules\image\magpie</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\modules\image\magpie\CompressedData.h">
+      <Filter>modules\image\magpie</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\modules\image\CompressedData.h">
+      <Filter>modules\image</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\modules\image\wrap_CompressedData.h">
+      <Filter>modules\image</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="love.rc" />
--- a/platform/msvc2010/love.sln	Fri Apr 12 15:40:53 2013 -0300
+++ b/platform/msvc2010/love.sln	Sat Apr 13 05:35:38 2013 -0300
@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 11.00
 # Visual C++ Express 2010
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "love", "love.vcxproj", "{B496CCF6-9B6D-0794-8F41-67A6EC86B4AA}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "love", "love.vcxproj", "{97F8C58F-0027-2D73-B322-44E7D618E5BE}"
 	ProjectSection(ProjectDependencies) = postProject
 		{A3FCC735-3E18-4D6B-9DA9-01D9E910B7F8} = {A3FCC735-3E18-4D6B-9DA9-01D9E910B7F8}
 	EndProjectSection
@@ -18,17 +18,17 @@
 		Release Static|x64 = Release Static|x64
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{B496CCF6-9B6D-0794-8F41-67A6EC86B4AA}.Debug Dynamic|Win32.ActiveCfg = Debug Dynamic|Win32
-		{B496CCF6-9B6D-0794-8F41-67A6EC86B4AA}.Debug Dynamic|Win32.Build.0 = Debug Dynamic|Win32
-		{B496CCF6-9B6D-0794-8F41-67A6EC86B4AA}.Debug Dynamic|x64.ActiveCfg = Debug Dynamic|x64
-		{B496CCF6-9B6D-0794-8F41-67A6EC86B4AA}.Release Dynamic|Win32.ActiveCfg = Release Dynamic|Win32
-		{B496CCF6-9B6D-0794-8F41-67A6EC86B4AA}.Release Dynamic|Win32.Build.0 = Release Dynamic|Win32
-		{B496CCF6-9B6D-0794-8F41-67A6EC86B4AA}.Release Dynamic|x64.ActiveCfg = Release Dynamic|x64
-		{B496CCF6-9B6D-0794-8F41-67A6EC86B4AA}.Release Dynamic|x64.Build.0 = Release Dynamic|x64
-		{B496CCF6-9B6D-0794-8F41-67A6EC86B4AA}.Release Static|Win32.ActiveCfg = Release Static|Win32
-		{B496CCF6-9B6D-0794-8F41-67A6EC86B4AA}.Release Static|Win32.Build.0 = Release Static|Win32
-		{B496CCF6-9B6D-0794-8F41-67A6EC86B4AA}.Release Static|x64.ActiveCfg = Release Static|x64
-		{B496CCF6-9B6D-0794-8F41-67A6EC86B4AA}.Release Static|x64.Build.0 = Release Static|x64
+		{97F8C58F-0027-2D73-B322-44E7D618E5BE}.Debug Dynamic|Win32.ActiveCfg = Debug Dynamic|Win32
+		{97F8C58F-0027-2D73-B322-44E7D618E5BE}.Debug Dynamic|Win32.Build.0 = Debug Dynamic|Win32
+		{97F8C58F-0027-2D73-B322-44E7D618E5BE}.Debug Dynamic|x64.ActiveCfg = Debug Dynamic|x64
+		{97F8C58F-0027-2D73-B322-44E7D618E5BE}.Release Dynamic|Win32.ActiveCfg = Release Dynamic|Win32
+		{97F8C58F-0027-2D73-B322-44E7D618E5BE}.Release Dynamic|Win32.Build.0 = Release Dynamic|Win32
+		{97F8C58F-0027-2D73-B322-44E7D618E5BE}.Release Dynamic|x64.ActiveCfg = Release Dynamic|x64
+		{97F8C58F-0027-2D73-B322-44E7D618E5BE}.Release Dynamic|x64.Build.0 = Release Dynamic|x64
+		{97F8C58F-0027-2D73-B322-44E7D618E5BE}.Release Static|Win32.ActiveCfg = Release Static|Win32
+		{97F8C58F-0027-2D73-B322-44E7D618E5BE}.Release Static|Win32.Build.0 = Release Static|Win32
+		{97F8C58F-0027-2D73-B322-44E7D618E5BE}.Release Static|x64.ActiveCfg = Release Static|x64
+		{97F8C58F-0027-2D73-B322-44E7D618E5BE}.Release Static|x64.Build.0 = Release Static|x64
 		{A3FCC735-3E18-4D6B-9DA9-01D9E910B7F8}.Debug Dynamic|Win32.ActiveCfg = Debug Dynamic|Win32
 		{A3FCC735-3E18-4D6B-9DA9-01D9E910B7F8}.Debug Dynamic|Win32.Build.0 = Debug Dynamic|Win32
 		{A3FCC735-3E18-4D6B-9DA9-01D9E910B7F8}.Debug Dynamic|x64.ActiveCfg = Debug Dynamic|x64