From eef3a40ed606be98451ad393a9f3d9de204f69d3 Mon Sep 17 00:00:00 2001 From: Tom Kidd Date: Wed, 17 Mar 2021 23:58:14 -0500 Subject: [PATCH] Restored original opus sse files, excluded from Xcode Also added line break in script for consistency, thanks @zturtleman --- code/opus-1.2.1/celt/x86/celt_lpc_sse.c | 3 --- code/opus-1.2.1/celt/x86/pitch_sse2.c | 2 -- code/opus-1.2.1/celt/x86/pitch_sse4_1.c | 3 --- code/opus-1.2.1/celt/x86/vq_sse2.c | 3 --- code/opus-1.2.1/silk/x86/VAD_sse.c | 3 --- make-macosx-app.sh | 1 + misc/xcode/ioquake3.xcodeproj/project.pbxproj | 8 ++++---- misc/xcode/opus.xcodeproj/project.pbxproj | 10 ---------- 8 files changed, 5 insertions(+), 28 deletions(-) diff --git a/code/opus-1.2.1/celt/x86/celt_lpc_sse.c b/code/opus-1.2.1/celt/x86/celt_lpc_sse.c index ab227b84..54785688 100644 --- a/code/opus-1.2.1/celt/x86/celt_lpc_sse.c +++ b/code/opus-1.2.1/celt/x86/celt_lpc_sse.c @@ -29,8 +29,6 @@ #include "config.h" #endif -#if defined (__i386__) || defined(__x86_64__) - #include #include #include @@ -89,4 +87,3 @@ void celt_fir_sse4_1(const opus_val16 *x, } #endif -#endif diff --git a/code/opus-1.2.1/celt/x86/pitch_sse2.c b/code/opus-1.2.1/celt/x86/pitch_sse2.c index 7ae0ba57..a0e7d1be 100644 --- a/code/opus-1.2.1/celt/x86/pitch_sse2.c +++ b/code/opus-1.2.1/celt/x86/pitch_sse2.c @@ -29,7 +29,6 @@ #include "config.h" #endif -#if defined (__i386__) || defined(__x86_64__) #include #include @@ -94,4 +93,3 @@ opus_val32 celt_inner_prod_sse2(const opus_val16 *x, const opus_val16 *y, return sum; } #endif -#endif diff --git a/code/opus-1.2.1/celt/x86/pitch_sse4_1.c b/code/opus-1.2.1/celt/x86/pitch_sse4_1.c index 1ef29e70..a092c68b 100644 --- a/code/opus-1.2.1/celt/x86/pitch_sse4_1.c +++ b/code/opus-1.2.1/celt/x86/pitch_sse4_1.c @@ -29,8 +29,6 @@ #include "config.h" #endif -#if defined (__i386__) || defined(__x86_64__) - #include #include @@ -195,4 +193,3 @@ void xcorr_kernel_sse4_1(const opus_val16 * x, const opus_val16 * y, opus_val32 _mm_storeu_si128((__m128i *)sum, initSum); } #endif -#endif diff --git a/code/opus-1.2.1/celt/x86/vq_sse2.c b/code/opus-1.2.1/celt/x86/vq_sse2.c index 99e0adf8..6a317703 100644 --- a/code/opus-1.2.1/celt/x86/vq_sse2.c +++ b/code/opus-1.2.1/celt/x86/vq_sse2.c @@ -30,8 +30,6 @@ #include "config.h" #endif -#if defined (__i386__) || defined(__x86_64__) - #include #include #include "celt_lpc.h" @@ -217,4 +215,3 @@ opus_val16 op_pvq_search_sse2(celt_norm *_X, int *iy, int K, int N, int arch) } #endif -#endif diff --git a/code/opus-1.2.1/silk/x86/VAD_sse.c b/code/opus-1.2.1/silk/x86/VAD_sse.c index b8f8add7..4e90f441 100644 --- a/code/opus-1.2.1/silk/x86/VAD_sse.c +++ b/code/opus-1.2.1/silk/x86/VAD_sse.c @@ -29,8 +29,6 @@ #include "config.h" #endif -#if defined (__i386__) || defined(__x86_64__) - #include #include #include @@ -277,4 +275,3 @@ opus_int silk_VAD_GetSA_Q8_sse4_1( /* O Return value, 0 if s RESTORE_STACK; return( ret ); } -#endif diff --git a/make-macosx-app.sh b/make-macosx-app.sh index b4208e40..d077c2f5 100755 --- a/make-macosx-app.sh +++ b/make-macosx-app.sh @@ -350,6 +350,7 @@ if [ -n "${MACOSX_DEPLOYMENT_TARGET_PPC}" ] || [ -n "${MACOSX_DEPLOYMENT_TARGET_ x86_64 ${MACOSX_DEPLOYMENT_TARGET_X86_64}" fi + if [ -n "${MACOSX_DEPLOYMENT_TARGET_ARM64}" ]; then PLIST="${PLIST} arm64 diff --git a/misc/xcode/ioquake3.xcodeproj/project.pbxproj b/misc/xcode/ioquake3.xcodeproj/project.pbxproj index 963aa73b..91d29db8 100644 --- a/misc/xcode/ioquake3.xcodeproj/project.pbxproj +++ b/misc/xcode/ioquake3.xcodeproj/project.pbxproj @@ -51,8 +51,6 @@ 2735379E14D8F13E000D6E73 /* botlib.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 2735379B14D8F13E000D6E73 /* botlib.a */; }; 274FAB79178FA81800B17C7A /* snd_main.c in Sources */ = {isa = PBXBuildFile; fileRef = 274FAB78178FA81700B17C7A /* snd_main.c */; }; 274FAB7B178FA86E00B17C7A /* md5.c in Sources */ = {isa = PBXBuildFile; fileRef = 274FAB7A178FA86E00B17C7A /* md5.c */; }; - 274FAB86178FA97400B17C7A /* ftola.c in Sources */ = {isa = PBXBuildFile; fileRef = 274FAB7D178FA97100B17C7A /* ftola.c */; }; - 274FAB87178FA98500B17C7A /* snapvector.c in Sources */ = {isa = PBXBuildFile; fileRef = 274FAB81178FA97100B17C7A /* snapvector.c */; }; 274FAB88178FA98E00B17C7A /* snd_mixa.s in Sources */ = {isa = PBXBuildFile; fileRef = 274FAB82178FA97100B17C7A /* snd_mixa.s */; }; 274FAB8A178FA9AA00B17C7A /* matha.s in Sources */ = {isa = PBXBuildFile; fileRef = 274FAB7E178FA97100B17C7A /* matha.s */; }; 274FABFD178FAC4900B17C7A /* vm_x86.c in Sources */ = {isa = PBXBuildFile; fileRef = 2711BE9E14D136DF005EB142 /* vm_x86.c */; }; @@ -90,6 +88,8 @@ A163B25A2193AEA100C48278 /* libopus.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = A1665973219341DF0086B74B /* libopus.dylib */; }; A163B25C2193AF1E00C48278 /* renderer_opengl1.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = A163B25B2193AF1E00C48278 /* renderer_opengl1.dylib */; }; A1665971219107490086B74B /* sys_autoupdater.c in Sources */ = {isa = PBXBuildFile; fileRef = A1665970219107490086B74B /* sys_autoupdater.c */; }; + A1F3185E2603127800A11B0E /* ftola.c in Sources */ = {isa = PBXBuildFile; fileRef = 274FAB7D178FA97100B17C7A /* ftola.c */; }; + A1F318612603128500A11B0E /* snapvector.c in Sources */ = {isa = PBXBuildFile; fileRef = 274FAB81178FA97100B17C7A /* snapvector.c */; }; /* End PBXBuildFile section */ /* Begin PBXCopyFilesBuildPhase section */ @@ -909,6 +909,7 @@ 27AAD00E178E007B0093DFC0 /* snd_openal.c in Sources */, 27AAD011178E00AB0093DFC0 /* ioapi.c in Sources */, 27AAD013178E00C30093DFC0 /* net_ip.c in Sources */, + A1F3185E2603127800A11B0E /* ftola.c in Sources */, 27AAD016178E00CE0093DFC0 /* puff.c in Sources */, 27AAD01B178E00E80093DFC0 /* q_math.c in Sources */, 27AAD01C178E00E80093DFC0 /* q_shared.c in Sources */, @@ -916,12 +917,11 @@ 27AAD02D178E013E0093DFC0 /* sdl_snd.c in Sources */, 274FAB79178FA81800B17C7A /* snd_main.c in Sources */, 274FAB7B178FA86E00B17C7A /* md5.c in Sources */, - 274FAB86178FA97400B17C7A /* ftola.c in Sources */, - 274FAB87178FA98500B17C7A /* snapvector.c in Sources */, 274FAB88178FA98E00B17C7A /* snd_mixa.s in Sources */, 274FAB8A178FA9AA00B17C7A /* matha.s in Sources */, 274FABFD178FAC4900B17C7A /* vm_x86.c in Sources */, 274FABFE178FAC6E00B17C7A /* tr_noise.c in Sources */, + A1F318612603128500A11B0E /* snapvector.c in Sources */, 278714D917911C1300094CA3 /* libmumblelink.c in Sources */, ); runOnlyForDeploymentPostprocessing = 0; diff --git a/misc/xcode/opus.xcodeproj/project.pbxproj b/misc/xcode/opus.xcodeproj/project.pbxproj index b807606a..734cae59 100644 --- a/misc/xcode/opus.xcodeproj/project.pbxproj +++ b/misc/xcode/opus.xcodeproj/project.pbxproj @@ -56,12 +56,8 @@ A1665F3C2193AAEC0086B74B /* celt_lpc.c in Sources */ = {isa = PBXBuildFile; fileRef = A1665ACD2193AAEB0086B74B /* celt_lpc.c */; settings = {COMPILER_FLAGS = "-w"; }; }; A1665F3D2193AAEC0086B74B /* celt_encoder.c in Sources */ = {isa = PBXBuildFile; fileRef = A1665ACE2193AAEB0086B74B /* celt_encoder.c */; settings = {COMPILER_FLAGS = "-w"; }; }; A1665F3E2193AAEC0086B74B /* rate.h in Headers */ = {isa = PBXBuildFile; fileRef = A1665ACF2193AAEB0086B74B /* rate.h */; }; - A1665F3F2193AAEC0086B74B /* vq_sse2.c in Sources */ = {isa = PBXBuildFile; fileRef = A1665AD12193AAEB0086B74B /* vq_sse2.c */; settings = {COMPILER_FLAGS = "-w"; }; }; - A1665F402193AAEC0086B74B /* pitch_sse4_1.c in Sources */ = {isa = PBXBuildFile; fileRef = A1665AD22193AAEB0086B74B /* pitch_sse4_1.c */; settings = {COMPILER_FLAGS = "-w"; }; }; - A1665F412193AAEC0086B74B /* pitch_sse2.c in Sources */ = {isa = PBXBuildFile; fileRef = A1665AD32193AAEB0086B74B /* pitch_sse2.c */; settings = {COMPILER_FLAGS = "-w"; }; }; A1665F422193AAEC0086B74B /* x86cpu.c in Sources */ = {isa = PBXBuildFile; fileRef = A1665AD42193AAEB0086B74B /* x86cpu.c */; settings = {COMPILER_FLAGS = "-w"; }; }; A1665F432193AAEC0086B74B /* x86_celt_map.c in Sources */ = {isa = PBXBuildFile; fileRef = A1665AD52193AAEB0086B74B /* x86_celt_map.c */; settings = {COMPILER_FLAGS = "-w"; }; }; - A1665F442193AAEC0086B74B /* celt_lpc_sse.c in Sources */ = {isa = PBXBuildFile; fileRef = A1665AD62193AAEB0086B74B /* celt_lpc_sse.c */; settings = {COMPILER_FLAGS = "-w"; }; }; A1665F452193AAEC0086B74B /* pitch_sse.c in Sources */ = {isa = PBXBuildFile; fileRef = A1665AD72193AAEB0086B74B /* pitch_sse.c */; settings = {COMPILER_FLAGS = "-w"; }; }; A1665F462193AAEC0086B74B /* x86cpu.h in Headers */ = {isa = PBXBuildFile; fileRef = A1665AD82193AAEB0086B74B /* x86cpu.h */; }; A1665F472193AAEC0086B74B /* celt_lpc_sse.h in Headers */ = {isa = PBXBuildFile; fileRef = A1665AD92193AAEB0086B74B /* celt_lpc_sse.h */; }; @@ -186,7 +182,6 @@ A1665FCE2193AAEC0086B74B /* main_sse.h in Headers */ = {isa = PBXBuildFile; fileRef = A1665B682193AAEB0086B74B /* main_sse.h */; }; A1665FCF2193AAEC0086B74B /* SigProc_FIX_sse.h in Headers */ = {isa = PBXBuildFile; fileRef = A1665B692193AAEB0086B74B /* SigProc_FIX_sse.h */; }; A1665FD02193AAEC0086B74B /* x86_silk_map.c in Sources */ = {isa = PBXBuildFile; fileRef = A1665B6A2193AAEB0086B74B /* x86_silk_map.c */; settings = {COMPILER_FLAGS = "-w"; }; }; - A1665FD12193AAEC0086B74B /* VAD_sse.c in Sources */ = {isa = PBXBuildFile; fileRef = A1665B6B2193AAEB0086B74B /* VAD_sse.c */; settings = {COMPILER_FLAGS = "-w"; }; }; A1665FD52193AAEC0086B74B /* biquad_alt.c in Sources */ = {isa = PBXBuildFile; fileRef = A1665B6F2193AAEB0086B74B /* biquad_alt.c */; settings = {COMPILER_FLAGS = "-w"; }; }; A1665FD62193AAEC0086B74B /* tables_LTP.c in Sources */ = {isa = PBXBuildFile; fileRef = A1665B702193AAEB0086B74B /* tables_LTP.c */; settings = {COMPILER_FLAGS = "-w"; }; }; A1665FD72193AAEC0086B74B /* LPC_analysis_filter_FLP.c in Sources */ = {isa = PBXBuildFile; fileRef = A1665B722193AAEB0086B74B /* LPC_analysis_filter_FLP.c */; settings = {COMPILER_FLAGS = "-w"; }; }; @@ -1197,8 +1192,6 @@ A1665FC52193AAEC0086B74B /* warped_autocorrelation_FIX.c in Sources */, A1665FEC2193AAEC0086B74B /* pitch_analysis_core_FLP.c in Sources */, A1665FB02193AAEC0086B74B /* schur64_FIX.c in Sources */, - A1665F442193AAEC0086B74B /* celt_lpc_sse.c in Sources */, - A1665F3F2193AAEC0086B74B /* vq_sse2.c in Sources */, A16660102193AAEC0086B74B /* NLSF_VQ_weights_laroia.c in Sources */, A1665FF42193AAEC0086B74B /* residual_energy_FLP.c in Sources */, A1665FEF2193AAEC0086B74B /* corrMatrix_FLP.c in Sources */, @@ -1247,10 +1240,8 @@ A1665FD92193AAEC0086B74B /* regularize_correlations_FLP.c in Sources */, A1665E7F2193AAEC0086B74B /* stream.c in Sources */, A1665F4A2193AAEC0086B74B /* pitch.c in Sources */, - A1665F402193AAEC0086B74B /* pitch_sse4_1.c in Sources */, A1665FB12193AAEC0086B74B /* LTP_scale_ctrl_FIX.c in Sources */, A1665FE52193AAEC0086B74B /* find_LTP_FLP.c in Sources */, - A1665FD12193AAEC0086B74B /* VAD_sse.c in Sources */, A1665FD02193AAEC0086B74B /* x86_silk_map.c in Sources */, A1665F732193AAEC0086B74B /* init_encoder.c in Sources */, A1665F342193AAEC0086B74B /* mathops.c in Sources */, @@ -1262,7 +1253,6 @@ A1665F262193AAEC0086B74B /* mdct.c in Sources */, A1665F4F2193AAEC0086B74B /* entcode.c in Sources */, A166602B2193AAED0086B74B /* mlp_data.c in Sources */, - A1665F412193AAEC0086B74B /* pitch_sse2.c in Sources */, A1665F872193AAEC0086B74B /* table_LSF_cos.c in Sources */, A16660112193AAEC0086B74B /* resampler_down2_3.c in Sources */, A1665F802193AAEC0086B74B /* stereo_LR_to_MS.c in Sources */,