Skip to content

Commit d6ff81f

Browse files
author
fdelapena
authored
Merge pull request #3318 from Ghabry/cleanup
Fix compiler warnings, bump deps etc.
2 parents 89c9036 + c67693a commit d6ff81f

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

52 files changed

+284
-346
lines changed

‎.github/workflows/stable-compilation.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,7 @@ jobs:
6565
VER="(GA, `date +%Y-%m-%d`)"
6666
cmake -G Ninja -B build . \
6767
-DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr \
68+
-DCMAKE_CXX_FLAGS="-Wall -Wextra -Wdeprecated -fsanitize=address,undefined" \
6869
-DPLAYER_BUILD_LIBLCF=ON -DPLAYER_VERSION_APPEND="$VER"
6970
cmake --build build
7071

‎CMakeLists.txt‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -648,7 +648,6 @@ elseif(${PLAYER_TARGET_PLATFORM} STREQUAL "3ds")
648648
$<TARGET_OBJECTS:3ds-assets> PRIVATE
649649
src/platform/3ds/audio.cpp
650650
src/platform/3ds/audio.h
651-
src/platform/3ds/clock.cpp
652651
src/platform/3ds/clock.h
653652
src/platform/3ds/input_buttons.cpp
654653
src/platform/3ds/ui.cpp
@@ -661,7 +660,6 @@ elseif(${PLAYER_TARGET_PLATFORM} STREQUAL "psvita")
661660
target_sources(${PROJECT_NAME} PRIVATE
662661
src/platform/psvita/audio.cpp
663662
src/platform/psvita/audio.h
664-
src/platform/psvita/clock.cpp
665663
src/platform/psvita/clock.h
666664
src/platform/psvita/input_buttons.cpp
667665
src/platform/psvita/ui.cpp
@@ -679,7 +677,6 @@ elseif(${PLAYER_TARGET_PLATFORM} STREQUAL "switch")
679677
$<TARGET_OBJECTS:switch-assets> PRIVATE
680678
src/platform/switch/audio.cpp
681679
src/platform/switch/audio.h
682-
src/platform/switch/clock.cpp
683680
src/platform/switch/clock.h
684681
src/platform/switch/input_buttons.cpp
685682
src/platform/switch/ui.cpp
@@ -692,7 +689,6 @@ elseif(${PLAYER_TARGET_PLATFORM} STREQUAL "wii")
692689
target_sources(${PROJECT_NAME} PRIVATE
693690
src/platform/wii/audio.cpp
694691
src/platform/wii/audio.h
695-
src/platform/wii/clock.cpp
696692
src/platform/wii/clock.h
697693
src/platform/wii/input_buttons.cpp
698694
src/platform/sdl/axis.h
@@ -845,8 +841,9 @@ else()
845841
endif()
846842

847843
# Detect all required libraries
848-
player_find_package(NAME PNG TARGET PNG::PNG REQUIRED)
849-
player_find_package(NAME fmt TARGET fmt::fmt REQUIRED)
844+
# PNG pulls in zlib which has a broken config when not both static and shared library are installed
845+
player_find_package(NAME PNG TARGET PNG::PNG REQUIRED CONFIG_BROKEN)
846+
player_find_package(NAME fmt TARGET fmt::fmt VERSION 5.2 REQUIRED)
850847

851848
# Do not use player_find_package. enable_language used by pixman on Android does not work properly inside function calls
852849
find_package(Pixman REQUIRED)

‎Makefile.am‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
ACLOCAL_AMFLAGS = --install -I builds/autoconf/m4
22

3-
EXTRA_DIST = CMakeLists.txt README.md builds docs resources
3+
EXTRA_DIST = CMakeLists.txt CMakePresets.json README.md builds docs resources
44
MOSTLYCLEANFILES = $(DX_CLEANFILES)
55

66
bin_PROGRAMS = easyrpg-player
@@ -528,13 +528,13 @@ EXTRA_DIST += \
528528
bench/variables.cpp \
529529
src/platform/3ds/audio.cpp \
530530
src/platform/3ds/audio.h \
531-
src/platform/3ds/clock.cpp \
532531
src/platform/3ds/clock.h \
533532
src/platform/3ds/input_buttons.cpp \
534533
src/platform/3ds/main.cpp \
535534
src/platform/3ds/ui.cpp \
536535
src/platform/3ds/ui.h \
537536
src/platform/amigaos4/cmath \
537+
src/platform/android/android.cpp \
538538
src/platform/android/android.h \
539539
src/platform/android/filesystem_apk.cpp \
540540
src/platform/android/filesystem_apk.h \
@@ -560,24 +560,26 @@ EXTRA_DIST += \
560560
src/platform/psp/psp_input_buttons.cpp \
561561
src/platform/psvita/audio.cpp \
562562
src/platform/psvita/audio.h \
563-
src/platform/psvita/clock.cpp \
564563
src/platform/psvita/clock.h \
565564
src/platform/psvita/input_buttons.cpp \
566565
src/platform/psvita/main.cpp \
567566
src/platform/psvita/ui.cpp \
568567
src/platform/psvita/ui.h \
569568
src/platform/switch/audio.cpp \
570569
src/platform/switch/audio.h \
571-
src/platform/switch/clock.cpp \
572570
src/platform/switch/clock.h \
573571
src/platform/switch/input_buttons.cpp \
574572
src/platform/switch/main.cpp \
575573
src/platform/switch/ui.cpp \
576574
src/platform/switch/ui.h \
577-
src/platform/wii/clock.cpp \
575+
src/platform/wii/audio.cpp \
576+
src/platform/wii/audio.h \
578577
src/platform/wii/clock.h \
579578
src/platform/wii/input_buttons.cpp \
580579
src/platform/wii/main.cpp \
580+
src/platform/wiiu/input_buttons.cpp \
581+
src/platform/wiiu/main.cpp \
582+
src/platform/wiiu/main.h \
581583
src/platform/windows/midiout_device_win32.cpp \
582584
src/platform/windows/midiout_device_win32.h \
583585
src/platform/windows/utils.cpp \

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

Lines changed: 3 additions & 3 deletions
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 = 30;
66-
private static final int SDL_MICRO_VERSION = 6;
66+
private static final int SDL_MICRO_VERSION = 11;
6767
/*
6868
// Display InputType.SOURCE/CLASS of events and devices
6969
//
@@ -91,7 +91,7 @@ public static void debugSource(int sources, String prefix) {
9191
| InputDevice.SOURCE_CLASS_POSITION
9292
| InputDevice.SOURCE_CLASS_TRACKBALL);
9393
94-
if (s2 != 0) cls += "Some_Unkown";
94+
if (s2 != 0) cls += "Some_Unknown";
9595
9696
s2 = s_copy & InputDevice.SOURCE_ANY; // keep source only, no class;
9797
@@ -165,7 +165,7 @@ public static void debugSource(int sources, String prefix) {
165165
if (s == FLAG_TAINTED) src += " FLAG_TAINTED";
166166
s2 &= ~FLAG_TAINTED;
167167
168-
if (s2 != 0) src += " Some_Unkown";
168+
if (s2 != 0) src += " Some_Unknown";
169169
170170
Log.v(TAG, prefix + "int=" + s_copy + " CLASS={" + cls + " } source(s):" + src);
171171
}

‎builds/cmake/Modules/PlayerFindPackage.cmake‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,8 @@ function(player_find_package)
5151

5252
set(MODULE "")
5353
if(PLAYER_FIND_PACKAGE_CONFIG_BROKEN)
54+
set(CMAKE_FIND_PACKAGE_PREFER_CONFIG_OLD ${CMAKE_FIND_PACKAGE_PREFER_CONFIG})
55+
set(CMAKE_FIND_PACKAGE_PREFER_CONFIG OFF)
5456
set(MODULE "MODULE")
5557
endif()
5658

@@ -69,7 +71,7 @@ function(player_find_package)
6971
set(DEP_FOUND TRUE)
7072

7173
if(${PLAYER_FIND_PACKAGE_NAME}_DIR)
72-
message(STATUS "Found ${PLAYER_FIND_PACKAGE_NAME}: ${${PLAYER_FIND_PACKAGE_NAME}_DIR} (${TARGET_ITEM})")
74+
message(STATUS "Found ${PLAYER_FIND_PACKAGE_NAME}: ${${PLAYER_FIND_PACKAGE_NAME}_DIR} (${TARGET_ITEM}, v${${PLAYER_FIND_PACKAGE_NAME}_VERSION})")
7375
endif()
7476

7577
target_link_libraries(${PROJECT_NAME} ${TARGET_ITEM})
@@ -85,4 +87,8 @@ function(player_find_package)
8587
message(STATUS "Could NOT find ${PLAYER_FIND_PACKAGE_NAME} (missing: ${PLAYER_FIND_PACKAGE_NAME}Config.cmake)")
8688
endif()
8789
endif()
90+
91+
if(PLAYER_FIND_PACKAGE_CONFIG_BROKEN)
92+
set(CMAKE_FIND_PACKAGE_PREFER_CONFIG ${CMAKE_FIND_PACKAGE_PREFER_CONFIG_OLD})
93+
endif()
8894
endfunction()

‎src/audio_decoder_midi.cpp‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,6 @@
2424

2525
using namespace std::chrono_literals;
2626

27-
constexpr int AudioDecoderMidi::midi_default_tempo;
28-
2927
constexpr int bytes_per_sample = sizeof(int16_t) * 2;
3028

3129
// ~1.5 ms of MIDI message resolution

‎src/audio_generic.h‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,6 @@ class GenericAudio : public AudioInterface {
109109
BgmChannel BGM_Channels[nr_of_bgm_channels];
110110
SeChannel SE_Channels[nr_of_se_channels];
111111
mutable bool BGM_PlayedOnceIndicator;
112-
bool Muted;
113112

114113
std::vector<int16_t> sample_buffer = {};
115114
std::vector<uint8_t> scrap_buffer = {};

‎src/audio_midi.cpp‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,8 @@ std::unique_ptr<AudioDecoderBase> MidiDecoder::CreateFluidsynth(bool resample) {
8484
if (mididec && resample) {
8585
mididec = std::make_unique<AudioResampler>(std::move(mididec));
8686
}
87+
#else
88+
(void)resample;
8789
#endif
8890

8991
return mididec;
@@ -107,6 +109,8 @@ std::unique_ptr<AudioDecoderBase> MidiDecoder::CreateWildMidi(bool resample) {
107109
if (mididec && resample) {
108110
mididec = std::make_unique<AudioResampler>(std::move(mididec));
109111
}
112+
#else
113+
(void)resample;
110114
#endif
111115

112116
return mididec;
@@ -126,6 +130,8 @@ std::unique_ptr<AudioDecoderBase> MidiDecoder::CreateFmMidi(bool resample) {
126130
if (mididec && resample) {
127131
mididec = std::make_unique<AudioResampler>(std::move(mididec));
128132
}
133+
#else
134+
(void)resample;
129135
#endif
130136

131137
return mididec;
@@ -152,6 +158,8 @@ void MidiDecoder::ChangeFluidsynthSoundfont(StringView sf_path) {
152158
// Was initialized before
153159
works.fluidsynth = FluidSynthDecoder::ChangeGlobalSoundfont(sf_path, works.fluidsynth_status);
154160
Output::Debug("Fluidsynth: {}", works.fluidsynth_status);
161+
#else
162+
(void)sf_path;
155163
#endif
156164
}
157165

‎src/autobattle.cpp‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -40,10 +40,6 @@ template <typename... Args>
4040
static void DebugLog(const char*, Args&&...) {}
4141
#endif
4242

43-
constexpr decltype(RpgRtCompat::name) RpgRtCompat::name;
44-
constexpr decltype(AttackOnly::name) AttackOnly::name;
45-
constexpr decltype(RpgRtImproved::name) RpgRtImproved::name;
46-
4743
std::unique_ptr<AlgorithmBase> CreateAlgorithm(StringView name) {
4844
if (Utils::StrICmp(name, RpgRtImproved::name) == 0) {
4945
return std::make_unique<RpgRtImproved>();
@@ -304,7 +300,7 @@ void SelectAutoBattleAction(Game_Actor& source,
304300
}
305301
}
306302
}
307-
DebugLog("AUTOBATTLE: Actor {} Best Skill Rank : {}({}): {}", source.GetName(), skill->name, skill->ID, skill_rank);
303+
DebugLog("AUTOBATTLE: Actor {} Best Skill Rank : {}({}): {}", source.GetName(), skill ? skill->name : "None", skill ? skill->ID : 0, skill_rank);
308304
}
309305

310306
double normal_attack_rank = CalcNormalAttackAutoBattleRank(source, weapon, cond, attack_variance, emulate_bugs);

‎src/decoder_fluidsynth.cpp‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -198,7 +198,6 @@ FluidSynthDecoder::FluidSynthDecoder() {
198198
// Sharing is only not possible when a Midi is played as a SE (unlikely)
199199
if (instances > 1) {
200200
std::string error_message;
201-
int unused = -1;
202201
local_synth = create_synth(error_message);
203202
if (!local_synth) {
204203
// unlikely, the SF was already allocated once

0 commit comments

Comments
 (0)