Browse Source
remove unneccessary stuff; move llvm-mingw to my git
Signed-off-by: crueter <crueter@eden-emu.dev>
pull/348/head
crueter
6 months ago
No known key found for this signature in database
GPG Key ID: 425ACD2D4830EBC6
4 changed files with
5 additions and
9 deletions
-
CMakeLists.txt
-
CMakeModules/CPM.cmake
-
cpmfile.json
-
src/CMakeLists.txt
|
|
|
@ -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_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) |
|
|
|
|
|
|
|
option(ENABLE_QT "Enable the Qt frontend" ON) |
|
|
|
@ -380,8 +380,6 @@ if (YUZU_USE_CPM) |
|
|
|
# boost |
|
|
|
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) |
|
|
|
|
|
|
|
# really annoying thing where boost::headers doesn't work with cpm |
|
|
|
|
|
|
|
@ -592,7 +592,6 @@ function(cpm_add_patches) |
|
|
|
list(APPEND temp_list "&&") |
|
|
|
endif() |
|
|
|
# Add the patch command to the list |
|
|
|
# use binary because DOS SUCKS |
|
|
|
list(APPEND temp_list "${PATCH_EXECUTABLE}" "-p1" "<" "${PATCH_FILE}") |
|
|
|
endforeach() |
|
|
|
|
|
|
|
|
|
|
|
@ -147,7 +147,8 @@ |
|
|
|
"cmake_filename": "sdl2" |
|
|
|
}, |
|
|
|
"llvm-mingw": { |
|
|
|
"repo": "crueter/llvm-mingw", |
|
|
|
"repo": "misc/llvm-mingw", |
|
|
|
"git_host": "git.crueter.xyz", |
|
|
|
"tag": "20250828", |
|
|
|
"version": "20250828", |
|
|
|
"artifact": "clang-rt-builtins.tar.zst", |
|
|
|
|
|
|
|
@ -14,10 +14,8 @@ if ((ARCHITECTURE_x86_64 OR ARCHITECTURE_arm64)) |
|
|
|
endif() |
|
|
|
|
|
|
|
# CMake seems to only define _DEBUG on Windows |
|
|
|
if (NOT (MSVC AND CXX_CLANG)) |
|
|
|
set_property(DIRECTORY APPEND PROPERTY |
|
|
|
COMPILE_DEFINITIONS $<$<CONFIG:Debug>:_DEBUG> $<$<NOT:$<CONFIG:Debug>>:NDEBUG>) |
|
|
|
endif() |
|
|
|
|
|
|
|
# Set compilation flags |
|
|
|
if (MSVC AND NOT CXX_CLANG) |
|
|
|
|