diff options
| author | hrydgard <hrydgard@gmail.com> | 2009-09-13 09:23:30 +0000 |
|---|---|---|
| committer | hrydgard <hrydgard@gmail.com> | 2009-09-13 09:23:30 +0000 |
| commit | 2d93c654f09e86b00a14b0929f07089c137bcc05 (patch) | |
| tree | 3a39bae232ce04f5fb489add54964b2a5ddd4bfc /Source/Core | |
| parent | 3ff95019b7f0b57ab16604a07a31c66d14ead022 (diff) | |
Rename Config.cpp/h to VideoConfig.cpp/h.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@4260 8ced0084-cf51-0410-be5f-012b33b47a6e
Diffstat (limited to 'Source/Core')
| -rw-r--r-- | Source/Core/VideoCommon/Src/SConscript | 2 | ||||
| -rw-r--r-- | Source/Core/VideoCommon/Src/VideoConfig.cpp (renamed from Source/Core/VideoCommon/Src/Config.cpp) | 2 | ||||
| -rw-r--r-- | Source/Core/VideoCommon/Src/VideoConfig.h (renamed from Source/Core/VideoCommon/Src/Config.h) | 6 | ||||
| -rw-r--r-- | Source/Core/VideoCommon/VideoCommon.vcproj | 16 |
4 files changed, 13 insertions, 13 deletions
diff --git a/Source/Core/VideoCommon/Src/SConscript b/Source/Core/VideoCommon/Src/SConscript index 69724c541e..8ae7998245 100644 --- a/Source/Core/VideoCommon/Src/SConscript +++ b/Source/Core/VideoCommon/Src/SConscript @@ -3,7 +3,7 @@ Import('env') files = [ - 'Config.cpp', + 'VideoConfig.cpp', 'GlobalControl.cpp', 'BPMemory.cpp', 'CPMemory.cpp', diff --git a/Source/Core/VideoCommon/Src/Config.cpp b/Source/Core/VideoCommon/Src/VideoConfig.cpp index 331c91aed0..4c171f1db3 100644 --- a/Source/Core/VideoCommon/Src/Config.cpp +++ b/Source/Core/VideoCommon/Src/VideoConfig.cpp @@ -19,7 +19,7 @@ #include "Common.h" #include "IniFile.h" -#include "Config.h" +#include "VideoConfig.h" #include "VideoCommon.h" Config g_Config; diff --git a/Source/Core/VideoCommon/Src/Config.h b/Source/Core/VideoCommon/Src/VideoConfig.h index de4e94d0c5..07512e083e 100644 --- a/Source/Core/VideoCommon/Src/Config.h +++ b/Source/Core/VideoCommon/Src/VideoConfig.h @@ -22,8 +22,8 @@ // at the start of every frame. Noone should ever change members of g_ActiveConfig // directly. -#ifndef _PLUGIN_VIDEOOGL_CONFIG_H_ -#define _PLUGIN_VIDEOOGL_CONFIG_H_ +#ifndef _PLUGIN_VIDEO_CONFIG_H_ +#define _PLUGIN_VIDEO_CONFIG_H_ #include "Common.h" #include "VideoCommon.h" @@ -140,4 +140,4 @@ void UpdateActiveConfig(); void ComputeDrawRectangle(int backbuffer_width, int backbuffer_height, bool flip, TargetRectangle *rc); -#endif // _PLUGIN_VIDEOOGL_CONFIG_H_ +#endif // _PLUGIN_VIDEO_CONFIG_H_ diff --git a/Source/Core/VideoCommon/VideoCommon.vcproj b/Source/Core/VideoCommon/VideoCommon.vcproj index eee7206a39..908b9f3ab2 100644 --- a/Source/Core/VideoCommon/VideoCommon.vcproj +++ b/Source/Core/VideoCommon/VideoCommon.vcproj @@ -690,14 +690,6 @@ </File>
</Filter>
<File
- RelativePath=".\Src\Config.cpp"
- >
- </File>
- <File
- RelativePath=".\Src\Config.h"
- >
- </File>
- <File
RelativePath=".\Src\GlobalControl.cpp"
>
</File>
@@ -725,6 +717,14 @@ RelativePath=".\Src\VideoCommon.h"
>
</File>
+ <File
+ RelativePath=".\Src\VideoConfig.cpp"
+ >
+ </File>
+ <File
+ RelativePath=".\Src\VideoConfig.h"
+ >
+ </File>
</Files>
<Globals>
</Globals>
|