diff --git a/.gitmodules b/.gitmodules index 0fc94912e..8dd17702e 100644 --- a/.gitmodules +++ b/.gitmodules @@ -15,7 +15,7 @@ url = https://github.com/Thealexbarney/LibAtrac9.git [submodule "Frameworks/shpakovski/MASShortcut"] path = Frameworks/shpakovski/MASShortcut - url = https://github.com/shpakovski/MASShortcut.git + url = https://github.com/kode54/MASShortcut.git [submodule "Frameworks/libsidplayfp/sidplayfp"] path = Frameworks/libsidplayfp/sidplayfp url = https://github.com/kode54/libsidplayfp.git diff --git a/Application/DockIconController.m b/Application/DockIconController.m index 6ad2fcdf3..4d9f77905 100644 --- a/Application/DockIconController.m +++ b/Application/DockIconController.m @@ -110,7 +110,7 @@ static NSString *getBadgeName(NSString *baseName, BOOL colorfulIcons) { [dockTile setContentView:imageView]; progressIndicator = [[NSProgressIndicator alloc] initWithFrame:NSMakeRect(0.0, 0.0, dockTile.size.width, 10.0)]; - [progressIndicator setStyle:NSProgressIndicatorBarStyle]; + [progressIndicator setStyle:NSProgressIndicatorStyleBar]; [progressIndicator setIndeterminate:NO]; [progressIndicator setBezeled:YES]; [progressIndicator setMinValue:0]; diff --git a/Audio/Chain/ChunkList.m b/Audio/Chain/ChunkList.m index e47741b10..bd3b793eb 100644 --- a/Audio/Chain/ChunkList.m +++ b/Audio/Chain/ChunkList.m @@ -72,7 +72,7 @@ struct dsd2pcm_state { static void dsd2pcm_free(void *); static void dsd2pcm_reset(void *); -static void *dsd2pcm_alloc() { +static void *dsd2pcm_alloc(void) { struct dsd2pcm_state *state = (struct dsd2pcm_state *)calloc(1, sizeof(struct dsd2pcm_state)); float *FILT_LOOKUP_TABLE; diff --git a/Audio/CogAudio.xcodeproj/xcshareddata/xcschemes/CogAudio Framework.xcscheme b/Audio/CogAudio.xcodeproj/xcshareddata/xcschemes/CogAudio Framework.xcscheme index af03e74cc..50051fe41 100644 --- a/Audio/CogAudio.xcodeproj/xcshareddata/xcschemes/CogAudio Framework.xcscheme +++ b/Audio/CogAudio.xcodeproj/xcshareddata/xcschemes/CogAudio Framework.xcscheme @@ -1,6 +1,6 @@ +#include #include typedef struct { diff --git a/Base.lproj/AboutWindowController.xib b/Base.lproj/AboutWindowController.xib index d5ff8561f..5c8411175 100644 --- a/Base.lproj/AboutWindowController.xib +++ b/Base.lproj/AboutWindowController.xib @@ -1,9 +1,9 @@ - + - - + + diff --git a/Base.lproj/Feedback.xib b/Base.lproj/Feedback.xib index 7246e35d9..11d89a9ea 100644 --- a/Base.lproj/Feedback.xib +++ b/Base.lproj/Feedback.xib @@ -1,8 +1,8 @@ - + - + @@ -21,13 +21,13 @@ - + - + @@ -39,7 +39,7 @@ - + @@ -48,7 +48,7 @@ - + @@ -60,11 +60,11 @@ - + - + @@ -115,7 +115,7 @@ - + @@ -127,7 +127,7 @@ - + diff --git a/Base.lproj/FileTree.xib b/Base.lproj/FileTree.xib index 1d132640b..fecd2c6a1 100644 --- a/Base.lproj/FileTree.xib +++ b/Base.lproj/FileTree.xib @@ -1,8 +1,8 @@ - + - + diff --git a/Base.lproj/InfoInspector.xib b/Base.lproj/InfoInspector.xib index eeeb2727c..29f6ad1e9 100644 --- a/Base.lproj/InfoInspector.xib +++ b/Base.lproj/InfoInspector.xib @@ -1,8 +1,8 @@ - + - + @@ -23,7 +23,7 @@ - + @@ -32,7 +32,7 @@ - + @@ -41,7 +41,7 @@ - + @@ -50,7 +50,7 @@ - + @@ -59,7 +59,7 @@ - + @@ -68,7 +68,7 @@ - + @@ -77,7 +77,7 @@ - + @@ -86,7 +86,7 @@ - + @@ -95,7 +95,7 @@ - + @@ -104,7 +104,7 @@ - + @@ -113,7 +113,7 @@ - + @@ -122,7 +122,7 @@ - + @@ -134,7 +134,7 @@ - + @@ -146,7 +146,7 @@ - + @@ -158,7 +158,7 @@ - + @@ -170,7 +170,7 @@ - + @@ -182,7 +182,7 @@ - + @@ -194,7 +194,7 @@ - + @@ -206,7 +206,7 @@ - + @@ -222,7 +222,7 @@ - + @@ -234,7 +234,7 @@ - + @@ -246,7 +246,7 @@ - + @@ -258,7 +258,7 @@ - + @@ -267,7 +267,7 @@ - + @@ -279,7 +279,7 @@ - + @@ -288,7 +288,7 @@ - + @@ -300,7 +300,7 @@ - + @@ -309,7 +309,7 @@ - + @@ -321,7 +321,7 @@ - + @@ -330,7 +330,7 @@ - + @@ -343,7 +343,7 @@ - + @@ -352,7 +352,7 @@ - + @@ -364,7 +364,7 @@ - + @@ -373,7 +373,7 @@ - + @@ -385,7 +385,7 @@ - + @@ -394,7 +394,7 @@ - + @@ -403,7 +403,7 @@ - + @@ -416,7 +416,7 @@ - + @@ -425,8 +425,8 @@ - + diff --git a/Base.lproj/LyricsWindow.xib b/Base.lproj/LyricsWindow.xib index ec0a236f6..99b80c131 100644 --- a/Base.lproj/LyricsWindow.xib +++ b/Base.lproj/LyricsWindow.xib @@ -1,8 +1,8 @@ - + - + @@ -26,15 +26,15 @@ - + - + - + @@ -53,7 +53,7 @@ - + diff --git a/Base.lproj/MainMenu.xib b/Base.lproj/MainMenu.xib index db2a8c529..1125b67e3 100644 --- a/Base.lproj/MainMenu.xib +++ b/Base.lproj/MainMenu.xib @@ -1,8 +1,8 @@ - + - + @@ -25,17 +25,17 @@ - + - + - - + + - + @@ -57,7 +57,7 @@ - + @@ -102,7 +102,7 @@ - + @@ -144,7 +144,7 @@ - + @@ -171,7 +171,7 @@ - + @@ -185,10 +185,10 @@ - + - + @@ -231,7 +231,7 @@ - + @@ -259,7 +259,7 @@ - + @@ -273,10 +273,10 @@ - + - + @@ -303,7 +303,7 @@ - + @@ -317,10 +317,10 @@ - + - + @@ -347,7 +347,7 @@ - + @@ -360,10 +360,10 @@ - + - + @@ -391,7 +391,7 @@ - + @@ -404,10 +404,10 @@ - + - + @@ -445,10 +445,10 @@ - + - + @@ -472,7 +472,7 @@ - + @@ -485,10 +485,10 @@ - + - + @@ -528,7 +528,7 @@ - + @@ -572,7 +572,7 @@ - + @@ -616,7 +616,7 @@ - + @@ -660,7 +660,7 @@ - + @@ -704,7 +704,7 @@ - + @@ -772,7 +772,7 @@ - + @@ -835,7 +835,7 @@ - + @@ -900,7 +900,7 @@ - + @@ -1170,7 +1170,7 @@ - + diff --git a/Base.lproj/OpenURLPanel.xib b/Base.lproj/OpenURLPanel.xib index dcf61cff5..b8bbf8b53 100644 --- a/Base.lproj/OpenURLPanel.xib +++ b/Base.lproj/OpenURLPanel.xib @@ -1,8 +1,8 @@ - + - + @@ -24,7 +24,7 @@ - - + diff --git a/Base.lproj/SpectrumWindow.xib b/Base.lproj/SpectrumWindow.xib index c2f474ed0..4498c9ca6 100644 --- a/Base.lproj/SpectrumWindow.xib +++ b/Base.lproj/SpectrumWindow.xib @@ -1,8 +1,8 @@ - + - + diff --git a/Base.lproj/SpotlightPanel.xib b/Base.lproj/SpotlightPanel.xib index c8cb256b5..c8053196c 100644 --- a/Base.lproj/SpotlightPanel.xib +++ b/Base.lproj/SpotlightPanel.xib @@ -1,8 +1,8 @@ - + - + @@ -45,17 +45,17 @@ DQ - + - + - + @@ -69,11 +69,11 @@ DQ - + - - + + @@ -96,7 +96,7 @@ DQ - + @@ -110,11 +110,11 @@ DQ - + - - + + @@ -137,7 +137,7 @@ DQ - + @@ -151,11 +151,11 @@ DQ - + - - + + @@ -194,7 +194,7 @@ DQ - + @@ -234,7 +234,7 @@ DQ - + @@ -275,7 +275,7 @@ DQ - + @@ -299,7 +299,7 @@ DQ - + @@ -313,11 +313,11 @@ DQ - + - - + + @@ -362,18 +362,18 @@ DQ - + - + - + @@ -386,7 +386,7 @@ DQ - + diff --git a/Cog.xcodeproj/project.pbxproj b/Cog.xcodeproj/project.pbxproj index 4dc40ff09..9ebc47dc2 100644 --- a/Cog.xcodeproj/project.pbxproj +++ b/Cog.xcodeproj/project.pbxproj @@ -3,7 +3,7 @@ archiveVersion = 1; classes = { }; - objectVersion = 52; + objectVersion = 54; objects = { /* Begin PBXBuildFile section */ @@ -2045,7 +2045,8 @@ 29B97313FDCFA39411CA2CEA /* Project object */ = { isa = PBXProject; attributes = { - LastUpgradeCheck = 1400; + BuildIndependentTargetsInParallel = YES; + LastUpgradeCheck = 1500; TargetAttributes = { 8D1107260486CEB800E47090 = { DevelopmentTeam = ""; @@ -2516,6 +2517,7 @@ inputFileListPaths = ( ); inputPaths = ( + "$(SRCROOT)/Scripts/genversion.sh", "$(SRCROOT)/Info.plist.template", ); name = "Run version generator script"; @@ -2524,10 +2526,11 @@ ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "\"${PROJECT_DIR}/Scripts/genversion.sh\"\n"; + shellScript = "$SCRIPT_INPUT_FILE_0 $SCRIPT_INPUT_FILE_1 $SCRIPT_OUTPUT_FILE_0\n"; }; 83978E27285C5A4C0076ED21 /* Run Crashlytics symbol upload */ = { isa = PBXShellScriptBuildPhase; + alwaysOutOfDate = 1; buildActionMask = 12; files = ( ); @@ -3018,7 +3021,6 @@ "$(PROJECT_DIR)/ThirdParty/mpg123/lib", "$(PROJECT_DIR)/ThirdParty/soxr/lib", ); - MACOSX_DEPLOYMENT_TARGET = 10.13; OTHER_CFLAGS = ( "-D__MACOSX__", "-DHAVE_CONFIG_H", @@ -3075,7 +3077,6 @@ "$(PROJECT_DIR)/ThirdParty/mpg123/lib", "$(PROJECT_DIR)/ThirdParty/soxr/lib", ); - MACOSX_DEPLOYMENT_TARGET = 10.13; OTHER_CFLAGS = ( "-D__MACOSX__", "-DHAVE_CONFIG_H", @@ -3107,6 +3108,7 @@ baseConfigurationReference = 3DDFC2472344EC6B000F1453 /* Shared.xcconfig */; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; + ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES; CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES; CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_OBJC_ARC = YES; @@ -3151,6 +3153,7 @@ baseConfigurationReference = 3DDFC2472344EC6B000F1453 /* Shared.xcconfig */; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; + ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES; CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES; CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_OBJC_ARC = YES; diff --git a/Cog.xcodeproj/xcshareddata/xcschemes/Cog.xcscheme b/Cog.xcodeproj/xcshareddata/xcschemes/Cog.xcscheme index 4d5511bdd..432861d0f 100644 --- a/Cog.xcodeproj/xcshareddata/xcschemes/Cog.xcscheme +++ b/Cog.xcodeproj/xcshareddata/xcschemes/Cog.xcscheme @@ -1,6 +1,6 @@ bits; - tell = ec_enc_tell(enc, 4); + tell = (int)ec_enc_tell(enc, 4); if (i != 0) balance -= tell; remaining_bits = (total_bits<bits; N = eBands[i+1]-eBands[i]; - tell = ec_enc_tell(enc, 4); + tell = (int)ec_enc_tell(enc, 4); if (i != 0) balance -= tell; remaining_bits = (total_bits<bits; - tell = ec_dec_tell(dec, 4); + tell = (int)ec_dec_tell(dec, 4); if (i != 0) balance -= tell; remaining_bits = (total_bits<bits; N = eBands[i+1]-eBands[i]; - tell = ec_dec_tell(dec, 4); + tell = (int)ec_dec_tell(dec, 4); if (i != 0) balance -= tell; remaining_bits = (total_bits<mode->nbEBands;i++) offsets[i] = 0; - bits = nbCompressedBytes*8 - ec_enc_tell(&enc, 0) - 1; + bits = nbCompressedBytes*8 - (int)ec_enc_tell(&enc, 0) - 1; if (has_pitch) bits -= st->mode->nbPBands; #ifndef STDIN_TUNING @@ -857,7 +857,7 @@ int celt_encode_float(CELTEncoder * restrict st, const celt_sig_t * pcm, celt_si quant_bands_stereo(st->mode, X, P, NULL, has_pitch, gains, bandE, pulses, shortBlocks, has_fold, nbCompressedBytes*8, &enc); #endif - quant_energy_finalise(st->mode, bandE, st->oldBandE, error, fine_quant, fine_priority, nbCompressedBytes*8-ec_enc_tell(&enc, 0), &enc); + quant_energy_finalise(st->mode, bandE, st->oldBandE, error, fine_quant, fine_priority, nbCompressedBytes*8-(int)ec_enc_tell(&enc, 0), &enc); /* Re-synthesis of the coded audio if required */ if (st->pitch_available>0 || optional_synthesis!=NULL) @@ -1365,7 +1365,7 @@ int celt_decode_float(CELTDecoder * restrict st, const unsigned char *data, int for (i=0;imode->nbEBands;i++) offsets[i] = 0; - bits = len*8 - ec_dec_tell(&dec, 0) - 1; + bits = len*8 - (int)ec_dec_tell(&dec, 0) - 1; if (has_pitch) bits -= st->mode->nbPBands; compute_allocation(st->mode, offsets, bits, pulses, fine_quant, fine_priority); @@ -1397,7 +1397,7 @@ int celt_decode_float(CELTDecoder * restrict st, const unsigned char *data, int else unquant_bands_stereo(st->mode, X, P, has_pitch, gains, bandE, pulses, shortBlocks, has_fold, len*8, &dec); #endif - unquant_energy_finalise(st->mode, bandE, st->oldBandE, fine_quant, fine_priority, len*8-ec_dec_tell(&dec, 0), &dec); + unquant_energy_finalise(st->mode, bandE, st->oldBandE, fine_quant, fine_priority, len*8-(int)ec_dec_tell(&dec, 0), &dec); /* Synthesis */ denormalise_bands(st->mode, X, freq, bandE); diff --git a/Frameworks/libcelt_0061/celt-0.6.1/libcelt/cwrs.c b/Frameworks/libcelt_0061/celt-0.6.1/libcelt/cwrs.c index 8d2d7628d..b387ba6cb 100644 --- a/Frameworks/libcelt_0061/celt-0.6.1/libcelt/cwrs.c +++ b/Frameworks/libcelt_0061/celt-0.6.1/libcelt/cwrs.c @@ -51,24 +51,24 @@ int log2_frac(ec_uint32 val, int frac) if(val&val-1){ /*This is (val>>l-16), but guaranteed to round up, even if adding a bias before the shift would cause overflow (e.g., for 0xFFFFxxxx).*/ - if(l>16)val=(val>>l-16)+((val&(1<>l-16); + if(l>16)val=(val>>(l-16))+(((val&(1<<(l-16))-1)+(1<<(l-16))-1)>>(l-16)); else val<<=16-l; - l=l-1<>16); l+=b<>b; - val=val*val+0x7FFF>>15; + val=(val+b)>>b; + val=(val*val+0x7FFF)>>15; } while(frac-->0); /*If val is not exactly 0x8000, then we have to round up the remainder.*/ return l+(val>0x8000); } /*Exact powers of two require no rounding.*/ - else return l-1<0); shift=EC_ILOG(_d^_d-1); celt_assert(_d<=256); - inv=INV_TABLE[_d-1>>shift]; + inv=INV_TABLE[(_d-1)>>shift]; shift--; one=1<>shift)-(_c>>shift)+ - (_a*(_b&mask)+one-(_c&mask)>>shift)-1)*inv&MASK32; + ((_a*(_b&mask)+one-(_c&mask))>>shift)-1)*inv&MASK32; } /*Compute floor(sqrt(_val)) with exact arithmetic. @@ -153,11 +153,11 @@ static unsigned isqrt32(celt_uint32_t _val){ The main idea is to search for the largest binary digit b such that (g+b)*(g+b) <= _val, and add it to the solution g.*/ g=0; - bshift=EC_ILOG(_val)-1>>1; + bshift=(EC_ILOG(_val)-1)>>1; b=1U<=len)break; - _u[k]=um1=imusdiv32odd(n2m1,um2,um1,k-1>>1)+um1; + _u[k]=um1=imusdiv32odd(n2m1,um2,um1,(k-1)>>1)+um1; } } return _u[_k]+_u[_k+1]; @@ -483,7 +485,7 @@ static inline void cwrsi2(int _k,celt_uint32_t _i,int *_y){ s=-(_i>=p); _i-=p&s; yj=_k; - _k=_i+1>>1; + _k=(_i+1)>>1; p=ucwrs2(_k); _i-=p; yj-=_k; @@ -504,7 +506,7 @@ static void cwrsi3(int _k,celt_uint32_t _i,int *_y){ yj=_k; /*Finds the maximum _k such that ucwrs3(_k)<=_i (tested for all _i<2147418113=U(3,32768)).*/ - _k=_i>0?isqrt32(2*_i-1)+1>>1:0; + _k=_i>0?(isqrt32(2*_i-1)+1)>>1:0; p=ucwrs3(_k); _i-=p; yj-=_k; @@ -531,7 +533,7 @@ static void cwrsi4(int _k,celt_uint32_t _i,int *_y){ kl=0; kr=_k; for(;;){ - _k=kl+kr>>1; + _k=(kl+kr)>>1; p=ucwrs4(_k); if(p<_i){ if(_k>=kr)break; @@ -569,7 +571,7 @@ static void cwrsi5(int _k,celt_uint32_t _i,int *_y){ int kl=0; int kr=_k; for(;;){ - _k=kl+kr>>1; + _k=(kl+kr)>>1; p=ucwrs5(_k); if(p<_i){ if(_k>=kr)break; @@ -757,7 +759,7 @@ static celt_int16_t *get_required_bits_pair(celt_int16_t *_bits1, if(fits_in32(_n1,_maxk-1))get_required_bits(_bits1,_n1,_maxk,_frac); else{ _tmp=get_required_bits_pair(_bits2,_tmp,_bits1, - _n1>>1,_n1+1>>1,_maxk,_frac); + _n1>>1,(_n1+1)>>1,_maxk,_frac); get_required_split_bits(_bits1,_bits2,_tmp,_n1,_maxk,_frac); } return _bits1; @@ -780,7 +782,7 @@ static celt_int16_t *get_required_bits_pair(celt_int16_t *_bits1, } else{ _tmp=get_required_bits_pair(_bits2,_tmp,_bits1, - _n1>>1,_n1+1>>1,_maxk,_frac); + _n1>>1,(_n1+1)>>1,_maxk,_frac); get_required_split_bits(_bits1,_bits2,_tmp,_n1,_maxk,_frac); get_required_split_bits(_bits2,_tmp,_tmp,_n2,_maxk,_frac); } @@ -789,7 +791,7 @@ static celt_int16_t *get_required_bits_pair(celt_int16_t *_bits1, /*There's no need to special case _n1 fitting by itself, since _n2 requires us to recurse for both values anyway.*/ tmp2=get_required_bits_pair(_tmp,_bits1,_bits2, - _n2>>1,_n2+1>>1,_maxk,_frac); + _n2>>1,(_n2+1)>>1,_maxk,_frac); get_required_split_bits(_bits2,_tmp,tmp2,_n2,_maxk,_frac); get_required_split_bits(_bits1,_tmp,_tmp,_n1,_maxk,_frac); } @@ -819,7 +821,7 @@ void get_required_bits(celt_int16_t *_bits,int _n,int _maxk,int _frac){ ALLOC(n1bits,_maxk,celt_int16_t); ALLOC(n2bits_buf,_maxk,celt_int16_t); n2bits=get_required_bits_pair(n1bits,n2bits_buf,_bits, - _n>>1,_n+1>>1,_maxk,_frac); + _n>>1,(_n+1)>>1,_maxk,_frac); get_required_split_bits(_bits,n1bits,n2bits,_n,_maxk,_frac); RESTORE_STACK; } diff --git a/Frameworks/libcelt_0061/celt-0.6.1/libcelt/entenc.c b/Frameworks/libcelt_0061/celt-0.6.1/libcelt/entenc.c index de15f9e4f..8ab68f620 100644 --- a/Frameworks/libcelt_0061/celt-0.6.1/libcelt/entenc.c +++ b/Frameworks/libcelt_0061/celt-0.6.1/libcelt/entenc.c @@ -61,7 +61,7 @@ void ec_byte_write1(ec_byte_buffer *_b,unsigned _value){ endbyte=_b->ptr-_b->buf; if(endbyte>=_b->storage){ if (_b->resizable){ - _b->buf=celt_realloc(_b->buf,(_b->storage+EC_BUFFER_INCREMENT)*sizeof(char)); + _b->buf=celt_realloc(_b->buf,(int)(_b->storage+EC_BUFFER_INCREMENT)*sizeof(char)); _b->storage+=EC_BUFFER_INCREMENT; _b->ptr=_b->buf+endbyte; } else { @@ -76,7 +76,7 @@ void ec_byte_write4(ec_byte_buffer *_b,ec_uint32 _value){ endbyte=_b->ptr-_b->buf; if(endbyte+4>_b->storage){ if (_b->resizable){ - _b->buf=celt_realloc(_b->buf,(_b->storage+EC_BUFFER_INCREMENT)*sizeof(char)); + _b->buf=celt_realloc(_b->buf,(int)(_b->storage+EC_BUFFER_INCREMENT)*sizeof(char)); _b->storage+=EC_BUFFER_INCREMENT; _b->ptr=_b->buf+endbyte; } else { @@ -98,7 +98,7 @@ void ec_byte_writecopy(ec_byte_buffer *_b,void *_source,long _bytes){ if(endbyte+_bytes>_b->storage){ if (_b->resizable){ _b->storage=endbyte+_bytes+EC_BUFFER_INCREMENT; - _b->buf=celt_realloc(_b->buf,_b->storage*sizeof(char)); + _b->buf=celt_realloc(_b->buf,(int)_b->storage*sizeof(char)); _b->ptr=_b->buf+endbyte; } else { celt_fatal("range encoder overflow\n"); diff --git a/Frameworks/libcelt_0061/celt-0.6.1/libcelt/kiss_fft.c b/Frameworks/libcelt_0061/celt-0.6.1/libcelt/kiss_fft.c index 2d5e9a6d5..3ec064470 100644 --- a/Frameworks/libcelt_0061/celt-0.6.1/libcelt/kiss_fft.c +++ b/Frameworks/libcelt_0061/celt-0.6.1/libcelt/kiss_fft.c @@ -529,7 +529,7 @@ void kf_work( const int m=*factors++; /* stage's fft length/p */ /*printf ("fft %d %d %d %d %d %d %d\n", p*m, m, p, s2, fstride*in_stride, N, m2);*/ if (m!=1) - kf_work( Fout , f, fstride*p, in_stride, factors,st, N*p, fstride*in_stride, m); + kf_work( Fout , f, fstride*p, in_stride, factors,st, N*p, (int)fstride*in_stride, m); switch (p) { case 2: kf_bfly2(Fout,fstride,st,m, N, m2); break; @@ -565,7 +565,7 @@ void ki_work( const int m=*factors++; /* stage's fft length/p */ /*printf ("fft %d %d %d %d %d %d %d\n", p*m, m, p, s2, fstride*in_stride, N, m2);*/ if (m!=1) - ki_work( Fout , f, fstride*p, in_stride, factors,st, N*p, fstride*in_stride, m); + ki_work( Fout , f, fstride*p, in_stride, factors,st, N*p, (int)fstride*in_stride, m); switch (p) { case 2: ki_bfly2(Fout,fstride,st,m, N, m2); break; @@ -619,7 +619,7 @@ kiss_fft_cfg kiss_fft_alloc(int nfft,void * mem,size_t * lenmem ) + sizeof(kiss_twiddle_cpx)*(nfft-1) + sizeof(int)*nfft; /* twiddle factors*/ if ( lenmem==NULL ) { - st = ( kiss_fft_cfg)KISS_FFT_MALLOC( memneeded ); + st = ( kiss_fft_cfg)KISS_FFT_MALLOC( (int)memneeded ); }else{ if (mem != NULL && *lenmem >= memneeded) st = (kiss_fft_cfg)mem; diff --git a/Frameworks/libcelt_0061/celt-0.6.1/libcelt/kiss_fftr.c b/Frameworks/libcelt_0061/celt-0.6.1/libcelt/kiss_fftr.c index ee8d7bb12..45f9385b2 100644 --- a/Frameworks/libcelt_0061/celt-0.6.1/libcelt/kiss_fftr.c +++ b/Frameworks/libcelt_0061/celt-0.6.1/libcelt/kiss_fftr.c @@ -45,7 +45,7 @@ kiss_fftr_cfg kiss_fftr_alloc(int nfft,void * mem,size_t * lenmem) memneeded = sizeof(struct kiss_fftr_state) + subsize + sizeof(kiss_twiddle_cpx)*twiddle_size; if (lenmem == NULL) { - st = (kiss_fftr_cfg) KISS_FFT_MALLOC (memneeded); + st = (kiss_fftr_cfg) KISS_FFT_MALLOC ((int)memneeded); } else { if (*lenmem >= memneeded) st = (kiss_fftr_cfg) mem; diff --git a/Frameworks/libcelt_0061/celt-0.6.1/libcelt/mfrngcod.h b/Frameworks/libcelt_0061/celt-0.6.1/libcelt/mfrngcod.h index fbd2b25dc..d94e8da6d 100644 --- a/Frameworks/libcelt_0061/celt-0.6.1/libcelt/mfrngcod.h +++ b/Frameworks/libcelt_0061/celt-0.6.1/libcelt/mfrngcod.h @@ -44,9 +44,9 @@ /*Bits to shift by to move a symbol into the high-order position.*/ # define EC_CODE_SHIFT (EC_CODE_BITS-EC_SYM_BITS-1) /*Carry bit of the high-order range symbol.*/ -# define EC_CODE_TOP (((ec_uint32)1U)<>EC_SYM_BITS) +# define EC_CODE_BOT ((EC_CODE_TOP)>>(EC_SYM_BITS)) /*Code for which propagating carries are possible.*/ # define EC_CODE_CARRY (((ec_uint32)EC_SYM_MAX)<nbEBands;i++) { @@ -125,7 +125,7 @@ unsigned quant_coarse_energy(const CELTMode *m, celt_word16_t *eBands, celt_word #endif /* If we don't have enough bits to encode all the energy, just assume something safe. We allow slightly busting the budget here */ - bits_used=ec_enc_tell(enc, 0) - bits; + bits_used=(int)ec_enc_tell(enc, 0) - bits; if (bits_used > budget) { qi = -1; @@ -235,7 +235,7 @@ void unquant_coarse_energy(const CELTMode *m, celt_ener_t *eBands, celt_word16_t /* The .8 is a heuristic */ beta = MULT16_16_Q15(QCONST16(.8f,15),coef); - bits = ec_dec_tell(dec, 0); + bits = (int)ec_dec_tell(dec, 0); /* Decode at a fixed coarse resolution */ for (i=0;inbEBands;i++) { diff --git a/Frameworks/libcelt_0061/celt-0.6.1/libcelt/rangedec.c b/Frameworks/libcelt_0061/celt-0.6.1/libcelt/rangedec.c index bf4bb486a..596957452 100644 --- a/Frameworks/libcelt_0061/celt-0.6.1/libcelt/rangedec.c +++ b/Frameworks/libcelt_0061/celt-0.6.1/libcelt/rangedec.c @@ -119,8 +119,8 @@ static inline void ec_dec_normalize(ec_dec *_this){ /*Read the next value from the input.*/ _this->rem=ec_dec_in(_this); /*Take the rest of the bits we need from this new symbol.*/ - sym|=_this->rem>>EC_SYM_BITS-EC_CODE_EXTRA; - _this->dif=(_this->dif<rem>>(EC_SYM_BITS-EC_CODE_EXTRA); + _this->dif=(_this->dif<dif>EC_CODE_TOP)_this->dif-=EC_CODE_TOP;*/ @@ -132,7 +132,7 @@ void ec_dec_init(ec_dec *_this,ec_byte_buffer *_buf){ _this->buf=_buf; _this->rem=ec_dec_in(_this); _this->rng=1U<dif=_this->rng-(_this->rem>>EC_SYM_BITS-EC_CODE_EXTRA); + _this->dif=_this->rng-(_this->rem>>(EC_SYM_BITS-EC_CODE_EXTRA)); /*Normalize the interval.*/ ec_dec_normalize(_this); } @@ -177,7 +177,7 @@ long ec_dec_tell(ec_dec *_this,int _b){ nbits+=EC_CODE_BITS; nbits<<=_b; l=EC_ILOG(_this->rng); - r=_this->rng>>l-16; + r=_this->rng>>(l-16); while(_b-->0){ int b; r=r*r>>15; diff --git a/Frameworks/libcelt_0061/celt-0.6.1/libcelt/rangeenc.c b/Frameworks/libcelt_0061/celt-0.6.1/libcelt/rangeenc.c index 2042d9442..e3c31603c 100644 --- a/Frameworks/libcelt_0061/celt-0.6.1/libcelt/rangeenc.c +++ b/Frameworks/libcelt_0061/celt-0.6.1/libcelt/rangeenc.c @@ -150,7 +150,7 @@ long ec_enc_tell(ec_enc *_this,int _b){ nbits+=EC_CODE_BITS; nbits<<=_b; l=EC_ILOG(_this->rng); - r=_this->rng>>l-16; + r=_this->rng>>(l-16); while(_b-->0){ int b; r=r*r>>15; @@ -174,7 +174,7 @@ void ec_enc_done(ec_enc *_this){ msk=EC_CODE_TOP-1; do{ msk>>=1; - end=_this->low+msk&~msk|msk+1; + end=(((_this->low+msk)&~msk)|msk+1); } while(end-_this->low>=_this->rng); } diff --git a/Frameworks/libcelt_0061/celt-0.6.1/libcelt/vq.h b/Frameworks/libcelt_0061/celt-0.6.1/libcelt/vq.h index b2a19fddf..7cc8a23b9 100644 --- a/Frameworks/libcelt_0061/celt-0.6.1/libcelt/vq.h +++ b/Frameworks/libcelt_0061/celt-0.6.1/libcelt/vq.h @@ -66,9 +66,7 @@ celt_word16_t renormalise_vector(celt_norm_t *X, celt_word16_t value, int N, int /** Intra-frame predictor that matches a section of the current frame (at lower * frequencies) to encode the current band. * @param x Residual signal to quantise/encode (returns quantised version) - * @param W Perceptual weight * @param N Number of samples to encode - * @param K Number of pulses to use * @param Y Lower frequency spectrum to use, normalised to the same standard deviation * @param P Pitch vector (it is assumed that p+x is a unit vector) * @param B Stride (number of channels multiplied by the number of MDCTs per frame) diff --git a/Frameworks/libcelt_0061/libcelt_0061/libcelt_0061.xcodeproj/project.pbxproj b/Frameworks/libcelt_0061/libcelt_0061/libcelt_0061.xcodeproj/project.pbxproj index 112f8aad9..b7b153282 100644 --- a/Frameworks/libcelt_0061/libcelt_0061/libcelt_0061.xcodeproj/project.pbxproj +++ b/Frameworks/libcelt_0061/libcelt_0061/libcelt_0061.xcodeproj/project.pbxproj @@ -3,7 +3,7 @@ archiveVersion = 1; classes = { }; - objectVersion = 50; + objectVersion = 54; objects = { /* Begin PBXBuildFile section */ @@ -273,7 +273,8 @@ 83D6761726539A7100252130 /* Project object */ = { isa = PBXProject; attributes = { - LastUpgradeCheck = 1400; + BuildIndependentTargetsInParallel = YES; + LastUpgradeCheck = 1500; TargetAttributes = { 83D6761F26539A7100252130 = { CreatedOnToolsVersion = 12.5; @@ -379,6 +380,7 @@ DEBUG_INFORMATION_FORMAT = dwarf; ENABLE_STRICT_OBJC_MSGSEND = YES; ENABLE_TESTABILITY = YES; + ENABLE_USER_SCRIPT_SANDBOXING = YES; GCC_C_LANGUAGE_STANDARD = gnu11; GCC_DYNAMIC_NO_PIC = NO; GCC_NO_COMMON_BLOCKS = YES; @@ -483,6 +485,7 @@ DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; ENABLE_NS_ASSERTIONS = NO; ENABLE_STRICT_OBJC_MSGSEND = YES; + ENABLE_USER_SCRIPT_SANDBOXING = YES; GCC_C_LANGUAGE_STANDARD = gnu11; GCC_NO_COMMON_BLOCKS = YES; GCC_PREPROCESSOR_DEFINITIONS = ( @@ -550,7 +553,6 @@ CODE_SIGN_STYLE = Automatic; COMBINE_HIDPI_IMAGES = YES; DEAD_CODE_STRIPPING = YES; - DEFINES_MODULE = YES; DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; DYLIB_INSTALL_NAME_BASE = "@loader_path/Frameworks"; @@ -569,7 +571,6 @@ CODE_SIGN_STYLE = Automatic; COMBINE_HIDPI_IMAGES = YES; DEAD_CODE_STRIPPING = YES; - DEFINES_MODULE = YES; DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; DYLIB_INSTALL_NAME_BASE = "@loader_path/Frameworks"; diff --git a/Frameworks/libcelt_0110/celt-0.11.0/libcelt/bands.c b/Frameworks/libcelt_0110/celt-0.11.0/libcelt/bands.c index 349b72f6b..6b693451a 100644 --- a/Frameworks/libcelt_0110/celt-0.11.0/libcelt/bands.c +++ b/Frameworks/libcelt_0110/celt-0.11.0/libcelt/bands.c @@ -74,7 +74,7 @@ static int bitexact_log2tan(int isin,int icos) ls=EC_ILOG(isin); icos<<=15-lc; isin<<=15-ls; - return (ls-lc<<11) + return ((ls-lc)<<11) +FRAC_MUL16(isin, FRAC_MUL16(isin, -2597) + 7932) -FRAC_MUL16(icos, FRAC_MUL16(icos, -2597) + 7932); } @@ -228,7 +228,7 @@ void anti_collapse(const CELTMode *m, celt_norm *_X, unsigned char *collapse_mas N0 = m->eBands[i+1]-m->eBands[i]; /* depth in 1/8 bits */ - depth = (1+pulses[i])/(m->eBands[i+1]-m->eBands[i]<eBands[i+1]-m->eBands[i])<>1; } } @@ -902,14 +902,14 @@ static unsigned quant_band(int encode, const CELTMode *m, int i, celt_norm *X, c { imid = 0; iside = 32767; - fill &= (1<vbr_reservoir>>(BITRES+3)), + (vbr_rate+vbr_bound-st->vbr_reservoir)>>(BITRES+3)), nbAvailableBytes); if(max_allowed < nbAvailableBytes) { @@ -1356,9 +1356,9 @@ int celt_encode_with_ec_float(CELTEncoder * restrict st, const celt_sig * pcm, i result in the encoder running out of bits. The margin of 2 bytes ensures that none of the bust-prevention logic in the decoder will have triggered so far. */ - min_allowed = (tell+total_boost+(1<>(BITRES+3)) + 2 - nbFilledBytes; + min_allowed = ((((((tell+total_boost)+(1<<(BITRES+3))))-1)>>(BITRES+3)) + 2) - nbFilledBytes; - nbAvailableBytes = target+(1<<(BITRES+2))>>(BITRES+3); + nbAvailableBytes = (target+(1<<(BITRES+2)))>>(BITRES+3); nbAvailableBytes = IMAX(min_allowed,nbAvailableBytes); nbAvailableBytes = IMIN(nbCompressedBytes,nbAvailableBytes+nbFilledBytes) - nbFilledBytes; @@ -1439,7 +1439,7 @@ int celt_encode_with_ec_float(CELTEncoder * restrict st, const celt_sig * pcm, i /* bits = packet size - where we are - safety*/ bits = (nbCompressedBytes*8<=2&&bits>=(LM+2<=2&&bits>=((LM+2)<mode, st->start, st->end, offsets, cap, alloc_trim, &intensity, &dual_stereo, bits, &balance, pulses, @@ -1916,7 +1916,7 @@ void celt_decoder_destroy(CELTDecoder *st) static void celt_decode_lost(CELTDecoder * restrict st, celt_word16 * restrict pcm, int N, int LM) { int c; - int pitch_index; + int pitch_index = 0; int overlap = st->mode->overlap; celt_word16 fade = Q15ONE; int i, len; @@ -2366,7 +2366,7 @@ int celt_decode_with_ec_float(CELTDecoder * restrict st, const unsigned char *da ec_dec_icdf(dec, trim_icdf, 7) : 5; bits = (len*8<=2&&bits>=(LM+2<=2&&bits>=((LM+2)<mode, st->start, st->end, offsets, cap, alloc_trim, &intensity, &dual_stereo, bits, &balance, pulses, diff --git a/Frameworks/libcelt_0110/celt-0.11.0/libcelt/cwrs.c b/Frameworks/libcelt_0110/celt-0.11.0/libcelt/cwrs.c index 452c4ea2f..443326ef1 100644 --- a/Frameworks/libcelt_0110/celt-0.11.0/libcelt/cwrs.c +++ b/Frameworks/libcelt_0110/celt-0.11.0/libcelt/cwrs.c @@ -53,24 +53,24 @@ int log2_frac(ec_uint32 val, int frac) if(val&val-1){ /*This is (val>>l-16), but guaranteed to round up, even if adding a bias before the shift would cause overflow (e.g., for 0xFFFFxxxx).*/ - if(l>16)val=(val>>l-16)+((val&(1<>l-16); + if(l>16)val=(val>>(l-16))+(((val&(1<<(l-16))-1)+(1<<(l-16))-1)>>(l-16)); else val<<=16-l; - l=l-1<>16); l+=b<>b; - val=val*val+0x7FFF>>15; + val=(val+b)>>b; + val=(val*val+0x7FFF)>>15; } while(frac-->0); /*If val is not exactly 0x8000, then we have to round up the remainder.*/ return l+(val>0x8000); } /*Exact powers of two require no rounding.*/ - else return l-1<0); shift=EC_ILOG(_d^_d-1); celt_assert(_d<=256); - inv=INV_TABLE[_d-1>>shift]; + inv=INV_TABLE[(_d-1)>>shift]; shift--; one=1<>shift)-(_c>>shift)+ - (_a*(_b&mask)+one-(_c&mask)>>shift)-1)*inv&MASK32; + ((_a*(_b&mask)+one-(_c&mask))>>shift)-1)*inv&MASK32; } #endif /* SMALL_FOOTPRINT */ @@ -391,7 +391,7 @@ static celt_uint32 ncwrs_urow(unsigned _n,unsigned _k,celt_uint32 *_u){ /*U(N,K) = ((2*N-1)*U(N,K-1)-U(N,K-2))/(K-1) + U(N,K-2)*/ _u[k]=um2=imusdiv32even(n2m1,um1,um2,k-1)+um2; if(++k>=len)break; - _u[k]=um1=imusdiv32odd(n2m1,um2,um1,k-1>>1)+um1; + _u[k]=um1=imusdiv32odd(n2m1,um2,um1,(k-1)>>1)+um1; } } #endif /* SMALL_FOOTPRINT */ @@ -420,7 +420,7 @@ static inline void cwrsi2(int _k,celt_uint32 _i,int *_y){ s=-(_i>=p); _i-=p&s; yj=_k; - _k=_i+1>>1; + _k=(_i+1)>>1; p=ucwrs2(_k); _i-=p; yj-=_k; @@ -441,7 +441,7 @@ static void cwrsi3(int _k,celt_uint32 _i,int *_y){ yj=_k; /*Finds the maximum _k such that ucwrs3(_k)<=_i (tested for all _i<2147418113=U(3,32768)).*/ - _k=_i>0?isqrt32(2*_i-1)+1>>1:0; + _k=_i>0?(isqrt32(2*_i-1)+1)>>1:0; p=ucwrs3(_k); _i-=p; yj-=_k; @@ -468,7 +468,7 @@ static void cwrsi4(int _k,celt_uint32 _i,int *_y){ kl=0; kr=_k; for(;;){ - _k=kl+kr>>1; + _k=(kl+kr)>>1; p=ucwrs4(_k); if(p<_i){ if(_k>=kr)break; @@ -499,7 +499,7 @@ static void cwrsi5(int _k,celt_uint32 _i,int *_y){ int kl=0; int kr=_k; for(;;){ - _k=kl+kr>>1; + _k=(kl+kr)>>1; p=ucwrs5(_k); if(p<_i){ if(_k>=kr)break; diff --git a/Frameworks/libcelt_0110/celt-0.11.0/libcelt/entcode.c b/Frameworks/libcelt_0110/celt-0.11.0/libcelt/entcode.c index fda9431c7..c66a99a22 100644 --- a/Frameworks/libcelt_0110/celt-0.11.0/libcelt/entcode.c +++ b/Frameworks/libcelt_0110/celt-0.11.0/libcelt/entcode.c @@ -82,7 +82,7 @@ ec_uint32 ec_tell_frac(ec_ctx *_this){ encoder or decoder claims to have used 1 bit.*/ nbits=_this->nbits_total<rng); - r=_this->rng>>l-16; + r=_this->rng>>(l-16); for(i=BITRES;i-->0;){ int b; r=r*r>>15; diff --git a/Frameworks/libcelt_0110/celt-0.11.0/libcelt/entdec.c b/Frameworks/libcelt_0110/celt-0.11.0/libcelt/entdec.c index 61701554a..ff582e7c1 100644 --- a/Frameworks/libcelt_0110/celt-0.11.0/libcelt/entdec.c +++ b/Frameworks/libcelt_0110/celt-0.11.0/libcelt/entdec.c @@ -123,7 +123,7 @@ static void ec_dec_normalize(ec_dec *_this){ /*Read the next value from the input.*/ _this->rem=ec_read_byte(_this); /*Take the rest of the bits we need from this new symbol.*/ - sym=(sym<rem)>>EC_SYM_BITS-EC_CODE_EXTRA; + sym=(sym<rem)>>(EC_SYM_BITS-EC_CODE_EXTRA); /*And subtract them from val, capped to be less than EC_CODE_TOP.*/ _this->val=(_this->val<offs=0; _this->rng=1U<rem=ec_read_byte(_this); - _this->val=_this->rng-1-(_this->rem>>EC_SYM_BITS-EC_CODE_EXTRA); + _this->val=_this->rng-1-(_this->rem>>(EC_SYM_BITS-EC_CODE_EXTRA)); _this->error=0; /*Normalize the interval.*/ ec_dec_normalize(_this); diff --git a/Frameworks/libcelt_0110/celt-0.11.0/libcelt/entenc.c b/Frameworks/libcelt_0110/celt-0.11.0/libcelt/entenc.c index 125cce92f..eb2d7aa88 100644 --- a/Frameworks/libcelt_0110/celt-0.11.0/libcelt/entenc.c +++ b/Frameworks/libcelt_0110/celt-0.11.0/libcelt/entenc.c @@ -235,7 +235,7 @@ void ec_enc_done(ec_enc *_this){ /*We output the minimum number of bits that ensures that the symbols encoded thus far will be decoded correctly regardless of the bits that follow.*/ l=EC_CODE_BITS-EC_ILOG(_this->rng); - msk=EC_CODE_TOP-1>>l; + msk=(EC_CODE_TOP-1)>>l; end=_this->val+msk&~msk; if((end|msk)>=_this->val+_this->rng){ l++; diff --git a/Frameworks/libcelt_0110/celt-0.11.0/libcelt/mathops.c b/Frameworks/libcelt_0110/celt-0.11.0/libcelt/mathops.c index 494649efd..bcfe53cf6 100644 --- a/Frameworks/libcelt_0110/celt-0.11.0/libcelt/mathops.c +++ b/Frameworks/libcelt_0110/celt-0.11.0/libcelt/mathops.c @@ -52,11 +52,11 @@ unsigned isqrt32(celt_uint32 _val){ The main idea is to search for the largest binary digit b such that (g+b)*(g+b) <= _val, and add it to the solution g.*/ g=0; - bshift=EC_ILOG(_val)-1>>1; + bshift=(EC_ILOG(_val)-1)>>1; b=1U<>EC_SYM_BITS) +# define EC_CODE_BOT ((EC_CODE_TOP)>>(EC_SYM_BITS)) /*Code for which propagating carries are possible.*/ -# define EC_CODE_CARRY (((ec_uint32)EC_SYM_MAX)<> stereo+BITRES, MAX_FINE_BITS-ebits[j]); + extra_fine = IMIN(excess >> (stereo+BITRES), MAX_FINE_BITS-ebits[j]); ebits[j] += extra_fine; extra_bits = extra_fine*C<= excess-balance; diff --git a/Frameworks/libcelt_0110/libcelt_0110/libcelt_0110.xcodeproj/project.pbxproj b/Frameworks/libcelt_0110/libcelt_0110/libcelt_0110.xcodeproj/project.pbxproj index 36e69ccb9..e4cd0cbb0 100644 --- a/Frameworks/libcelt_0110/libcelt_0110/libcelt_0110.xcodeproj/project.pbxproj +++ b/Frameworks/libcelt_0110/libcelt_0110/libcelt_0110.xcodeproj/project.pbxproj @@ -3,7 +3,7 @@ archiveVersion = 1; classes = { }; - objectVersion = 50; + objectVersion = 54; objects = { /* Begin PBXBuildFile section */ @@ -262,7 +262,8 @@ 83D676A526539F4E00252130 /* Project object */ = { isa = PBXProject; attributes = { - LastUpgradeCheck = 1400; + BuildIndependentTargetsInParallel = YES; + LastUpgradeCheck = 1500; TargetAttributes = { 83D676AD26539F4E00252130 = { CreatedOnToolsVersion = 12.5; @@ -367,6 +368,7 @@ DEBUG_INFORMATION_FORMAT = dwarf; ENABLE_STRICT_OBJC_MSGSEND = YES; ENABLE_TESTABILITY = YES; + ENABLE_USER_SCRIPT_SANDBOXING = YES; GCC_C_LANGUAGE_STANDARD = gnu11; GCC_DYNAMIC_NO_PIC = NO; GCC_NO_COMMON_BLOCKS = YES; @@ -471,6 +473,7 @@ DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; ENABLE_NS_ASSERTIONS = NO; ENABLE_STRICT_OBJC_MSGSEND = YES; + ENABLE_USER_SCRIPT_SANDBOXING = YES; GCC_C_LANGUAGE_STANDARD = gnu11; GCC_NO_COMMON_BLOCKS = YES; GCC_PREPROCESSOR_DEFINITIONS = ( @@ -538,7 +541,6 @@ CODE_SIGN_STYLE = Automatic; COMBINE_HIDPI_IMAGES = YES; DEAD_CODE_STRIPPING = YES; - DEFINES_MODULE = YES; DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; DYLIB_INSTALL_NAME_BASE = "@loader_path/Frameworks"; @@ -557,7 +559,6 @@ CODE_SIGN_STYLE = Automatic; COMBINE_HIDPI_IMAGES = YES; DEAD_CODE_STRIPPING = YES; - DEFINES_MODULE = YES; DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; DYLIB_INSTALL_NAME_BASE = "@loader_path/Frameworks"; diff --git a/Frameworks/libsidplayfp/sidplayfp b/Frameworks/libsidplayfp/sidplayfp index 93e3a7cd3..519d1201e 160000 --- a/Frameworks/libsidplayfp/sidplayfp +++ b/Frameworks/libsidplayfp/sidplayfp @@ -1 +1 @@ -Subproject commit 93e3a7cd36bed18d8751b0b995d61930d2ab1646 +Subproject commit 519d1201efcc6c97f7cc3506947875d21a9bd195 diff --git a/Frameworks/mGBA/mGBA.xcodeproj/xcshareddata/xcschemes/mGBA.xcscheme b/Frameworks/mGBA/mGBA.xcodeproj/xcshareddata/xcschemes/mGBA.xcscheme index 0da51e203..0cd945419 100644 --- a/Frameworks/mGBA/mGBA.xcodeproj/xcshareddata/xcschemes/mGBA.xcscheme +++ b/Frameworks/mGBA/mGBA.xcodeproj/xcshareddata/xcschemes/mGBA.xcscheme @@ -1,6 +1,6 @@ - + - + @@ -35,7 +35,7 @@ - + @@ -44,7 +44,7 @@ - + @@ -155,7 +155,7 @@ - + @@ -164,7 +164,7 @@ - + @@ -173,7 +173,7 @@ - + @@ -182,7 +182,7 @@ - + @@ -242,7 +242,7 @@ - + @@ -272,7 +272,7 @@ - + @@ -382,7 +382,7 @@ - + @@ -418,10 +418,10 @@ - + - + @@ -440,7 +440,7 @@ - + @@ -453,11 +453,11 @@ - + - - + + @@ -603,7 +603,7 @@ - + @@ -624,7 +624,7 @@ - + @@ -651,7 +651,7 @@ - + @@ -660,7 +660,7 @@ - + @@ -677,7 +677,7 @@ - + @@ -686,7 +686,7 @@ - + @@ -716,7 +716,7 @@ - + @@ -767,7 +767,7 @@ - + @@ -776,7 +776,7 @@ - + @@ -792,7 +792,7 @@ - + @@ -808,7 +808,7 @@ - + @@ -817,7 +817,7 @@ - + @@ -826,7 +826,7 @@ - + @@ -835,7 +835,7 @@ - + @@ -844,7 +844,7 @@ - + @@ -857,7 +857,7 @@ - + @@ -866,7 +866,7 @@ - + @@ -875,7 +875,7 @@ - + @@ -888,7 +888,7 @@ - + diff --git a/Preferences/Preferences/Preferences.xcodeproj/xcshareddata/xcschemes/Preferences.xcscheme b/Preferences/Preferences/Preferences.xcodeproj/xcshareddata/xcschemes/Preferences.xcscheme index 0665f846f..51aba37f6 100644 --- a/Preferences/Preferences/Preferences.xcodeproj/xcshareddata/xcschemes/Preferences.xcscheme +++ b/Preferences/Preferences/Preferences.xcodeproj/xcshareddata/xcschemes/Preferences.xcscheme @@ -1,6 +1,6 @@