mirror of
https://github.com/moonlight-stream/moonlight-ios.git
synced 2025-07-02 07:46:16 +00:00
Fix simulator builds and update to libopus v1.4
- Split library search paths into simulator and native targets - Fixed incorrectly removed arm64 split from SDL simulator libraries - Added simulator builds for opus libraries
This commit is contained in:
parent
b81ea6b874
commit
3ebcc86f0d
@ -1179,12 +1179,18 @@
|
|||||||
"$(inherited)",
|
"$(inherited)",
|
||||||
"@executable_path/Frameworks",
|
"@executable_path/Frameworks",
|
||||||
);
|
);
|
||||||
LIBRARY_SEARCH_PATHS = (
|
"LIBRARY_SEARCH_PATHS[sdk=appletvos*]" = (
|
||||||
"$(inherited)",
|
"$(inherited)",
|
||||||
"$(PROJECT_DIR)/libs/opus/lib/tvOS",
|
"$(PROJECT_DIR)/libs/opus/lib/tvOS",
|
||||||
"$(PROJECT_DIR)/libs/SDL2/lib/tvOS",
|
"$(PROJECT_DIR)/libs/SDL2/lib/tvOS",
|
||||||
"$(PROJECT_DIR)/libs/FFmpeg/lib/tvOS",
|
"$(PROJECT_DIR)/libs/FFmpeg/lib/tvOS",
|
||||||
);
|
);
|
||||||
|
"LIBRARY_SEARCH_PATHS[sdk=appletvsimulator*]" = (
|
||||||
|
"$(inherited)",
|
||||||
|
"$(PROJECT_DIR)/libs/opus/lib/tvOS-Sim",
|
||||||
|
"$(PROJECT_DIR)/libs/SDL2/lib/tvOS-Sim",
|
||||||
|
"$(PROJECT_DIR)/libs/FFmpeg/lib/tvOS-Sim",
|
||||||
|
);
|
||||||
MARKETING_VERSION = 8.5.0;
|
MARKETING_VERSION = 8.5.0;
|
||||||
MTL_ENABLE_DEBUG_INFO = YES;
|
MTL_ENABLE_DEBUG_INFO = YES;
|
||||||
PRODUCT_BUNDLE_IDENTIFIER = "com.moonlight-stream.Moonlight";
|
PRODUCT_BUNDLE_IDENTIFIER = "com.moonlight-stream.Moonlight";
|
||||||
@ -1228,12 +1234,18 @@
|
|||||||
"$(inherited)",
|
"$(inherited)",
|
||||||
"@executable_path/Frameworks",
|
"@executable_path/Frameworks",
|
||||||
);
|
);
|
||||||
LIBRARY_SEARCH_PATHS = (
|
"LIBRARY_SEARCH_PATHS[sdk=appletvos*]" = (
|
||||||
"$(inherited)",
|
"$(inherited)",
|
||||||
"$(PROJECT_DIR)/libs/opus/lib/tvOS",
|
"$(PROJECT_DIR)/libs/opus/lib/tvOS",
|
||||||
"$(PROJECT_DIR)/libs/SDL2/lib/tvOS",
|
"$(PROJECT_DIR)/libs/SDL2/lib/tvOS",
|
||||||
"$(PROJECT_DIR)/libs/FFmpeg/lib/tvOS",
|
"$(PROJECT_DIR)/libs/FFmpeg/lib/tvOS",
|
||||||
);
|
);
|
||||||
|
"LIBRARY_SEARCH_PATHS[sdk=appletvsimulator*]" = (
|
||||||
|
"$(inherited)",
|
||||||
|
"$(PROJECT_DIR)/libs/opus/lib/tvOS-Sim",
|
||||||
|
"$(PROJECT_DIR)/libs/SDL2/lib/tvOS-Sim",
|
||||||
|
"$(PROJECT_DIR)/libs/FFmpeg/lib/tvOS-Sim",
|
||||||
|
);
|
||||||
MARKETING_VERSION = 8.5.0;
|
MARKETING_VERSION = 8.5.0;
|
||||||
MTL_ENABLE_DEBUG_INFO = NO;
|
MTL_ENABLE_DEBUG_INFO = NO;
|
||||||
PRODUCT_BUNDLE_IDENTIFIER = "com.moonlight-stream.Moonlight";
|
PRODUCT_BUNDLE_IDENTIFIER = "com.moonlight-stream.Moonlight";
|
||||||
@ -1378,12 +1390,18 @@
|
|||||||
"$(inherited)",
|
"$(inherited)",
|
||||||
"@executable_path/Frameworks",
|
"@executable_path/Frameworks",
|
||||||
);
|
);
|
||||||
LIBRARY_SEARCH_PATHS = (
|
"LIBRARY_SEARCH_PATHS[sdk=iphoneos*]" = (
|
||||||
"$(inherited)",
|
"$(inherited)",
|
||||||
"$(PROJECT_DIR)/libs/opus/lib/iOS",
|
"$(PROJECT_DIR)/libs/opus/lib/iOS",
|
||||||
"$(PROJECT_DIR)/libs/SDL2/lib/iOS",
|
"$(PROJECT_DIR)/libs/SDL2/lib/iOS",
|
||||||
"$(PROJECT_DIR)/libs/FFmpeg/lib/iOS",
|
"$(PROJECT_DIR)/libs/FFmpeg/lib/iOS",
|
||||||
);
|
);
|
||||||
|
"LIBRARY_SEARCH_PATHS[sdk=iphonesimulator*]" = (
|
||||||
|
"$(inherited)",
|
||||||
|
"$(PROJECT_DIR)/libs/opus/lib/iOS-Sim",
|
||||||
|
"$(PROJECT_DIR)/libs/SDL2/lib/iOS-Sim",
|
||||||
|
"$(PROJECT_DIR)/libs/FFmpeg/lib/iOS-Sim",
|
||||||
|
);
|
||||||
MARKETING_VERSION = 8.5.0;
|
MARKETING_VERSION = 8.5.0;
|
||||||
PRODUCT_BUNDLE_IDENTIFIER = "com.moonlight-stream.$(PRODUCT_NAME:rfc1034identifier)";
|
PRODUCT_BUNDLE_IDENTIFIER = "com.moonlight-stream.$(PRODUCT_NAME:rfc1034identifier)";
|
||||||
PRODUCT_NAME = "$(TARGET_NAME)";
|
PRODUCT_NAME = "$(TARGET_NAME)";
|
||||||
@ -1420,12 +1438,18 @@
|
|||||||
"$(inherited)",
|
"$(inherited)",
|
||||||
"@executable_path/Frameworks",
|
"@executable_path/Frameworks",
|
||||||
);
|
);
|
||||||
LIBRARY_SEARCH_PATHS = (
|
"LIBRARY_SEARCH_PATHS[sdk=iphoneos*]" = (
|
||||||
"$(inherited)",
|
"$(inherited)",
|
||||||
"$(PROJECT_DIR)/libs/opus/lib/iOS",
|
"$(PROJECT_DIR)/libs/opus/lib/iOS",
|
||||||
"$(PROJECT_DIR)/libs/SDL2/lib/iOS",
|
"$(PROJECT_DIR)/libs/SDL2/lib/iOS",
|
||||||
"$(PROJECT_DIR)/libs/FFmpeg/lib/iOS",
|
"$(PROJECT_DIR)/libs/FFmpeg/lib/iOS",
|
||||||
);
|
);
|
||||||
|
"LIBRARY_SEARCH_PATHS[sdk=iphonesimulator*]" = (
|
||||||
|
"$(inherited)",
|
||||||
|
"$(PROJECT_DIR)/libs/opus/lib/iOS-Sim",
|
||||||
|
"$(PROJECT_DIR)/libs/SDL2/lib/iOS-Sim",
|
||||||
|
"$(PROJECT_DIR)/libs/FFmpeg/lib/iOS-Sim",
|
||||||
|
);
|
||||||
MARKETING_VERSION = 8.5.0;
|
MARKETING_VERSION = 8.5.0;
|
||||||
PRODUCT_BUNDLE_IDENTIFIER = "com.moonlight-stream.$(PRODUCT_NAME:rfc1034identifier)";
|
PRODUCT_BUNDLE_IDENTIFIER = "com.moonlight-stream.$(PRODUCT_NAME:rfc1034identifier)";
|
||||||
PRODUCT_NAME = "$(TARGET_NAME)";
|
PRODUCT_NAME = "$(TARGET_NAME)";
|
||||||
|
1
libs/Build.txt
Normal file
1
libs/Build.txt
Normal file
@ -0,0 +1 @@
|
|||||||
|
Static libraries were built from https://github.com/cgutman/moonlight-mobile-deps using AppVeyor CI
|
Binary file not shown.
Binary file not shown.
@ -198,7 +198,7 @@ OPUS_EXPORT OPUS_WARN_UNUSED_RESULT int opus_encoder_get_size(int channels);
|
|||||||
* This must be one of 8000, 12000, 16000,
|
* This must be one of 8000, 12000, 16000,
|
||||||
* 24000, or 48000.
|
* 24000, or 48000.
|
||||||
* @param [in] channels <tt>int</tt>: Number of channels (1 or 2) in input signal
|
* @param [in] channels <tt>int</tt>: Number of channels (1 or 2) in input signal
|
||||||
* @param [in] application <tt>int</tt>: Coding mode (@ref OPUS_APPLICATION_VOIP/@ref OPUS_APPLICATION_AUDIO/@ref OPUS_APPLICATION_RESTRICTED_LOWDELAY)
|
* @param [in] application <tt>int</tt>: Coding mode (one of @ref OPUS_APPLICATION_VOIP, @ref OPUS_APPLICATION_AUDIO, or @ref OPUS_APPLICATION_RESTRICTED_LOWDELAY)
|
||||||
* @param [out] error <tt>int*</tt>: @ref opus_errorcodes
|
* @param [out] error <tt>int*</tt>: @ref opus_errorcodes
|
||||||
* @note Regardless of the sampling rate and number channels selected, the Opus encoder
|
* @note Regardless of the sampling rate and number channels selected, the Opus encoder
|
||||||
* can switch to a lower audio bandwidth or number of channels if the bitrate
|
* can switch to a lower audio bandwidth or number of channels if the bitrate
|
||||||
@ -222,7 +222,7 @@ OPUS_EXPORT OPUS_WARN_UNUSED_RESULT OpusEncoder *opus_encoder_create(
|
|||||||
* This must be one of 8000, 12000, 16000,
|
* This must be one of 8000, 12000, 16000,
|
||||||
* 24000, or 48000.
|
* 24000, or 48000.
|
||||||
* @param [in] channels <tt>int</tt>: Number of channels (1 or 2) in input signal
|
* @param [in] channels <tt>int</tt>: Number of channels (1 or 2) in input signal
|
||||||
* @param [in] application <tt>int</tt>: Coding mode (OPUS_APPLICATION_VOIP/OPUS_APPLICATION_AUDIO/OPUS_APPLICATION_RESTRICTED_LOWDELAY)
|
* @param [in] application <tt>int</tt>: Coding mode (one of OPUS_APPLICATION_VOIP, OPUS_APPLICATION_AUDIO, or OPUS_APPLICATION_RESTRICTED_LOWDELAY)
|
||||||
* @retval #OPUS_OK Success or @ref opus_errorcodes
|
* @retval #OPUS_OK Success or @ref opus_errorcodes
|
||||||
*/
|
*/
|
||||||
OPUS_EXPORT int opus_encoder_init(
|
OPUS_EXPORT int opus_encoder_init(
|
||||||
|
@ -64,7 +64,7 @@ extern "C" {
|
|||||||
/**Export control for opus functions */
|
/**Export control for opus functions */
|
||||||
|
|
||||||
#ifndef OPUS_EXPORT
|
#ifndef OPUS_EXPORT
|
||||||
# if defined(WIN32)
|
# if defined(_WIN32)
|
||||||
# if defined(OPUS_BUILD) && defined(DLL_EXPORT)
|
# if defined(OPUS_BUILD) && defined(DLL_EXPORT)
|
||||||
# define OPUS_EXPORT __declspec(dllexport)
|
# define OPUS_EXPORT __declspec(dllexport)
|
||||||
# else
|
# else
|
||||||
@ -482,7 +482,8 @@ extern "C" {
|
|||||||
* @param[in] x <tt>opus_int32</tt>: Allowed values:
|
* @param[in] x <tt>opus_int32</tt>: Allowed values:
|
||||||
* <dl>
|
* <dl>
|
||||||
* <dt>0</dt><dd>Disable inband FEC (default).</dd>
|
* <dt>0</dt><dd>Disable inband FEC (default).</dd>
|
||||||
* <dt>1</dt><dd>Enable inband FEC.</dd>
|
* <dt>1</dt><dd>Inband FEC enabled. If the packet loss rate is sufficiently high, Opus will automatically switch to SILK even at high rates to enable use of that FEC.</dd>
|
||||||
|
* <dt>2</dt><dd>Inband FEC enabled, but does not necessarily switch to SILK if we have music.</dd>
|
||||||
* </dl>
|
* </dl>
|
||||||
* @hideinitializer */
|
* @hideinitializer */
|
||||||
#define OPUS_SET_INBAND_FEC(x) OPUS_SET_INBAND_FEC_REQUEST, __opus_check_int(x)
|
#define OPUS_SET_INBAND_FEC(x) OPUS_SET_INBAND_FEC_REQUEST, __opus_check_int(x)
|
||||||
@ -491,7 +492,8 @@ extern "C" {
|
|||||||
* @param[out] x <tt>opus_int32 *</tt>: Returns one of the following values:
|
* @param[out] x <tt>opus_int32 *</tt>: Returns one of the following values:
|
||||||
* <dl>
|
* <dl>
|
||||||
* <dt>0</dt><dd>Inband FEC disabled (default).</dd>
|
* <dt>0</dt><dd>Inband FEC disabled (default).</dd>
|
||||||
* <dt>1</dt><dd>Inband FEC enabled.</dd>
|
* <dt>1</dt><dd>Inband FEC enabled. If the packet loss rate is sufficiently high, Opus will automatically switch to SILK even at high rates to enable use of that FEC.</dd>
|
||||||
|
* <dt>2</dt><dd>Inband FEC enabled, but does not necessarily switch to SILK if we have music.</dd>
|
||||||
* </dl>
|
* </dl>
|
||||||
* @hideinitializer */
|
* @hideinitializer */
|
||||||
#define OPUS_GET_INBAND_FEC(x) OPUS_GET_INBAND_FEC_REQUEST, __opus_check_int_ptr(x)
|
#define OPUS_GET_INBAND_FEC(x) OPUS_GET_INBAND_FEC_REQUEST, __opus_check_int_ptr(x)
|
||||||
|
BIN
libs/opus/lib/iOS-Sim/libopus.a
Normal file
BIN
libs/opus/lib/iOS-Sim/libopus.a
Normal file
Binary file not shown.
Binary file not shown.
BIN
libs/opus/lib/tvOS-Sim/libopus.a
Normal file
BIN
libs/opus/lib/tvOS-Sim/libopus.a
Normal file
Binary file not shown.
Binary file not shown.
Loading…
x
Reference in New Issue
Block a user