restructure project to reduce number of directories

kyuu · Nov 26, 2011 · 168154d · 168154d
1 parent fb00136
commit 168154d
Show file tree

Hide file tree

Showing 29 changed files with 687 additions and 691 deletions.
diff --git a/projects/vs/.gitignore b/projects/vs/.gitignore
@@ -3,7 +3,6 @@
 *.suo
 *.user
 *.opensdf
-*.filters
 Release/*
 Debug/*
 */Release/*

diff --git a/projects/vs/engine/engine.vcxproj b/projects/vs/engine/engine.vcxproj
@@ -11,26 +11,26 @@
     </ProjectConfiguration>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="..\..\..\src\audio\audiere\audio.cpp" />
-    <ClCompile Include="..\..\..\src\audio\audiere\Sound.cpp" />
-    <ClCompile Include="..\..\..\src\audio\audiere\SoundEffect.cpp" />
-    <ClCompile Include="..\..\..\src\compression\ZStream.cpp" />
     <ClCompile Include="..\..\..\src\error.cpp" />
-    <ClCompile Include="..\..\..\src\filesystem\boost\filesystem.cpp" />
-    <ClCompile Include="..\..\..\src\filesystem\File.cpp" />
     <ClCompile Include="..\..\..\src\graphics\Canvas.cpp" />
-    <ClCompile Include="..\..\..\src\image\corona\image.cpp" />
+    <ClCompile Include="..\..\..\src\graphics\corona\image.cpp" />
+    <ClCompile Include="..\..\..\src\graphics\sdl_opengl\Texture.cpp" />
+    <ClCompile Include="..\..\..\src\graphics\sdl_opengl\video.cpp" />
     <ClCompile Include="..\..\..\src\IniFile.cpp" />
     <ClCompile Include="..\..\..\src\input\sdl\input.cpp" />
     <ClCompile Include="..\..\..\src\io\Blob.cpp" />
+    <ClCompile Include="..\..\..\src\io\boost\filesystem.cpp" />
+    <ClCompile Include="..\..\..\src\io\data.cpp" />
     <ClCompile Include="..\..\..\src\io\endian.cpp" />
-    <ClCompile Include="..\..\..\src\io\io.cpp" />
+    <ClCompile Include="..\..\..\src\io\File.cpp" />
     <ClCompile Include="..\..\..\src\Log.cpp" />
     <ClCompile Include="..\..\..\src\main.cpp" />
     <ClCompile Include="..\..\..\src\script\script.cpp" />
+    <ClCompile Include="..\..\..\src\sound\audiere\audio.cpp" />
+    <ClCompile Include="..\..\..\src\sound\audiere\Sound.cpp" />
+    <ClCompile Include="..\..\..\src\sound\audiere\SoundEffect.cpp" />
     <ClCompile Include="..\..\..\src\system\win32\system.cpp" />
-    <ClCompile Include="..\..\..\src\video\sdl_opengl\Texture.cpp" />
-    <ClCompile Include="..\..\..\src\video\sdl_opengl\video.cpp" />
+    <ClCompile Include="..\..\..\src\util\ZStream.cpp" />
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="..\test.rc" />

diff --git a/projects/vs/engine/engine.vcxproj.filters b/projects/vs/engine/engine.vcxproj.filters
@@ -0,0 +1,83 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <ClCompile Include="..\..\..\src\IniFile.cpp" />
+    <ClCompile Include="..\..\..\src\Log.cpp" />
+    <ClCompile Include="..\..\..\src\main.cpp" />
+    <ClCompile Include="..\..\..\src\sound\audiere\audio.cpp">
+      <Filter>sound</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\src\io\Blob.cpp">
+      <Filter>io</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\src\error.cpp" />
+    <ClCompile Include="..\..\..\src\graphics\Canvas.cpp">
+      <Filter>graphics</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\src\io\data.cpp">
+      <Filter>io</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\src\io\File.cpp">
+      <Filter>io</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\src\graphics\corona\image.cpp">
+      <Filter>graphics</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\src\input\sdl\input.cpp">
+      <Filter>input</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\src\io\boost\filesystem.cpp">
+      <Filter>io</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\src\sound\audiere\Sound.cpp">
+      <Filter>sound</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\src\sound\audiere\SoundEffect.cpp">
+      <Filter>sound</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\src\system\win32\system.cpp">
+      <Filter>system</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\src\io\endian.cpp">
+      <Filter>io</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\src\script\script.cpp">
+      <Filter>script</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\src\util\ZStream.cpp">
+      <Filter>util</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\src\graphics\sdl_opengl\Texture.cpp">
+      <Filter>graphics</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\src\graphics\sdl_opengl\video.cpp">
+      <Filter>graphics</Filter>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="..\test.rc" />
+  </ItemGroup>
+  <ItemGroup>
+    <Filter Include="system">
+      <UniqueIdentifier>{3a4cae03-f45b-4ea2-80e4-5b5758452450}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="sound">
+      <UniqueIdentifier>{6b003bb2-697f-48ac-b21e-e8df78d31c69}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="graphics">
+      <UniqueIdentifier>{ef8ced1d-0c53-4f75-930a-443192126360}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="io">
+      <UniqueIdentifier>{8643e61f-a487-463a-9fde-d3f54fc1bcf4}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="util">
+      <UniqueIdentifier>{c6a3113e-2674-4b0d-8b83-5c442eba0bd6}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="input">
+      <UniqueIdentifier>{b236274d-ca70-42b4-9a61-c7d6e703e6e7}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="script">
+      <UniqueIdentifier>{c4ac175d-c8a2-4b8f-81aa-b6a3fb2e2e49}</UniqueIdentifier>
+    </Filter>
+  </ItemGroup>
+</Project>
diff --git a/src/video/ITexture.hpp → src/graphics/ITexture.hpp b/src/video/ITexture.hpp → src/graphics/ITexture.hpp
diff --git a/src/image/corona/image.cpp → src/graphics/corona/image.cpp b/src/image/corona/image.cpp → src/graphics/corona/image.cpp
diff --git a/src/image/image.hpp → src/graphics/image.hpp b/src/image/image.hpp → src/graphics/image.hpp
diff --git a/src/video/sdl_opengl/Texture.cpp → src/graphics/sdl_opengl/Texture.cpp b/src/video/sdl_opengl/Texture.cpp → src/graphics/sdl_opengl/Texture.cpp
diff --git a/src/video/sdl_opengl/Texture.hpp → src/graphics/sdl_opengl/Texture.hpp b/src/video/sdl_opengl/Texture.hpp → src/graphics/sdl_opengl/Texture.hpp
diff --git a/src/video/sdl_opengl/video.cpp → src/graphics/sdl_opengl/video.cpp b/src/video/sdl_opengl/video.cpp → src/graphics/sdl_opengl/video.cpp
diff --git a/src/video/video.hpp → src/graphics/video.hpp b/src/video/video.hpp → src/graphics/video.hpp
diff --git a/src/filesystem/File.cpp → src/io/File.cpp b/src/filesystem/File.cpp → src/io/File.cpp
diff --git a/src/filesystem/File.hpp → src/io/File.hpp b/src/filesystem/File.hpp → src/io/File.hpp
diff --git a/src/filesystem/boost/filesystem.cpp → src/io/boost/filesystem.cpp b/src/filesystem/boost/filesystem.cpp → src/io/boost/filesystem.cpp
diff --git a/src/io/io.cpp → src/io/data.cpp b/src/io/io.cpp → src/io/data.cpp
@@ -2,7 +2,7 @@
 #include <cassert>
 #include "../common/platform.hpp"
 #include "endian.hpp"
-#include "io.hpp"
+#include "data.hpp"
 
 
 //-----------------------------------------------------------------

diff --git a/src/io/io.hpp → src/io/data.hpp b/src/io/io.hpp → src/io/data.hpp
@@ -1,5 +1,5 @@
-#ifndef IO_HPP
-#define IO_HPP
+#ifndef DATA_HPP
+#define DATA_HPP
 
 #include "../common/types.hpp"
 #include "IStream.hpp"

diff --git a/src/filesystem/filesystem.hpp → src/io/filesystem.hpp b/src/filesystem/filesystem.hpp → src/io/filesystem.hpp
diff --git a/src/main.cpp b/src/main.cpp
@@ -5,10 +5,10 @@
 #include "version.hpp"
 #include "Log.hpp"
 #include "Config.hpp"
-#include "filesystem/filesystem.hpp"
 #include "system/system.hpp"
-#include "video/video.hpp"
-#include "audio/audio.hpp"
+#include "io/filesystem.hpp"
+#include "graphics/video.hpp"
+#include "sound/audio.hpp"
 #include "input/input.hpp"
 #include "script/script.hpp"