mirror/yuzu
1
0
Fork 0
mirror of https://github.com/yuzu-emu/yuzu.git synced 2024-09-15 00:55:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix build on macOS and linux

Browse Source
This commit is contained in:
MerryMage 2018-01-13 22:14:04 +00:00
parent f95789a0b3
commit e86bdb1601
6 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CMakeModules/CopyCitraQt5Deps.cmake → CMakeModules/CopyYuzuQt5Deps.cmake
View File

@ -1,4 +1,4 @@
function(copy_citra_Qt5_deps target_dir) function(copy_yuzu_Qt5_deps target_dir)
include(WindowsCopyFiles) include(WindowsCopyFiles)
set(DLL_DEST "${CMAKE_BINARY_DIR}/bin/$<CONFIG>/") set(DLL_DEST "${CMAKE_BINARY_DIR}/bin/$<CONFIG>/")
set(Qt5_DLL_DIR "${Qt5_DIR}/../../../bin") set(Qt5_DLL_DIR "${Qt5_DIR}/../../../bin")
@ -14,4 +14,4 @@ function(copy_citra_Qt5_deps target_dir)
Qt5Widgets$<$<CONFIG:Debug>:d>.* Qt5Widgets$<$<CONFIG:Debug>:d>.*
) )
windows_copy_files(yuzu ${Qt5_PLATFORMS_DIR} ${PLATFORMS} qwindows$<$<CONFIG:Debug>:d>.*) windows_copy_files(yuzu ${Qt5_PLATFORMS_DIR} ${PLATFORMS} qwindows$<$<CONFIG:Debug>:d>.*)
endfunction(copy_citra_Qt5_deps) endfunction(copy_yuzu_Qt5_deps)

4
CMakeModules/CopyCitraSDLDeps.cmake → CMakeModules/CopyYuzuSDLDeps.cmake
View File

@ -1,5 +1,5 @@
function(copy_citra_SDL_deps target_dir) function(copy_yuzu_SDL_deps target_dir)
include(WindowsCopyFiles) include(WindowsCopyFiles)
set(DLL_DEST "${CMAKE_BINARY_DIR}/bin/$<CONFIG>/") set(DLL_DEST "${CMAKE_BINARY_DIR}/bin/$<CONFIG>/")
windows_copy_files(${target_dir} ${SDL2_DLL_DIR} ${DLL_DEST} SDL2.dll) windows_copy_files(${target_dir} ${SDL2_DLL_DIR} ${DLL_DEST} SDL2.dll)
endfunction(copy_citra_SDL_deps) endfunction(copy_yuzu_SDL_deps)

2
src/core/hle/lock.cpp
View File

@ -2,8 +2,6 @@
// Licensed under GPLv2 or any later version // Licensed under GPLv2 or any later version
// Refer to the license.txt file included. // Refer to the license.txt file included.
#pragma once
#include <core/hle/lock.h> #include <core/hle/lock.h>
namespace HLE { namespace HLE {

2
src/tests/core/memory/memory.cpp
View File

@ -7,7 +7,7 @@
#include "core/hle/kernel/process.h" #include "core/hle/kernel/process.h"
#include "core/memory.h" #include "core/memory.h"
TEST_CASE("Memory::IsValidVirtualAddress", "[core][memory]") { TEST_CASE("Memory::IsValidVirtualAddress", "[core][memory][!hide]") {
SECTION("these regions should not be mapped on an empty process") { SECTION("these regions should not be mapped on an empty process") {
auto process = Kernel::Process::Create(""); auto process = Kernel::Process::Create("");
CHECK(Memory::IsValidVirtualAddress(*process, Memory::PROCESS_IMAGE_VADDR) == false); CHECK(Memory::IsValidVirtualAddress(*process, Memory::PROCESS_IMAGE_VADDR) == false);

1
src/video_core/renderer_opengl/renderer_opengl.cpp
View File

@ -4,6 +4,7 @@
#include <algorithm> #include <algorithm>
#include <cstddef> #include <cstddef>
#include <cstring>
#include <cstdlib> #include <cstdlib>
#include <memory> #include <memory>
#include <glad/glad.h> #include <glad/glad.h>

8
src/yuzu/CMakeLists.txt
View File

@ -70,7 +70,9 @@ else()
endif() endif()
if (APPLE) if (APPLE)
set(MACOSX_ICON "../../dist/citra.icns") if (EXISTS "../../dist/yuzu.icns")
set(MACOSX_ICON "../../dist/yuzu.icns")
endif()
set_source_files_properties(${MACOSX_ICON} PROPERTIES MACOSX_PACKAGE_LOCATION Resources) set_source_files_properties(${MACOSX_ICON} PROPERTIES MACOSX_PACKAGE_LOCATION Resources)
add_executable(yuzu MACOSX_BUNDLE ${SRCS} ${HEADERS} ${UI_HDRS} ${MACOSX_ICON}) add_executable(yuzu MACOSX_BUNDLE ${SRCS} ${HEADERS} ${UI_HDRS} ${MACOSX_ICON})
set_target_properties(yuzu PROPERTIES MACOSX_BUNDLE_INFO_PLIST ${CMAKE_CURRENT_SOURCE_DIR}/Info.plist) set_target_properties(yuzu PROPERTIES MACOSX_BUNDLE_INFO_PLIST ${CMAKE_CURRENT_SOURCE_DIR}/Info.plist)
@ -89,7 +91,7 @@ if (MSVC)
include(CopyCitraQt5Deps) include(CopyCitraQt5Deps)
include(CopyCitraSDLDeps) include(CopyCitraSDLDeps)
include(CopyYuzuUnicornDeps) include(CopyYuzuUnicornDeps)
copy_citra_Qt5_deps(yuzu) copy_yuzu_Qt5_deps(yuzu)
copy_citra_SDL_deps(yuzu) copy_yuzu_SDL_deps(yuzu)
copy_yuzu_unicorn_deps(yuzu) copy_yuzu_unicorn_deps(yuzu)
endif() endif()