alex/MinecraftConsoles
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/main' into dec-2014

Browse Source
This commit is contained in:
Loki Rautio
2026-03-01 14:04:21 -06:00
parent 7cdcbeadd4 f580a6a603
commit d07c892b91
7 changed files with 125 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Minecraft.Client/Common/Audio/SoundEngine.cpp
View File

@@ -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

7
Minecraft.Client/Minecraft.Client.vcxproj
View File

@@ -1606,13 +1606,14 @@ xcopy /q /y /i /s /e $(ProjectDir)DurangoMedia\CU $(LayoutDir)Image\Loose\CU</C
</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>

3
Minecraft.Client/Minecraft.Client.vcxproj.filters
View File

@@ -6275,9 +6275,6 @@
<Filter>PS3\SPUObjFiles\ContentPackage</Filter>
</Object>
</ItemGroup>
<ItemGroup>
<AppxManifest Include="Durango\Autogenerated.appxmanifest" />
</ItemGroup>
<ItemGroup>
<Xml Include="Durango\manifest.xml" />
</ItemGroup>