Skip to content

Commit b02465b

Browse files
kunitokikunitoki
committed
More blind fixes
1 parent 2dfc469 commit b02465b

File tree

5 files changed

+38
-33
lines changed

5 files changed

+38
-33
lines changed

‎cmake/yup_utilities.cmake‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -208,6 +208,15 @@ endfunction()
208208
function (_yup_collect_upstream_candidate_paths module_name module_path output_variable)
209209
set (candidate_paths "${module_path}/upstream")
210210

211+
if (DEFINED YUP_UPSTREAM_ROOT AND NOT "${YUP_UPSTREAM_ROOT}" STREQUAL "")
212+
list (APPEND candidate_paths "${YUP_UPSTREAM_ROOT}/${module_name}/upstream")
213+
endif()
214+
215+
if (CMAKE_SOURCE_DIR)
216+
list (APPEND candidate_paths "${CMAKE_SOURCE_DIR}/build/externals/${module_name}/upstream")
217+
list (APPEND candidate_paths "${CMAKE_SOURCE_DIR}/../build/externals/${module_name}/upstream")
218+
endif()
219+
211220
set (candidate_root "${CMAKE_BINARY_DIR}")
212221
set (max_depth 10)
213222
while (max_depth GREATER 0)

‎docs/YUP Module Format.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@ Possible values:
135135
- (Optional) A list (space or comma-separated) of macro defines needed by this module.
136136

137137
- searchpaths
138-
- (Optional) A space-separated list of internal include paths, relative to the module's parent folder, which need to be added to a project's header search path.
138+
- (Optional) A space-separated list of internal include paths, relative to the module's parent folder or the upstream checkout folder, which need to be added to a project's header search path.
139139

140140
- [android|apple|ios|linux|mobile|msft|osx|wasm|win32|windows]CppStandard
141141
- (Optional) A number indicating the minimum C++ language standard that is required for this module and this platform exclusively. This must be just the standard number with no prefix e.g. 20 for C++20.
@@ -156,7 +156,7 @@ Possible values:
156156
- (Optional) A list (space or comma-separated) of link options needed by this module in a build.
157157

158158
- [android|apple|ios|linux|mobile|msft|osx|wasm|win32|windows]Searchpaths
159-
- (Optional) A space-separated list of internal include paths, relative to the module's parent folder, which need to be added to a project's header search path.
159+
- (Optional) A space-separated list of internal include paths, relative to the module's parent folder or the upstream checkout folder, which need to be added to a project's header search path.
160160

161161
- [ios|osx|apple]Frameworks
162162
- (Optional) A list (space or comma-separated) of iOS/macOS/Apple frameworks that are needed by this module.

‎thirdparty/flac_library/flac_include_pre.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,6 @@
1919
==============================================================================
2020
*/
2121

22-
#include "flac_library.h"
23-
2422
#if defined _WIN32 && !defined __CYGWIN__
2523
#include <io.h>
2624
#else
@@ -168,3 +166,5 @@
168166
#ifndef NDEBUG
169167
#define NDEBUG // (some flac code prints cpu info if this isn't defined)
170168
#endif
169+
170+
#include "flac_library.h"

‎thirdparty/flac_library/flac_library_1.c‎

Lines changed: 24 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -19,33 +19,31 @@
1919
==============================================================================
2020
*/
2121

22-
#include "flac_library.h"
23-
2422
#include "flac_include_pre.h"
2523

26-
#include <libFLAC/bitmath.c>
27-
#include <libFLAC/bitreader.c>
28-
#include <libFLAC/bitwriter.c>
29-
#include <libFLAC/cpu.c>
30-
#include <libFLAC/crc.c>
31-
#include <libFLAC/fixed.c>
32-
#include <libFLAC/float.c>
33-
#include <libFLAC/format.c>
34-
#include <libFLAC/lpc.c>
35-
#include <libFLAC/lpc_intrin_avx2.c>
36-
#include <libFLAC/lpc_intrin_fma.c>
37-
#include <libFLAC/lpc_intrin_neon.c>
38-
#include <libFLAC/lpc_intrin_sse2.c>
39-
#include <libFLAC/lpc_intrin_sse41.c>
40-
#include <libFLAC/md5.c>
41-
#include <libFLAC/memory.c>
42-
//#include <libFLAC/metadata_iterators.c>
43-
//#include <libFLAC/metadata_object.c>
44-
#include <libFLAC/stream_decoder.c>
45-
#include <libFLAC/stream_encoder_framing.c>
46-
#include <libFLAC/stream_encoder_intrin_avx2.c>
47-
#include <libFLAC/stream_encoder_intrin_sse2.c>
48-
#include <libFLAC/stream_encoder_intrin_ssse3.c>
49-
#include <libFLAC/window.c>
24+
#include "bitmath.c"
25+
#include "bitreader.c"
26+
#include "bitwriter.c"
27+
#include "cpu.c"
28+
#include "crc.c"
29+
#include "fixed.c"
30+
#include "float.c"
31+
#include "format.c"
32+
#include "lpc.c"
33+
#include "lpc_intrin_avx2.c"
34+
#include "lpc_intrin_fma.c"
35+
#include "lpc_intrin_neon.c"
36+
#include "lpc_intrin_sse2.c"
37+
#include "lpc_intrin_sse41.c"
38+
#include "md5.c"
39+
#include "memory.c"
40+
//#include "metadata_iterators.c"
41+
//#include "metadata_object.c"
42+
#include "stream_decoder.c"
43+
#include "stream_encoder_framing.c"
44+
#include "stream_encoder_intrin_avx2.c"
45+
#include "stream_encoder_intrin_sse2.c"
46+
#include "stream_encoder_intrin_ssse3.c"
47+
#include "window.c"
5048

5149
#include "flac_include_post.h"

‎thirdparty/flac_library/flac_library_2.c‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,8 @@
1919
==============================================================================
2020
*/
2121

22-
#include "flac_library.h"
23-
2422
#include "flac_include_pre.h"
2523

26-
#include <libFLAC/stream_encoder.c>
24+
#include "stream_encoder.c"
2725

2826
#include "flac_include_post.h"

0 commit comments

Comments
 (0)