eden-emu/eden
24
3
Fork 15
Code Issues 138 Pull requests 55 Projects 1 Releases Packages Wiki Activity Actions

[cmake] enable clang-cl and WoA builds #348

Merged
crueter merged 31 commits from liz-clang-cl-cmake into master 2025-09-09 20:47:51 +02:00
Conversation 9 Commits 31 Files changed 276 +5 -9
4 changed files with 5 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 8e4e2cd9c7 - Show all commits

4
CMakeLists.txt
View file

@ -144,7 +144,7 @@ CMAKE_DEPENDENT_OPTION(YUZU_USE_EXTERNAL_SDL2 "Compile external SDL2" ${EXT_DEFA
cmake_dependent_option(ENABLE_LIBUSB "Enable the use of LibUSB" ON "NOT ANDROID" OFF) cmake_dependent_option(ENABLE_LIBUSB "Enable the use of LibUSB" ON "NOT ANDROID" OFF)
cmake_dependent_option(ENABLE_OPENGL "Enable OpenGL" ON "NOT WIN32 AND NOT ARCHITECTURE_arm64" OFF) cmake_dependent_option(ENABLE_OPENGL "Enable OpenGL" ON "NOT WIN32 OR NOT ARCHITECTURE_arm64" OFF)
mark_as_advanced(FORCE ENABLE_OPENGL) mark_as_advanced(FORCE ENABLE_OPENGL)
option(ENABLE_QT "Enable the Qt frontend" ON) option(ENABLE_QT "Enable the Qt frontend" ON)
@ -380,8 +380,6 @@ if (YUZU_USE_CPM)
# boost # boost
set(BOOST_INCLUDE_LIBRARIES algorithm icl pool container heap asio headers process filesystem crc variant) set(BOOST_INCLUDE_LIBRARIES algorithm icl pool container heap asio headers process filesystem crc variant)
# TODO(crueter): Use the tar.gz or tar.xz ones since they use POSIX endings and
# makes patching easier.
AddJsonPackage(boost) AddJsonPackage(boost)
# really annoying thing where boost::headers doesn't work with cpm # really annoying thing where boost::headers doesn't work with cpm

1
CMakeModules/CPM.cmake
View file

@ -592,7 +592,6 @@ function(cpm_add_patches)
list(APPEND temp_list "&&") list(APPEND temp_list "&&")
endif() endif()
# Add the patch command to the list # Add the patch command to the list
# use binary because DOS SUCKS
list(APPEND temp_list "${PATCH_EXECUTABLE}" "-p1" "<" "${PATCH_FILE}") list(APPEND temp_list "${PATCH_EXECUTABLE}" "-p1" "<" "${PATCH_FILE}")
endforeach() endforeach()

3
cpmfile.json
View file

@ -147,7 +147,8 @@
"cmake_filename": "sdl2" "cmake_filename": "sdl2"
}, },
"llvm-mingw": { "llvm-mingw": {
"repo": "crueter/llvm-mingw", "repo": "misc/llvm-mingw",
"git_host": "git.crueter.xyz",
"tag": "20250828", "tag": "20250828",
"version": "20250828", "version": "20250828",
"artifact": "clang-rt-builtins.tar.zst", "artifact": "clang-rt-builtins.tar.zst",

6
src/CMakeLists.txt
View file

@ -14,10 +14,8 @@ if ((ARCHITECTURE_x86_64 OR ARCHITECTURE_arm64))
endif() endif()
# CMake seems to only define _DEBUG on Windows # CMake seems to only define _DEBUG on Windows
if (NOT (MSVC AND CXX_CLANG)) set_property(DIRECTORY APPEND PROPERTY
set_property(DIRECTORY APPEND PROPERTY COMPILE_DEFINITIONS $<$<CONFIG:Debug>:_DEBUG> $<$<NOT:$<CONFIG:Debug>>:NDEBUG>)
COMPILE_DEFINITIONS $<$<CONFIG:Debug>:_DEBUG> $<$<NOT:$<CONFIG:Debug>>:NDEBUG>)
endif()
# Set compilation flags # Set compilation flags
if (MSVC AND NOT CXX_CLANG) if (MSVC AND NOT CXX_CLANG)