Skip to content

Exclude more files from the compilation #1374

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
GabsPuNs wants to merge 4 commits into
base: main
Choose a base branch
from
+4 −11
Open

Exclude more files from the compilation #1374

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
cbbaea9
Fix Sign
GabsPuNs Mar 21, 2026
c24079f
Merge remote-tracking branch 'upstream/main'
GabsPuNs Mar 21, 2026
26e94f5
Exclude more files from the compilation.
GabsPuNs Mar 21, 2026
08db24e
Remove Trial and Tutorial folder in Common, Tutorial world is in wind…
GabsPuNs Mar 22, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions Minecraft.Client/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,8 +81,6 @@ set(ASSET_FOLDER_PAIRS
"${CMAKE_CURRENT_SOURCE_DIR}/music" "music"
"${CMAKE_CURRENT_SOURCE_DIR}/Common/Media" "Common/Media"
"${CMAKE_CURRENT_SOURCE_DIR}/Common/res" "Common/res"
"${CMAKE_CURRENT_SOURCE_DIR}/Common/Trial" "Common/Trial"
"${CMAKE_CURRENT_SOURCE_DIR}/Common/Tutorial" "Common/Tutorial"
"${CMAKE_CURRENT_SOURCE_DIR}/${PLATFORM_NAME}Media" "${PLATFORM_NAME}Media"
)
setup_asset_folder_copy(Minecraft.Client "${ASSET_FOLDER_PAIRS}")
Expand Down
8 changes: 0 additions & 8 deletions Minecraft.Client/cmake/sources/Windows.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"
)
Expand Down Expand Up @@ -470,7 +463,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}
Expand Down
5 changes: 4 additions & 1 deletion cmake/CopyAssets.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,15 @@ function(setup_asset_folder_copy TARGET_NAME ASSET_FOLDER_PAIRS)
"*.swf" # These are built into the .arc
"*.resx" "*.loc"
"*.wav" # Unsupported audio format
"*.xui"
"*.xui" "*.xgs"
"*.xwb" "*.xsb"
"*.xap" "*.xzp"
)

# Global folder exclusions applied to every folder copy
set(ASSET_EXCLUDE_FOLDERS
"Graphics"
"Gamerules"
)

# Exclude platform-specific arc media files
Expand Down
Loading