Skip to content

Commit 21611bf

Browse files
authored
Merge pull request hrydgard#21119 from white-axe/libretro-vfs
Fix libretro builds for iOS and Windows
2 parents 3f3b353 + aea42e2 commit 21611bf

4 files changed

Lines changed: 4 additions & 4 deletions

File tree

CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1676,7 +1676,7 @@ if(ANDROID)
16761676
endif()
16771677
endif()
16781678

1679-
if (IOS)
1679+
if (IOS AND NOT LIBRETRO)
16801680
set(nativeExtra ${nativeExtra} ${NativeAppSource})
16811681
endif()
16821682

libretro/LibretroD3D11Context.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
class LibretroD3D11Context : public LibretroHWRenderContext {
88
public:
9-
LibretroD3D11Context() : LibretroHWRenderContext(RETRO_HW_CONTEXT_DIRECT3D, 11) {}
9+
LibretroD3D11Context() : LibretroHWRenderContext(RETRO_HW_CONTEXT_D3D11, 11) {}
1010
bool Init() override;
1111

1212
void SwapBuffers() override;

libretro/LibretroGraphicsContext.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ LibretroGraphicsContext *LibretroGraphicsContext::CreateGraphicsContext() {
133133
#endif
134134

135135
#ifdef _WIN32
136-
if (preferred == RETRO_HW_CONTEXT_DUMMY || preferred == RETRO_HW_CONTEXT_DIRECT3D) {
136+
if (preferred == RETRO_HW_CONTEXT_DUMMY || preferred == RETRO_HW_CONTEXT_D3D11) {
137137
ctx = new LibretroD3D11Context();
138138

139139
if (ctx->Init()) {

0 commit comments

Comments
 (0)