diff options
| author | nakeee <nakeee@gmail.com> | 2008-12-26 13:19:27 +0000 |
|---|---|---|
| committer | nakeee <nakeee@gmail.com> | 2008-12-26 13:19:27 +0000 |
| commit | acd0e0d8da7eb183e908866e544dbde87eba7387 (patch) | |
| tree | 011f13fbae375bd6b4e6464e5feea314ea8bfc0b /Source/Core/VideoCommon | |
| parent | 95a341a4e95aceffd82c04ff114dd7a3e6feb6cd (diff) | |
linux/debug builds fix
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1693 8ced0084-cf51-0410-be5f-012b33b47a6e
Diffstat (limited to 'Source/Core/VideoCommon')
| -rw-r--r-- | Source/Core/VideoCommon/Src/SConscript | 38 | ||||
| -rw-r--r-- | Source/Core/VideoCommon/Src/VideoCommon.h | 8 |
2 files changed, 28 insertions, 18 deletions
diff --git a/Source/Core/VideoCommon/Src/SConscript b/Source/Core/VideoCommon/Src/SConscript index 63d7996662..bdeb779542 100644 --- a/Source/Core/VideoCommon/Src/SConscript +++ b/Source/Core/VideoCommon/Src/SConscript @@ -3,23 +3,29 @@ Import('env') files = [ - "BPMemory.cpp", - "CPMemory.cpp", - "LookUpTables.cpp", + 'BPMemory.cpp', + 'CPMemory.cpp', + 'memcpy_amd.cpp', + 'LookUpTables.cpp', 'OpcodeDecoding.cpp', - "TextureDecoder.cpp", - "XFMemory.cpp", - "XFBConvert.cpp", - "PixelShader.cpp", - "PixelShaderManager.cpp", - "VertexShader.cpp", - "VertexShaderManager.cpp", - "ImageWrite.cpp", - "NativeVertexWriter.cpp", - "Statistics.cpp", - "Fifo.cpp", - "VideoState.cpp", - "Profiler.cpp", + 'TextureDecoder.cpp', + 'XFMemory.cpp', + 'XFBConvert.cpp', + 'PixelShader.cpp', + 'PixelShaderManager.cpp', + 'VertexShader.cpp', + 'VertexShaderManager.cpp', + 'VertexLoader.cpp', + 'VertexLoader_Color.cpp', + 'VertexLoader_Normal.cpp', + 'VertexLoader_Position.cpp', + 'VertexLoader_TextCoord.cpp', + 'ImageWrite.cpp', + 'NativeVertexWriter.cpp', + 'Statistics.cpp', + 'Fifo.cpp', + 'VideoState.cpp', + 'Profiler.cpp', ] env_common = env.Clone() diff --git a/Source/Core/VideoCommon/Src/VideoCommon.h b/Source/Core/VideoCommon/Src/VideoCommon.h index d32d66d51c..e790407d4d 100644 --- a/Source/Core/VideoCommon/Src/VideoCommon.h +++ b/Source/Core/VideoCommon/Src/VideoCommon.h @@ -85,9 +85,13 @@ void HandleGLError(); #define ERROR_LOG __Log
+
#if defined(_DEBUG) || defined(DEBUGFAST)
-#define INFO_LOG if( g_Config.iLog & CONF_LOG ) __Log
-#define PRIM_LOG if( g_Config.iLog & CONF_PRIMLOG ) __Log
+// FIXME ugly hack for debug to build should use logmanager
+//#define INFO_LOG if( g_Config.iLog & CONF_LOG ) __Log
+//#define PRIM_LOG if( g_Config.iLog & CONF_PRIMLOG ) __Log
+#define INFO_LOG __Log
+#define PRIM_LOG __Log
#define DEBUG_LOG __Log
#else
#define INFO_LOG(...)
|