diff options
| author | void_17 <61356189+void2012@users.noreply.github.com> | 2026-03-02 02:40:01 +0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2026-03-02 02:40:01 +0700 |
| commit | 5037420311c92a0a795ff4c34a32e6f7fe6bb3ed (patch) | |
| tree | 41584a632c7111fe6a8ea7135446f8d780db557f /Minecraft.Client | |
| parent | 9382049029c8964c90920b84f7c67189893add29 (diff) | |
| parent | 9691561693c3171262a9ec9a0e4e8663949c3fa0 (diff) | |
Merge pull request #45 from simulpingus/main
Remove need for Durango folder, properly use Windows64Media, and add all DLC content
Diffstat (limited to 'Minecraft.Client')
| -rw-r--r-- | Minecraft.Client/Common/Audio/SoundEngine.cpp | 2 | ||||
| -rw-r--r-- | Minecraft.Client/Minecraft.Client.vcxproj | 7 | ||||
| -rw-r--r-- | Minecraft.Client/Minecraft.Client.vcxproj.filters | 3 |
3 files changed, 5 insertions, 7 deletions
diff --git a/Minecraft.Client/Common/Audio/SoundEngine.cpp b/Minecraft.Client/Common/Audio/SoundEngine.cpp index 4eaf7df7..1906b1aa 100644 --- a/Minecraft.Client/Common/Audio/SoundEngine.cpp +++ b/Minecraft.Client/Common/Audio/SoundEngine.cpp @@ -56,7 +56,7 @@ void SoundEngine::playMusicTick() {}; #else #ifdef _WINDOWS64 -char SoundEngine::m_szSoundPath[]={"Durango\\Sound\\"}; +char SoundEngine::m_szSoundPath[]={"Windows64Media\\Sound\\"}; char SoundEngine::m_szMusicPath[]={"music\\"}; char SoundEngine::m_szRedistName[]={"redist64"}; #elif defined _DURANGO diff --git a/Minecraft.Client/Minecraft.Client.vcxproj b/Minecraft.Client/Minecraft.Client.vcxproj index a6aeac2e..5de7c839 100644 --- a/Minecraft.Client/Minecraft.Client.vcxproj +++ b/Minecraft.Client/Minecraft.Client.vcxproj @@ -1441,13 +1441,14 @@ xcopy /q /y /i /s /e $(ProjectDir)Durango\CU $(LayoutDir)Image\Loose\CU</Comman </Link> <PostBuildEvent> <Message>Copying sound assets to output directory</Message> - <Command>xcopy /q /y /i /s /e "$(ProjectDir)Durango\Sound" "$(OutDir)Durango\Sound" -xcopy /q /y /i /s /e "$(ProjectDir)music" "$(OutDir)music" + <Command>xcopy /q /y /i /s /e "$(ProjectDir)music" "$(OutDir)music" xcopy /q /y /i /s /e "$(ProjectDir)Windows64\GameHDD" "$(OutDir)Windows64\GameHDD" xcopy /q /y /i /s /e "$(ProjectDir)Common\Media" "$(OutDir)Common\Media" xcopy /q /y /i /s /e "$(ProjectDir)Common\res" "$(OutDir)Common\res" xcopy /q /y /i /s /e "$(ProjectDir)Common\Trial" "$(OutDir)Common\Trial" -xcopy /q /y /i /s /e "$(ProjectDir)Common\Tutorial" "$(OutDir)Common\Tutorial"</Command> +xcopy /q /y /i /s /e "$(ProjectDir)Common\Tutorial" "$(OutDir)Common\Tutorial" +xcopy /q /y /i /s /e "$(ProjectDir)DurangoMedia" "$(OutDir)Windows64Media" +xcopy /q /y /i /s /e "$(ProjectDir)Windows64Media" "$(OutDir)Windows64Media"</Command> </PostBuildEvent> <ImageXex> <ConfigurationFile>$(ProjectDir)xbox\xex-dev.xml</ConfigurationFile> diff --git a/Minecraft.Client/Minecraft.Client.vcxproj.filters b/Minecraft.Client/Minecraft.Client.vcxproj.filters index 7731385c..451dec44 100644 --- a/Minecraft.Client/Minecraft.Client.vcxproj.filters +++ b/Minecraft.Client/Minecraft.Client.vcxproj.filters @@ -6015,9 +6015,6 @@ </Object> </ItemGroup> <ItemGroup> - <AppxManifest Include="Durango\Autogenerated.appxmanifest" /> - </ItemGroup> - <ItemGroup> <Xml Include="Durango\manifest.xml" /> </ItemGroup> </Project>
\ No newline at end of file |