diff options
| author | Sonicadvance1 <sonicadvance1@gmail.com> | 2008-11-11 07:31:40 +0000 |
|---|---|---|
| committer | Sonicadvance1 <sonicadvance1@gmail.com> | 2008-11-11 07:31:40 +0000 |
| commit | 2a4e584e02483bf31b4bd28b9acf39cbfa3263ad (patch) | |
| tree | a1f643ce46e63b98fc8e944f1ef7efdcfa4a5ff5 /Source | |
| parent | 8373b94fd21fd17b637c925ba694d1575ce92f87 (diff) | |
Linux compiling fix
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1121 8ced0084-cf51-0410-be5f-012b33b47a6e
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/Plugins/Plugin_DSP_HLE/Src/UCodes/UCode_AX_Voice.h | 2 | ||||
| -rw-r--r-- | Source/Plugins/Plugin_DSP_HLE/Src/main.h | 1 | ||||
| -rw-r--r-- | Source/Plugins/Plugin_VideoOGL/Src/SConscript | 1 |
3 files changed, 3 insertions, 1 deletions
diff --git a/Source/Plugins/Plugin_DSP_HLE/Src/UCodes/UCode_AX_Voice.h b/Source/Plugins/Plugin_DSP_HLE/Src/UCodes/UCode_AX_Voice.h index 6cac2f18b9..92a2455c60 100644 --- a/Source/Plugins/Plugin_DSP_HLE/Src/UCodes/UCode_AX_Voice.h +++ b/Source/Plugins/Plugin_DSP_HLE/Src/UCodes/UCode_AX_Voice.h @@ -19,7 +19,7 @@ #define _UCODE_AX_VOICE_H
#include "UCode_AX_ADPCM.h"
-
+#include "../main.h"
template<class ParamBlockType>
inline void MixAddVoice(ParamBlockType &pb, int *templbuffer, int *temprbuffer, int _iSize)
diff --git a/Source/Plugins/Plugin_DSP_HLE/Src/main.h b/Source/Plugins/Plugin_DSP_HLE/Src/main.h new file mode 100644 index 0000000000..40b87f33a4 --- /dev/null +++ b/Source/Plugins/Plugin_DSP_HLE/Src/main.h @@ -0,0 +1 @@ +extern CDebugger* m_frame; diff --git a/Source/Plugins/Plugin_VideoOGL/Src/SConscript b/Source/Plugins/Plugin_VideoOGL/Src/SConscript index a756cd31fb..38a75d3f3d 100644 --- a/Source/Plugins/Plugin_VideoOGL/Src/SConscript +++ b/Source/Plugins/Plugin_VideoOGL/Src/SConscript @@ -25,6 +25,7 @@ files = [ 'VertexLoader_Normal.cpp', 'VertexLoaderManager.cpp', 'VertexShaderManager.cpp', + 'TextureConverter.cpp', 'XFB.cpp', 'Logging/Console.cpp', 'Logging/Logging.cpp', |