Merge remote-tracking branch 'itsRevela/main' into upstream-merge
# Conflicts: # Minecraft.Client/Common/Audio/SoundNames.cpp # Minecraft.Client/SheepRenderer.cpp # Minecraft.World/SoundTypes.h # README.md # cmake/CopyAssets.cmake
This commit is contained in:
@@ -1,12 +1,5 @@
|
||||
set(BASE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/Windows64/")
|
||||
|
||||
set(_MINECRAFT_CLIENT_WINDOWS_COMMON_RES_AUDIO
|
||||
"${CMAKE_CURRENT_SOURCE_DIR}/Common/res/audio/minecraft.xsb"
|
||||
"${CMAKE_CURRENT_SOURCE_DIR}/Common/res/audio/resident.xwb"
|
||||
"${CMAKE_CURRENT_SOURCE_DIR}/Common/res/audio/streamed.xwb"
|
||||
)
|
||||
source_group("Common/res/audio" FILES ${_MINECRAFT_CLIENT_WINDOWS_COMMON_RES_AUDIO})
|
||||
|
||||
set(_MINECRAFT_CLIENT_WINDOWS_COMMON_AUDIO
|
||||
"${CMAKE_CURRENT_SOURCE_DIR}/Common/Audio/SoundEngine.cpp"
|
||||
)
|
||||
@@ -479,7 +472,6 @@ set(_MINECRAFT_CLIENT_WINDOWS_NET_MINECRAFT_STATS
|
||||
source_group("net/minecraft/stats" FILES ${_MINECRAFT_CLIENT_WINDOWS_NET_MINECRAFT_STATS})
|
||||
|
||||
set(MINECRAFT_CLIENT_WINDOWS
|
||||
${_MINECRAFT_CLIENT_WINDOWS_COMMON_RES_AUDIO}
|
||||
${_MINECRAFT_CLIENT_WINDOWS_COMMON_AUDIO}
|
||||
${_MINECRAFT_CLIENT_WINDOWS_COMMON_NETWORK}
|
||||
${_MINECRAFT_CLIENT_WINDOWS_COMMON_UI}
|
||||
|
||||
Reference in New Issue
Block a user