From 840c12073619ab63e0637d10296a021a33fc9026 Mon Sep 17 00:00:00 2001 From: pineappleEA Date: Tue, 1 Jun 2021 11:53:53 +0200 Subject: [PATCH] early-access version 1739 --- README.md | 2 +- externals/CMakeLists.txt | 22 ++++++++++++---------- 2 files changed, 13 insertions(+), 11 deletions(-) diff --git a/README.md b/README.md index 0de1bb6a1..8cd920773 100755 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ yuzu emulator early access ============= -This is the source code for early-access 1738. +This is the source code for early-access 1739. ## Legal Notice diff --git a/externals/CMakeLists.txt b/externals/CMakeLists.txt index fe1c088ca..aae0baa0b 100755 --- a/externals/CMakeLists.txt +++ b/externals/CMakeLists.txt @@ -47,19 +47,21 @@ target_include_directories(unicorn-headers INTERFACE ./unicorn/include) # SDL2 if (NOT SDL2_FOUND AND ENABLE_SDL2) - # Yuzu itself needs: Events Joystick Haptic Sensor Timers - # Yuzu-cmd also needs: Video (depends on Loadso/Dlopen) - set(SDL_UNUSED_SUBSYSTEMS - Atomic Audio Render Power Threads - File CPUinfo Filesystem Locale) - foreach(_SUB ${SDL_UNUSED_SUBSYSTEMS}) - string(TOUPPER ${_SUB} _OPT) - option(SDL_${_OPT} "" OFF) - endforeach() + if (NOT WIN32) + # Yuzu itself needs: Events Joystick Haptic Sensor Timers + # Yuzu-cmd also needs: Video (depends on Loadso/Dlopen) + set(SDL_UNUSED_SUBSYSTEMS + Atomic Audio Render Power Threads + File CPUinfo Filesystem Locale) + foreach(_SUB ${SDL_UNUSED_SUBSYSTEMS}) + string(TOUPPER ${_SUB} _OPT) + option(SDL_${_OPT} "" OFF) + endforeach() + option(HIDAPI "" ON) + endif() set(SDL_STATIC ON) set(SDL_SHARED OFF) - option(HIDAPI "" ON) add_subdirectory(SDL EXCLUDE_FROM_ALL) add_library(SDL2 ALIAS SDL2-static)