Skip to content

Commit bac747f

Browse files
committed
Fix paths
1 parent 0f315f5 commit bac747f

4 files changed

Lines changed: 27 additions & 5 deletions

File tree

cmake/yup_modules.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -707,7 +707,7 @@ function (yup_add_module module_path modules_definitions module_group)
707707

708708
# ==== Prepare include paths
709709
get_filename_component (module_include_path ${module_path} DIRECTORY)
710-
list (APPEND module_include_paths "${module_include_path}")
710+
list (APPEND module_include_paths "${module_include_path}" "${module_path}")
711711

712712
if (module_upstream OR module_repository)
713713
_yup_module_get_upstream_path ("${module_name}" "${module_path}" module_upstream_path)

modules/yup_audio_formats/formats/yup_Mp3AudioFormat.cpp

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -467,12 +467,11 @@ const String& Mp3AudioFormat::getFormatName() const
467467

468468
Array<String> Mp3AudioFormat::getFileExtensions ([[maybe_unused]] Mode handleMode) const
469469
{
470-
if (handleMode == Mode::forReading)
471-
return { ".mp3" };
472-
473470
#if YUP_MODULE_AVAILABLE_hmp3_library
474471
return { ".mp3" };
475472
#else
473+
if (handleMode == Mode::forReading)
474+
return { ".mp3" };
476475
return {};
477476
#endif
478477
}

modules/yup_audio_formats/formats/yup_WindowsMediaAudioFormat.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1266,7 +1266,7 @@ const String& WindowsMediaAudioFormat::getFormatName() const
12661266
return formatName;
12671267
}
12681268

1269-
Array<String> WindowsMediaAudioFormat::getFileExtensions ([[maybe_unused]] Mode handleMode) const
1269+
Array<String> WindowsMediaAudioFormat::getFileExtensions ([[maybe_unused]] Mode handleMode) const
12701270
{
12711271
return { ".m4a", ".mp4", ".aac", ".wma", ".wm", ".wmv", ".asf", ".mp3" };
12721272
}
Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
#ifndef __CONFIG_TYPES_H__
2+
#define __CONFIG_TYPES_H__
3+
4+
#if __has_include(<inttypes.h>)
5+
#include <inttypes.h>
6+
#endif
7+
8+
#if __has_include(<stdint.h>)
9+
#include <stdint.h>
10+
#endif
11+
12+
#if __has_include(<sys/types.h>)
13+
#include <sys/types.h>
14+
#endif
15+
16+
typedef int16_t ogg_int16_t;
17+
typedef unsigned short ogg_uint16_t;
18+
typedef int32_t ogg_int32_t;
19+
typedef unsigned int ogg_uint32_t;
20+
typedef int64_t ogg_int64_t;
21+
typedef unsigned long long ogg_uint64_t;
22+
23+
#endif

0 commit comments

Comments
 (0)