Skip to content

Commit 717fbad

Browse files
author
fdelapena
authored
Merge pull request #2978 from Ghabry/fixes
Fixes
2 parents ad2516d + 9509c2b commit 717fbad

File tree

28 files changed

+594
-120
lines changed

28 files changed

+594
-120
lines changed

CMakeLists.txt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1263,6 +1263,10 @@ else()
12631263
target_link_libraries(easyrpg_libretro ${PROJECT_NAME})
12641264
set_target_properties(easyrpg_libretro PROPERTIES PREFIX "")
12651265
set(PLAYER_TEST_LIBRARIES "easyrpg_libretro")
1266+
1267+
if(WIN32)
1268+
set_property(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} PROPERTY VS_STARTUP_PROJECT easyrpg_libretro)
1269+
endif()
12661270
elseif(ANDROID AND ${PLAYER_TARGET_PLATFORM} STREQUAL "SDL2")
12671271
add_library(easyrpg_android
12681272
src/platform/android/android.h

CMakePresets.json

Lines changed: 312 additions & 16 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ EasyRPG Player makes use of the following 3rd party software:
101101

102102
* [Baekmuk] font family (Korean) - Copyright (c) 1986-2002 Kim Jeong-Hwan,
103103
provided under the Baekmuk License
104-
* [Shinonome] font familiy (Japanese) - Copyright (c) 1999-2000 Yasuyuki
104+
* [Shinonome] font family (Japanese) - Copyright (c) 1999-2000 Yasuyuki
105105
Furukawa and contributors, provided under public domain. Glyphs were added
106106
and modified for use in EasyRPG Player, all changes under public domain.
107107
* [ttyp0] font family - Copyright (c) 2012-2015 Uwe Waldmann, provided under

builds/android/app/src/main/java/org/libsdl/app/SDLActivity.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ public class SDLActivity extends Activity implements View.OnSystemUiVisibilityCh
6363
private static final String TAG = "SDL";
6464
private static final int SDL_MAJOR_VERSION = 2;
6565
private static final int SDL_MINOR_VERSION = 26;
66-
private static final int SDL_MICRO_VERSION = 4;
66+
private static final int SDL_MICRO_VERSION = 5;
6767
/*
6868
// Display InputType.SOURCE/CLASS of events and devices
6969
//

0 commit comments

Comments
 (0)