diff options
| author | nakeee <nakeee@gmail.com> | 2009-03-25 19:03:32 +0000 |
|---|---|---|
| committer | nakeee <nakeee@gmail.com> | 2009-03-25 19:03:32 +0000 |
| commit | 8cfc83259909ee3b64f7062ce23d4e513a36bafe (patch) | |
| tree | 3fb62d0a9906cf2cc6cb0c4b1eaca9f4c6e19243 /Source | |
| parent | fd3ca6789503e7bbb085d311c9743bae5de83cb7 (diff) | |
moved wavefile to audiocommon, you might need to add audiocommon include/lib paths to DSP-LLE on windows
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@2753 8ced0084-cf51-0410-be5f-012b33b47a6e
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/Core/AudioCommon/AudioCommon.vcproj | 8 | ||||
| -rw-r--r-- | Source/Core/AudioCommon/Src/SConscript | 3 | ||||
| -rw-r--r-- | Source/Core/AudioCommon/Src/WaveFile.cpp (renamed from Source/Core/Common/Src/WaveFile.cpp) | 0 | ||||
| -rw-r--r-- | Source/Core/AudioCommon/Src/WaveFile.h (renamed from Source/Core/Common/Src/WaveFile.h) | 0 | ||||
| -rw-r--r-- | Source/Core/Common/Common.vcproj | 8 | ||||
| -rw-r--r-- | Source/Core/Common/Src/SConscript | 3 | ||||
| -rw-r--r-- | Source/Plugins/Plugin_DSP_LLE/Src/SConscript | 2 |
7 files changed, 12 insertions, 12 deletions
diff --git a/Source/Core/AudioCommon/AudioCommon.vcproj b/Source/Core/AudioCommon/AudioCommon.vcproj index 9ceae5f8d7..13bb8daed3 100644 --- a/Source/Core/AudioCommon/AudioCommon.vcproj +++ b/Source/Core/AudioCommon/AudioCommon.vcproj @@ -433,6 +433,14 @@ RelativePath=".\Src\SoundStream.h"
>
</File>
+ <File
+ RelativePath=".\Src\WaveFile.cpp"
+ >
+ </File>
+ <File
+ RelativePath=".\Src\WaveFile.h"
+ >
+ </File>
</Files>
<Globals>
</Globals>
diff --git a/Source/Core/AudioCommon/Src/SConscript b/Source/Core/AudioCommon/Src/SConscript index 2fb00f47b7..1d973c66ac 100644 --- a/Source/Core/AudioCommon/Src/SConscript +++ b/Source/Core/AudioCommon/Src/SConscript @@ -3,7 +3,8 @@ Import('env') files = [ - 'AOSoundStream.cpp', + 'AOSoundStream.cpp', + 'WaveFile.cpp', ] env_audiocommon = env.Clone() diff --git a/Source/Core/Common/Src/WaveFile.cpp b/Source/Core/AudioCommon/Src/WaveFile.cpp index 500cce8fbc..500cce8fbc 100644 --- a/Source/Core/Common/Src/WaveFile.cpp +++ b/Source/Core/AudioCommon/Src/WaveFile.cpp diff --git a/Source/Core/Common/Src/WaveFile.h b/Source/Core/AudioCommon/Src/WaveFile.h index b9a6528155..b9a6528155 100644 --- a/Source/Core/Common/Src/WaveFile.h +++ b/Source/Core/AudioCommon/Src/WaveFile.h diff --git a/Source/Core/Common/Common.vcproj b/Source/Core/Common/Common.vcproj index b4d79b346c..e112791a24 100644 --- a/Source/Core/Common/Common.vcproj +++ b/Source/Core/Common/Common.vcproj @@ -817,14 +817,6 @@ >
</File>
<File
- RelativePath=".\Src\WaveFile.cpp"
- >
- </File>
- <File
- RelativePath=".\Src\WaveFile.h"
- >
- </File>
- <File
RelativePath=".\Src\x64Analyzer.cpp"
>
</File>
diff --git a/Source/Core/Common/Src/SConscript b/Source/Core/Common/Src/SConscript index 097763d39f..001d77e9a9 100644 --- a/Source/Core/Common/Src/SConscript +++ b/Source/Core/Common/Src/SConscript @@ -16,7 +16,7 @@ files = [ "FileUtil.cpp", "Hash.cpp", "IniFile.cpp", - "LogManager.cpp", + "LogManager.cpp", "MappedFile.cpp", "MathUtil.cpp", "MemArena.cpp", @@ -33,7 +33,6 @@ files = [ "Thunk.cpp", "Timer.cpp", "Thread.cpp", - "WaveFile.cpp", "x64Emitter.cpp", "x64Analyzer.cpp", ] diff --git a/Source/Plugins/Plugin_DSP_LLE/Src/SConscript b/Source/Plugins/Plugin_DSP_LLE/Src/SConscript index 4061859b81..a1e4c3f621 100644 --- a/Source/Plugins/Plugin_DSP_LLE/Src/SConscript +++ b/Source/Plugins/Plugin_DSP_LLE/Src/SConscript @@ -39,7 +39,7 @@ files = [ lleenv = env.Clone() lleenv.Append( CXXFLAGS = [ '-fPIC' ], - LIBS = [ 'common' ], + LIBS = [ 'common', 'audiocommon' ], ) lleenv.SharedLibrary(env['plugin_dir']+name, files) |