diff --git a/sound/filters/input_filter.h b/sound/filters/input_filter.hpp similarity index 98% rename from sound/filters/input_filter.h rename to sound/filters/input_filter.hpp index 2b4486b75..267858de1 100644 --- a/sound/filters/input_filter.h +++ b/sound/filters/input_filter.hpp @@ -1,7 +1,7 @@ #ifndef MANGLE_INPUT_FILTER_H #define MANGLE_INPUT_FILTER_H -#include "../output.h" +#include "../output.hpp" #include diff --git a/sound/filters/openal_audiere.h b/sound/filters/openal_audiere.hpp similarity index 81% rename from sound/filters/openal_audiere.h rename to sound/filters/openal_audiere.hpp index a1b2e6b64..5b62bd11b 100644 --- a/sound/filters/openal_audiere.h +++ b/sound/filters/openal_audiere.hpp @@ -1,9 +1,9 @@ #ifndef MANGLE_FFMPEG_OPENAL_H #define MANGLE_FFMPEG_OPENAL_H -#include "input_filter.h" -#include "../sources/audiere_source.h" -#include "../outputs/openal_out.h" +#include "input_filter.hpp" +#include "../sources/audiere_source.hpp" +#include "../outputs/openal_out.hpp" namespace Mangle { namespace Sound { diff --git a/sound/output.h b/sound/output.hpp similarity index 98% rename from sound/output.h rename to sound/output.hpp index 6bcd93237..2ead277bc 100644 --- a/sound/output.h +++ b/sound/output.hpp @@ -2,9 +2,9 @@ #define MANGLE_SOUND_OUTPUT_H #include -#include "source.h" +#include "source.hpp" -#include "../stream/stream.h" +#include "../stream/stream.hpp" namespace Mangle { namespace Sound { diff --git a/sound/outputs/openal_out.cpp b/sound/outputs/openal_out.cpp index f0298feb2..81e222362 100644 --- a/sound/outputs/openal_out.cpp +++ b/sound/outputs/openal_out.cpp @@ -1,8 +1,8 @@ -#include "openal_out.h" +#include "openal_out.hpp" #include -#include "../../stream/filters/buffer_stream.h" -#include "../../tools/str_exception.h" +#include "../../stream/filters/buffer_stream.hpp" +#include "../../tools/str_exception.hpp" using namespace Mangle::Sound; diff --git a/sound/outputs/openal_out.h b/sound/outputs/openal_out.hpp similarity index 98% rename from sound/outputs/openal_out.h rename to sound/outputs/openal_out.hpp index 2ec593665..18f32f2a9 100644 --- a/sound/outputs/openal_out.h +++ b/sound/outputs/openal_out.hpp @@ -1,7 +1,7 @@ #ifndef MANGLE_SOUND_OPENAL_OUT_H #define MANGLE_SOUND_OPENAL_OUT_H -#include "../output.h" +#include "../output.hpp" #include #include diff --git a/sound/source.h b/sound/source.hpp similarity index 97% rename from sound/source.h rename to sound/source.hpp index d5468b518..1eb42a283 100644 --- a/sound/source.h +++ b/sound/source.hpp @@ -5,7 +5,7 @@ #include #include -#include "../stream/stream.h" +#include "../stream/stream.hpp" namespace Mangle { namespace Sound { diff --git a/sound/sources/audiere_source.cpp b/sound/sources/audiere_source.cpp index 6a0776402..6fde40c07 100644 --- a/sound/sources/audiere_source.cpp +++ b/sound/sources/audiere_source.cpp @@ -1,7 +1,7 @@ -#include "audiere_source.h" +#include "audiere_source.hpp" -#include "../../stream/clients/audiere_file.h" -#include "../../tools/str_exception.h" +#include "../../stream/clients/audiere_file.hpp" +#include "../../tools/str_exception.hpp" using namespace Mangle::Stream; diff --git a/sound/sources/audiere_source.h b/sound/sources/audiere_source.hpp similarity index 96% rename from sound/sources/audiere_source.h rename to sound/sources/audiere_source.hpp index e2d09d006..476546af3 100644 --- a/sound/sources/audiere_source.h +++ b/sound/sources/audiere_source.hpp @@ -1,7 +1,7 @@ #ifndef MANGLE_SOUND_AUDIERE_SOURCE_H #define MANGLE_SOUND_AUDIERE_SOURCE_H -#include "../source.h" +#include "../source.hpp" #include @@ -46,7 +46,7 @@ class AudiereSource : public SampleSource size_t size() const { return sample->getLength()*frameSize; } }; -#include "loadertemplate.h" +#include "loadertemplate.hpp" /// A factory that loads AudiereSources from file and stream typedef SSL_Template AudiereLoader; diff --git a/sound/sources/ffmpeg_source.cpp b/sound/sources/ffmpeg_source.cpp index 5724689de..bfb428234 100644 --- a/sound/sources/ffmpeg_source.cpp +++ b/sound/sources/ffmpeg_source.cpp @@ -1,6 +1,6 @@ -#include "ffmpeg_source.h" +#include "ffmpeg_source.hpp" -#include "../../tools/str_exception.h" +#include "../../tools/str_exception.hpp" using namespace Mangle::Sound; diff --git a/sound/sources/ffmpeg_source.h b/sound/sources/ffmpeg_source.hpp similarity index 94% rename from sound/sources/ffmpeg_source.h rename to sound/sources/ffmpeg_source.hpp index 2b33a3222..f0b5342ac 100644 --- a/sound/sources/ffmpeg_source.h +++ b/sound/sources/ffmpeg_source.hpp @@ -1,7 +1,7 @@ #ifndef MANGLE_SOUND_FFMPEG_H #define MANGLE_SOUND_FFMPEG_H -#include "../source.h" +#include "../source.hpp" #include #include @@ -36,7 +36,7 @@ class FFMpegSource : public SampleSource size_t read(void *data, size_t length); }; -#include "loadertemplate.h" +#include "loadertemplate.hpp" /// A factory that loads FFMpegSources from file class FFMpegLoader : public SSL_Template diff --git a/sound/sources/loadertemplate.h b/sound/sources/loadertemplate.hpp similarity index 100% rename from sound/sources/loadertemplate.h rename to sound/sources/loadertemplate.hpp diff --git a/sound/sources/stream_source.h b/sound/sources/stream_source.hpp similarity index 98% rename from sound/sources/stream_source.h rename to sound/sources/stream_source.hpp index 42791ccdf..e4863545e 100644 --- a/sound/sources/stream_source.h +++ b/sound/sources/stream_source.hpp @@ -1,7 +1,7 @@ #ifndef MANGLE_SOUND_STREAMSOURCE_H #define MANGLE_SOUND_STREAMSOURCE_H -#include "../source.h" +#include "../source.hpp" namespace Mangle { namespace Sound { diff --git a/sound/tests/audiere_source_test.cpp b/sound/tests/audiere_source_test.cpp index 1631e89cb..637d743b2 100644 --- a/sound/tests/audiere_source_test.cpp +++ b/sound/tests/audiere_source_test.cpp @@ -1,7 +1,7 @@ #include -#include "../../stream/servers/file_stream.h" -#include "../sources/audiere_source.h" +#include "../../stream/servers/file_stream.hpp" +#include "../sources/audiere_source.hpp" #include #include diff --git a/sound/tests/ffmpeg_source_test.cpp b/sound/tests/ffmpeg_source_test.cpp index 294565fb1..f03b15b99 100644 --- a/sound/tests/ffmpeg_source_test.cpp +++ b/sound/tests/ffmpeg_source_test.cpp @@ -1,7 +1,7 @@ #include -#include "../../stream/servers/file_stream.h" -#include "../sources/ffmpeg_source.h" +#include "../../stream/servers/file_stream.hpp" +#include "../sources/ffmpeg_source.hpp" #include #include diff --git a/sound/tests/openal_audiere_test.cpp b/sound/tests/openal_audiere_test.cpp index 9c49356a2..ced7fe5d2 100644 --- a/sound/tests/openal_audiere_test.cpp +++ b/sound/tests/openal_audiere_test.cpp @@ -1,8 +1,8 @@ #include #include -#include "../../stream/servers/file_stream.h" -#include "../filters/openal_audiere.h" +#include "../../stream/servers/file_stream.hpp" +#include "../filters/openal_audiere.hpp" using namespace std; using namespace Mangle::Stream; diff --git a/sound/tests/openal_output_test.cpp b/sound/tests/openal_output_test.cpp index 11b2fc42e..bc781c1a4 100644 --- a/sound/tests/openal_output_test.cpp +++ b/sound/tests/openal_output_test.cpp @@ -1,9 +1,9 @@ #include #include -#include "../../stream/servers/file_stream.h" -#include "../sources/stream_source.h" -#include "../outputs/openal_out.h" +#include "../../stream/servers/file_stream.hpp" +#include "../sources/stream_source.hpp" +#include "../outputs/openal_out.hpp" using namespace std; using namespace Mangle::Stream; diff --git a/stream/clients/audiere_file.cpp b/stream/clients/audiere_file.cpp index 53638781e..1d8e5b706 100644 --- a/stream/clients/audiere_file.cpp +++ b/stream/clients/audiere_file.cpp @@ -1,4 +1,4 @@ -#include "audiere_file.h" +#include "audiere_file.hpp" using namespace audiere; using namespace Mangle::Stream; diff --git a/stream/clients/audiere_file.h b/stream/clients/audiere_file.hpp similarity index 97% rename from stream/clients/audiere_file.h rename to stream/clients/audiere_file.hpp index 670b36ffa..691525ad9 100644 --- a/stream/clients/audiere_file.h +++ b/stream/clients/audiere_file.hpp @@ -4,7 +4,7 @@ #include #include -#include "../stream.h" +#include "../stream.hpp" namespace Mangle { namespace Stream { diff --git a/stream/clients/ogre_datastream.h b/stream/clients/ogre_datastream.hpp similarity index 98% rename from stream/clients/ogre_datastream.h rename to stream/clients/ogre_datastream.hpp index 5369ed11a..80c37fee7 100644 --- a/stream/clients/ogre_datastream.h +++ b/stream/clients/ogre_datastream.hpp @@ -3,7 +3,7 @@ #include #include -#include "../stream.h" +#include "../stream.hpp" namespace Mangle { namespace Stream { diff --git a/stream/filters/buffer_stream.h b/stream/filters/buffer_stream.hpp similarity index 97% rename from stream/filters/buffer_stream.h rename to stream/filters/buffer_stream.hpp index d1af09a8c..0d22798d0 100644 --- a/stream/filters/buffer_stream.h +++ b/stream/filters/buffer_stream.hpp @@ -1,7 +1,7 @@ #ifndef MANGLE_STREAM_BUFFER_H #define MANGLE_STREAM_BUFFER_H -#include "../servers/memory_stream.h" +#include "../servers/memory_stream.hpp" #include namespace Mangle { diff --git a/stream/filters/pure_filter.h b/stream/filters/pure_filter.hpp similarity index 97% rename from stream/filters/pure_filter.h rename to stream/filters/pure_filter.hpp index 4ce679d48..e4ae24375 100644 --- a/stream/filters/pure_filter.h +++ b/stream/filters/pure_filter.hpp @@ -1,7 +1,7 @@ #ifndef MANGLE_STREAM_FILTER_H #define MANGLE_STREAM_FILTER_H -#include "../stream.h" +#include "../stream.hpp" namespace Mangle { namespace Stream { diff --git a/stream/filters/slice_stream.h b/stream/filters/slice_stream.hpp similarity index 98% rename from stream/filters/slice_stream.h rename to stream/filters/slice_stream.hpp index ade0df52b..49f241cfc 100644 --- a/stream/filters/slice_stream.h +++ b/stream/filters/slice_stream.hpp @@ -1,7 +1,7 @@ #ifndef MANGLE_STREAM_SLICE_H #define MANGLE_STREAM_SLICE_H -#include "../stream.h" +#include "../stream.hpp" namespace Mangle { namespace Stream { diff --git a/stream/servers/file_stream.h b/stream/servers/file_stream.hpp similarity index 95% rename from stream/servers/file_stream.h rename to stream/servers/file_stream.hpp index 4aeb7eeac..c789d2022 100644 --- a/stream/servers/file_stream.h +++ b/stream/servers/file_stream.hpp @@ -1,7 +1,7 @@ #ifndef MANGLE_STREAM_FILESERVER_H #define MANGLE_STREAM_FILESERVER_H -#include "std_stream.h" +#include "std_stream.hpp" #include namespace Mangle { diff --git a/stream/servers/memory_stream.h b/stream/servers/memory_stream.hpp similarity index 99% rename from stream/servers/memory_stream.h rename to stream/servers/memory_stream.hpp index f20fe204a..0849e4a3c 100644 --- a/stream/servers/memory_stream.h +++ b/stream/servers/memory_stream.hpp @@ -2,7 +2,7 @@ #define MANGLE_STREAM_MEMSERVER_H #include -#include "../stream.h" +#include "../stream.hpp" #include namespace Mangle { diff --git a/stream/servers/ogre_datastream.h b/stream/servers/ogre_datastream.hpp similarity index 100% rename from stream/servers/ogre_datastream.h rename to stream/servers/ogre_datastream.hpp diff --git a/stream/servers/phys_stream.h b/stream/servers/phys_stream.hpp similarity index 100% rename from stream/servers/phys_stream.h rename to stream/servers/phys_stream.hpp diff --git a/stream/servers/std_stream.h b/stream/servers/std_stream.hpp similarity index 95% rename from stream/servers/std_stream.h rename to stream/servers/std_stream.hpp index 657d9303b..bb8bb6cbc 100644 --- a/stream/servers/std_stream.h +++ b/stream/servers/std_stream.hpp @@ -1,9 +1,9 @@ #ifndef MANGLE_STREAM_STDIOSERVER_H #define MANGLE_STREAM_STDIOSERVER_H -#include "../stream.h" +#include "../stream.hpp" #include -#include "../../tools/str_exception.h" +#include "../../tools/str_exception.hpp" namespace Mangle { namespace Stream { diff --git a/stream/stream.h b/stream/stream.hpp similarity index 98% rename from stream/stream.h rename to stream/stream.hpp index acd001d24..a195fe321 100644 --- a/stream/stream.h +++ b/stream/stream.hpp @@ -2,7 +2,7 @@ #define MANGLE_STREAM_INPUT_H #include -#include "../tools/shared_ptr.h" +#include "../tools/shared_ptr.hpp" #include namespace Mangle { diff --git a/stream/tests/Makefile b/stream/tests/Makefile index d95908afb..8504de741 100644 --- a/stream/tests/Makefile +++ b/stream/tests/Makefile @@ -6,22 +6,22 @@ I_OGRE=$(shell pkg-config --cflags OGRE) L_OGRE=$(shell pkg-config --libs OGRE) L_AUDIERE=-laudiere -ogre_client_test: ogre_client_test.cpp ../stream.h ../clients/ogre_datastream.h +ogre_client_test: ogre_client_test.cpp ../stream.hpp ../clients/ogre_datastream.hpp $(GCC) $< -o $@ $(I_OGRE) $(L_OGRE) -audiere_client_test: audiere_client_test.cpp ../stream.h ../clients/audiere_file.h ../clients/audiere_file.cpp +audiere_client_test: audiere_client_test.cpp ../stream.hpp ../clients/audiere_file.hpp ../clients/audiere_file.cpp $(GCC) $< -o $@ ../clients/audiere_file.cpp $(L_AUDIERE) -file_server_test: file_server_test.cpp ../stream.h ../servers/file_stream.h ../servers/std_stream.h +file_server_test: file_server_test.cpp ../stream.hpp ../servers/file_stream.hpp ../servers/std_stream.hpp $(GCC) $< -o $@ -memory_server_test: memory_server_test.cpp ../stream.h ../servers/memory_stream.h +memory_server_test: memory_server_test.cpp ../stream.hpp ../servers/memory_stream.hpp $(GCC) $< -o $@ -buffer_filter_test: buffer_filter_test.cpp ../stream.h ../servers/memory_stream.h ../filters/buffer_stream.h +buffer_filter_test: buffer_filter_test.cpp ../stream.hpp ../servers/memory_stream.hpp ../filters/buffer_stream.hpp $(GCC) $< -o $@ -slice_filter_test: slice_filter_test.cpp ../stream.h ../servers/memory_stream.h ../filters/slice_stream.h +slice_filter_test: slice_filter_test.cpp ../stream.hpp ../servers/memory_stream.hpp ../filters/slice_stream.hpp $(GCC) $< -o $@ clean: diff --git a/stream/tests/audiere_client_test.cpp b/stream/tests/audiere_client_test.cpp index dd4dfe4ad..82be569cc 100644 --- a/stream/tests/audiere_client_test.cpp +++ b/stream/tests/audiere_client_test.cpp @@ -1,5 +1,5 @@ -#include "../servers/memory_stream.h" -#include "../clients/audiere_file.h" +#include "../servers/memory_stream.hpp" +#include "../clients/audiere_file.hpp" #include #include diff --git a/stream/tests/buffer_filter_test.cpp b/stream/tests/buffer_filter_test.cpp index b6f43e99b..971530d84 100644 --- a/stream/tests/buffer_filter_test.cpp +++ b/stream/tests/buffer_filter_test.cpp @@ -1,7 +1,7 @@ #include #include -#include "../filters/buffer_stream.h" +#include "../filters/buffer_stream.hpp" using namespace Mangle::Stream; using namespace std; diff --git a/stream/tests/file_server_test.cpp b/stream/tests/file_server_test.cpp index 1c2505158..3e1e3cfa5 100644 --- a/stream/tests/file_server_test.cpp +++ b/stream/tests/file_server_test.cpp @@ -1,4 +1,4 @@ -#include "../servers/file_stream.h" +#include "../servers/file_stream.hpp" #include using namespace Mangle::Stream; diff --git a/stream/tests/memory_server_test.cpp b/stream/tests/memory_server_test.cpp index b9f21b9b1..24dea79a2 100644 --- a/stream/tests/memory_server_test.cpp +++ b/stream/tests/memory_server_test.cpp @@ -1,7 +1,7 @@ #include #include -#include "../servers/memory_stream.h" +#include "../servers/memory_stream.hpp" using namespace Mangle::Stream; using namespace std; diff --git a/stream/tests/ogre_client_test.cpp b/stream/tests/ogre_client_test.cpp index a89589d7c..c8d0442c0 100644 --- a/stream/tests/ogre_client_test.cpp +++ b/stream/tests/ogre_client_test.cpp @@ -1,5 +1,5 @@ -#include "../servers/memory_stream.h" -#include "../clients/ogre_datastream.h" +#include "../servers/memory_stream.hpp" +#include "../clients/ogre_datastream.hpp" #include using namespace Mangle::Stream; diff --git a/stream/tests/slice_filter_test.cpp b/stream/tests/slice_filter_test.cpp index ff384c1bb..da90e24ad 100644 --- a/stream/tests/slice_filter_test.cpp +++ b/stream/tests/slice_filter_test.cpp @@ -1,8 +1,8 @@ #include #include -#include "../filters/slice_stream.h" -#include "../servers/memory_stream.h" +#include "../filters/slice_stream.hpp" +#include "../servers/memory_stream.hpp" using namespace Mangle::Stream; using namespace std; diff --git a/testall.sh b/testall.sh index b2cc3059d..f38939a19 100755 --- a/testall.sh +++ b/testall.sh @@ -2,6 +2,7 @@ function run() { + echo "TESTING $1" cd "$1/tests/" ./test.sh cd ../../ diff --git a/tests/ogrevfs_audiere_openal_test.cpp b/tests/ogrevfs_audiere_openal_test.cpp index 3e267c98a..4936538c5 100644 --- a/tests/ogrevfs_audiere_openal_test.cpp +++ b/tests/ogrevfs_audiere_openal_test.cpp @@ -7,8 +7,8 @@ */ -#include "sound/filters/openal_audiere.h" -#include "vfs/servers/ogre_vfs.h" +#include "sound/filters/openal_audiere.hpp" +#include "vfs/servers/ogre_vfs.hpp" #include #include diff --git a/tools/shared_ptr.h b/tools/shared_ptr.hpp similarity index 100% rename from tools/shared_ptr.h rename to tools/shared_ptr.hpp diff --git a/tools/str_exception.h b/tools/str_exception.hpp similarity index 100% rename from tools/str_exception.h rename to tools/str_exception.hpp diff --git a/vfs/clients/ogre_archive.cpp b/vfs/clients/ogre_archive.cpp index e9612d7d9..ed6337053 100644 --- a/vfs/clients/ogre_archive.cpp +++ b/vfs/clients/ogre_archive.cpp @@ -1,6 +1,6 @@ -#include "ogre_archive.h" +#include "ogre_archive.hpp" -#include "../../stream/clients/ogre_datastream.h" +#include "../../stream/clients/ogre_datastream.hpp" using namespace Mangle::VFS; using namespace Mangle::Stream; diff --git a/vfs/clients/ogre_archive.h b/vfs/clients/ogre_archive.hpp similarity index 98% rename from vfs/clients/ogre_archive.h rename to vfs/clients/ogre_archive.hpp index 22964dc35..0ea941366 100644 --- a/vfs/clients/ogre_archive.h +++ b/vfs/clients/ogre_archive.hpp @@ -3,7 +3,7 @@ #include #include -#include "../vfs.h" +#include "../vfs.hpp" namespace Mangle { namespace VFS { diff --git a/vfs/servers/ogre_vfs.cpp b/vfs/servers/ogre_vfs.cpp index ab496a192..7f728c1b0 100644 --- a/vfs/servers/ogre_vfs.cpp +++ b/vfs/servers/ogre_vfs.cpp @@ -1,5 +1,5 @@ -#include "ogre_vfs.h" -#include "../../stream/servers/ogre_datastream.h" +#include "ogre_vfs.hpp" +#include "../../stream/servers/ogre_datastream.hpp" using namespace Mangle::VFS; using namespace Mangle::Stream; diff --git a/vfs/servers/ogre_vfs.h b/vfs/servers/ogre_vfs.hpp similarity index 99% rename from vfs/servers/ogre_vfs.h rename to vfs/servers/ogre_vfs.hpp index f212432f8..7ab64169d 100644 --- a/vfs/servers/ogre_vfs.h +++ b/vfs/servers/ogre_vfs.hpp @@ -1,7 +1,7 @@ #ifndef MANGLE_VFS_OGRESERVER_H #define MANGLE_VFS_OGRESERVER_H -#include "../vfs.h" +#include "../vfs.hpp" #include namespace Mangle { diff --git a/vfs/servers/physfs_vfs.h b/vfs/servers/physfs_vfs.hpp similarity index 96% rename from vfs/servers/physfs_vfs.h rename to vfs/servers/physfs_vfs.hpp index 49acc398d..8535088e0 100644 --- a/vfs/servers/physfs_vfs.h +++ b/vfs/servers/physfs_vfs.hpp @@ -1,8 +1,8 @@ #ifndef MANGLE_VFS_PHYSFS_SERVER_H #define MANGLE_VFS_PHYSFS_SERVER_H -#include "../vfs.h" -#include "../../stream/servers/phys_stream.h" +#include "../vfs.hpp" +#include "../../stream/servers/phys_stream.hpp" #include #include diff --git a/vfs/tests/Makefile b/vfs/tests/Makefile index c9963cfa1..e0577b64e 100644 --- a/vfs/tests/Makefile +++ b/vfs/tests/Makefile @@ -6,19 +6,19 @@ I_OGRE=$(shell pkg-config --cflags OGRE) L_OGRE=$(shell pkg-config --libs OGRE) L_PHYSFS=-lphysfs -ogre_client_test: ogre_client_test.cpp dummy_vfs.cpp ../vfs.h ../clients/ogre_archive.h ../clients/ogre_archive.cpp +ogre_client_test: ogre_client_test.cpp dummy_vfs.cpp ../vfs.hpp ../clients/ogre_archive.hpp ../clients/ogre_archive.cpp $(GCC) $< ../clients/ogre_archive.cpp -o $@ $(I_OGRE) $(L_OGRE) ogre_resource_test: ogre_resource_test.cpp $(GCC) $< -o $@ $(I_OGRE) $(L_OGRE) -ogre_server_test: ogre_server_test.cpp ../vfs.h ../servers/ogre_vfs.h ../servers/ogre_vfs.cpp +ogre_server_test: ogre_server_test.cpp ../vfs.hpp ../servers/ogre_vfs.hpp ../servers/ogre_vfs.cpp $(GCC) $< -o $@ $(I_OGRE) $(L_OGRE) ../servers/ogre_vfs.cpp -physfs_server_test: physfs_server_test.cpp ../vfs.h ../servers/physfs_vfs.h +physfs_server_test: physfs_server_test.cpp ../vfs.hpp ../servers/physfs_vfs.hpp $(GCC) $< -o $@ $(L_PHYSFS) -dummy_test: dummy_test.cpp dummy_vfs.cpp ../vfs.h +dummy_test: dummy_test.cpp dummy_vfs.cpp ../vfs.hpp $(GCC) $< -o $@ clean: diff --git a/vfs/tests/dummy_vfs.cpp b/vfs/tests/dummy_vfs.cpp index 7a39da932..0448e96a5 100644 --- a/vfs/tests/dummy_vfs.cpp +++ b/vfs/tests/dummy_vfs.cpp @@ -1,9 +1,9 @@ // This file is shared between several test programs -#include "vfs.h" +#include "vfs.hpp" #include #include -#include "../../stream/servers/memory_stream.h" +#include "../../stream/servers/memory_stream.hpp" using namespace Mangle::VFS; using namespace Mangle::Stream; diff --git a/vfs/tests/ogre_client_test.cpp b/vfs/tests/ogre_client_test.cpp index 542ac9c7e..8e1269b56 100644 --- a/vfs/tests/ogre_client_test.cpp +++ b/vfs/tests/ogre_client_test.cpp @@ -1,5 +1,5 @@ #include "dummy_vfs.cpp" -#include "../clients/ogre_archive.h" +#include "../clients/ogre_archive.hpp" #include using namespace Ogre; diff --git a/vfs/tests/ogre_server_test.cpp b/vfs/tests/ogre_server_test.cpp index cb4624894..b846eef96 100644 --- a/vfs/tests/ogre_server_test.cpp +++ b/vfs/tests/ogre_server_test.cpp @@ -1,4 +1,4 @@ -#include "../servers/ogre_vfs.h" +#include "../servers/ogre_vfs.hpp" #include diff --git a/vfs/tests/output/ogre_resource_test.out b/vfs/tests/output/ogre_resource_test.out index 99b2c91ba..9bfc4ff5b 100644 --- a/vfs/tests/output/ogre_resource_test.out +++ b/vfs/tests/output/ogre_resource_test.out @@ -1,6 +1,6 @@ File: Makefile -Size: 814 +Size: 828 First line: GCC=g++ -I../ File: ogre_resource_test.cpp diff --git a/vfs/tests/output/ogre_server_test.out b/vfs/tests/output/ogre_server_test.out index b00752eae..74f350844 100644 --- a/vfs/tests/output/ogre_server_test.out +++ b/vfs/tests/output/ogre_server_test.out @@ -1,6 +1,6 @@ File: Makefile -Size: 814 +Size: 828 First 12 bytes: GCC=g++ -I.. File: testfile.txt diff --git a/vfs/tests/output/physfs_server_test.out b/vfs/tests/output/physfs_server_test.out index b00752eae..74f350844 100644 --- a/vfs/tests/output/physfs_server_test.out +++ b/vfs/tests/output/physfs_server_test.out @@ -1,6 +1,6 @@ File: Makefile -Size: 814 +Size: 828 First 12 bytes: GCC=g++ -I.. File: testfile.txt diff --git a/vfs/tests/physfs_server_test.cpp b/vfs/tests/physfs_server_test.cpp index ae42083fd..9e9d088cd 100644 --- a/vfs/tests/physfs_server_test.cpp +++ b/vfs/tests/physfs_server_test.cpp @@ -1,4 +1,4 @@ -#include "../servers/physfs_vfs.h" +#include "../servers/physfs_vfs.hpp" #include "server_common.cpp" diff --git a/vfs/vfs.h b/vfs/vfs.hpp similarity index 98% rename from vfs/vfs.h rename to vfs/vfs.hpp index c52bcaebb..ce51be94b 100644 --- a/vfs/vfs.h +++ b/vfs/vfs.hpp @@ -1,7 +1,7 @@ #ifndef MANGLE_VFS_H #define MANGLE_VFS_H -#include "../stream/stream.h" +#include "../stream/stream.hpp" #include #include