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" > + + + + 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 similarity index 100% rename from Source/Core/Common/Src/WaveFile.cpp rename to Source/Core/AudioCommon/Src/WaveFile.cpp diff --git a/Source/Core/Common/Src/WaveFile.h b/Source/Core/AudioCommon/Src/WaveFile.h similarity index 100% rename from Source/Core/Common/Src/WaveFile.h rename to 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 @@ -816,14 +816,6 @@ RelativePath=".\Src\Timer.h" > - - - - 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)