Emulator-Archive/ppsspp
1
0
Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2024-11-23 21:39:52 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

(Libretro) Buildfixes

Browse Source
This commit is contained in:
twinaphex 2020-07-10 06:48:20 +02:00
parent 143d54aa12
commit 649f12f8ab
2 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Core/HLE/sceUsbCam.cpp
View File

@ -26,7 +26,11 @@
#include "Core/HW/Camera.h"
#include "Core/MemMapHelpers.h"
#if defined(_WIN32) && !PPSSPP_PLATFORM(UWP)
#if defined(_WIN32) && !PPSSPP_PLATFORM(UWP) && !defined(__LIBRETRO__)
#define HAVE_WIN32_CAMERA
#endif
#ifdef HAVE_WIN32_CAMERA
#ifndef NOMINMAX
#define NOMINMAX
#endif
@ -300,7 +304,7 @@ void Register_sceUsbCam()
}
std::vector<std::string> Camera::getDeviceList() {
#if defined(_WIN32) && !PPSSPP_PLATFORM(UWP)
#ifdef HAVE_WIN32_CAMERA
if (winCamera) {
return winCamera->getDeviceList();
}
@ -320,7 +324,7 @@ int Camera::startCapture() {
INFO_LOG(HLE, "%s resolution: %dx%d", __FUNCTION__, width, height);
config->mode = Camera::Mode::Video;
#if defined(_WIN32) && !PPSSPP_PLATFORM(UWP)
#ifdef HAVE_WIN32_CAMERA
if (winCamera) {
if (winCamera->isShutDown()) {
delete winCamera;
@ -344,7 +348,7 @@ int Camera::startCapture() {
int Camera::stopCapture() {
INFO_LOG(HLE, "%s", __FUNCTION__);
#if defined(_WIN32) && !PPSSPP_PLATFORM(UWP)
#ifdef HAVE_WIN32_CAMERA
if (winCamera) {
winCamera->sendMessage({ CAPTUREDEVIDE_COMMAND::STOP, nullptr });
}

4
libretro/Makefile.common
View File

@ -308,6 +308,7 @@ SOURCES_CXX += $(NATIVEDIR)/math/dataconv.cpp \
$(NATIVEDIR)/thin3d/DataFormatGL.cpp \
$(NATIVEDIR)/thread/threadutil.cpp \
$(NATIVEDIR)/thread/threadpool.cpp \
$(NATIVEDIR)/thread/prioritizedworkqueue.cpp \
$(NATIVEDIR)/ui/root.cpp \
$(NATIVEDIR)/ui/screen.cpp \
$(NATIVEDIR)/ui/ui.cpp \
@ -478,7 +479,8 @@ SOURCES_CXX += $(NATIVEDIR)/math/dataconv.cpp \
$(COREDIR)/Util/PPGeDraw.cpp \
$(COREDIR)/Util/AudioFormat.cpp \
$(EXTDIR)/disarm.cpp \
$(CORE_DIR)/UI/TextureUtil.cpp
$(CORE_DIR)/UI/TextureUtil.cpp \
$(CORE_DIR)/UI/GameInfoCache.cpp
SOURCES_CXX += $(COREDIR)/HLE/__sceAudio.cpp