diff options
| author | John Peterson <jpeterson57@gmail.com> | 2009-01-03 01:38:44 +0000 |
|---|---|---|
| committer | John Peterson <jpeterson57@gmail.com> | 2009-01-03 01:38:44 +0000 |
| commit | 264056972d753e4018ea46472b5f657c75dc4b8a (patch) | |
| tree | 159d3d1f36877e6600ce1652da35a54b5c5a98ce /Source/Core/DolphinWX/Src/BootManager.cpp | |
| parent | 55db2299291707e837d49b9f34b8656b91d3ab14 (diff) | |
MusicMod: Added music modification, it currently only works in Windows
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1736 8ced0084-cf51-0410-be5f-012b33b47a6e
Diffstat (limited to 'Source/Core/DolphinWX/Src/BootManager.cpp')
| -rw-r--r-- | Source/Core/DolphinWX/Src/BootManager.cpp | 19 |
1 files changed, 16 insertions, 3 deletions
diff --git a/Source/Core/DolphinWX/Src/BootManager.cpp b/Source/Core/DolphinWX/Src/BootManager.cpp index e165c7741b..4d56b61f5c 100644 --- a/Source/Core/DolphinWX/Src/BootManager.cpp +++ b/Source/Core/DolphinWX/Src/BootManager.cpp @@ -51,9 +51,12 @@ #include "Config.h" #include "Core.h" #if defined(HAVE_WX) && HAVE_WX -#include "ConfigMain.h" -#include "Frame.h" -#include "CodeWindow.h" + #include "ConfigMain.h" + #include "Frame.h" + #include "CodeWindow.h" + #ifdef MUSICMOD + #include "../../../Branches/MusicMod/Main/Src/Main.h" // MusicMod + #endif #endif static std::string s_DataBasePath_EUR = "Data_EUR"; @@ -204,6 +207,16 @@ bool BootCore(const std::string& _rFilename) #else Core::SetState(Core::CORE_RUN); #endif + + ////////////////////////////////////////////////////////////////////////////////////////// + // Music mod + // ŻŻŻŻŻŻŻŻŻŻ + #ifdef MUSICMOD + MusicMod::Main(StartUp.m_strFilename); + #endif + /////////////////////////////////// + + return true; } |