Vantha/0ad
1
0
Fork 0
forked from 0ad/0ad
Code Pull Requests Activity

fixes for the relocated res/file/archive stuff (adjust include paths)

Browse Source 
also moved vfs_optimizer into archive directory

This was SVN commit r5389.
This commit is contained in:
janwas 2007-10-06 07:45:15 +00:00
parent 62568fda28
commit ee0c58dbc2
10 changed files with 15 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
source/graphics/tests/test_MeshManager.h
View File

@ -1,9 +1,9 @@
#include "lib/self_test.h"
#include "lib/res/file/vfs.h"
#include "lib/res/file/vfs_optimizer.h"
#include "lib/res/file/archive/vfs_optimizer.h"
#include "lib/res/file/path.h"
#include "lib/res/file/trace.h"
#include "lib/res/file/archive/trace.h"
#include "lib/res/h_mgr.h"
#include "graphics/ColladaManager.h"

2
source/lib/res/file/vfs_optimizer.cpp → source/lib/res/file/archive/vfs_optimizer.cpp
View File

@ -17,7 +17,7 @@
#include <algorithm>
#include <ctime>
#include "file_internal.h"
#include "../file_internal.h"
// enough for 64K unique files - ought to suffice.
typedef u16 FileId;

0
source/lib/res/file/vfs_optimizer.h → source/lib/res/file/archive/vfs_optimizer.h
View File

13
source/lib/res/file/file_internal.h
View File

@ -17,19 +17,18 @@
#include "file_stats.h" // must come after file and file_cache
#include "compression.h"
#include "zip.h"
#include "archive.h"
#include "archive_builder.h"
#include "archive/compression.h"
#include "archive/zip.h"
#include "archive/archive.h"
#include "archive/archive_builder.h"
#include "archive/trace.h"
#include "archive/vfs_optimizer.h"
#include "vfs.h"
#include "vfs_mount.h"
#include "vfs_tree.h"
#include "vfs_redirector.h"
#include "trace.h"
#include "vfs_optimizer.h"
const size_t AIO_SECTOR_SIZE = 512;
// block := power-of-two sized chunk of a file.

2
source/lib/res/file/vfs_mount.h
View File

@ -16,7 +16,7 @@ struct Mount; // must come before vfs_tree.h
#include "lib/res/handle.h"
#include "file.h"
#include "zip.h"
#include "archive/zip.h"
#include "vfs_tree.h"

2
source/main.cpp
View File

@ -18,7 +18,7 @@ that of Atlas depending on commandline parameters.
#include "lib/external_libraries/sdl.h"
#include "lib/res/file/vfs.h"
#include "lib/res/sound/snd_mgr.h"
#include "lib/res/file/vfs_optimizer.h"
#include "lib/res/file/archive/vfs_optimizer.h"
#include "ps/GameSetup/GameSetup.h"
#include "ps/GameSetup/Atlas.h"

4
source/ps/GameSetup/Config.cpp
View File

@ -6,9 +6,9 @@
#include "ps/GameSetup/CmdLineArgs.h"
#include "lib/timer.h"
#include "lib/res/sound/snd_mgr.h"
#include "lib/res/file/trace.h"
#include "lib/res/file/archive/trace.h"
#include "lib/res/file/vfs.h"
#include "lib/res/file/vfs_optimizer.h"
#include "lib/res/file/archive/vfs_optimizer.h"
#include "Config.h"
#define LOG_CATEGORY "config"

2
source/ps/GameSetup/GameSetup.cpp
View File

@ -9,7 +9,7 @@
#include "lib/sysdep/cpu.h"
#include "lib/sysdep/gfx.h"
#include "lib/res/res.h"
#include "lib/res/file/trace.h"
#include "lib/res/file/archive/trace.h"
#include "lib/res/sound/snd_mgr.h"
#include "lib/res/graphics/tex.h"
#include "lib/res/graphics/cursor.h"

1
source/ps/XML/tests/test_Xeromyces.h
View File

@ -3,7 +3,6 @@
#include "ps/XML/Xeromyces.h"
#include "lib/res/file/vfs.h"
#include "lib/res/file/path.h"
#include "lib/res/file/trace.h"
#include "lib/res/h_mgr.h"
class TestXeromyces : public CxxTest::TestSuite

2
source/ps/scripting/JSInterface_VFS.cpp
View File

@ -5,7 +5,7 @@
#include "ps/CStr.h"
#include "ps/VFSUtil.h"
#include "lib/res/res.h"
#include "lib/res/file/vfs_optimizer.h" // ArchiveBuilderCancel
#include "lib/res/file/archive/vfs_optimizer.h" // ArchiveBuilderCancel
#include "lib/res/file/vfs_mount.h" // TNODE_NOT_FOUND
#include "scripting/ScriptingHost.h"
#include "scripting/JSConversions.h"