Skip to content

Commit d4023fb

Browse files
hrydgardhrydgard
committed
Buildfixes
Buildfix UWP buildfix libretro buildfix
1 parent 6ee008a commit d4023fb

File tree

8 files changed

+130
-7
lines changed

8 files changed

+130
-7
lines changed

‎UWP/CommonUWP/CommonUWP.vcxproj

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -240,6 +240,20 @@
240240
<ClInclude Include="..\..\Common\VR\VRRenderer.h" />
241241
<ClInclude Include="..\..\Common\x64Analyzer.h" />
242242
<ClInclude Include="..\..\Common\x64Emitter.h" />
243+
<ClInclude Include="..\..\ext\at3_standalone\aac_defines.h" />
244+
<ClInclude Include="..\..\ext\at3_standalone\at3_decoders.h" />
245+
<ClInclude Include="..\..\ext\at3_standalone\atrac.h" />
246+
<ClInclude Include="..\..\ext\at3_standalone\atrac3data.h" />
247+
<ClInclude Include="..\..\ext\at3_standalone\atrac3plus.h" />
248+
<ClInclude Include="..\..\ext\at3_standalone\atrac3plus_data.h" />
249+
<ClInclude Include="..\..\ext\at3_standalone\compat.h" />
250+
<ClInclude Include="..\..\ext\at3_standalone\fft.h" />
251+
<ClInclude Include="..\..\ext\at3_standalone\float_dsp.h" />
252+
<ClInclude Include="..\..\ext\at3_standalone\get_bits.h" />
253+
<ClInclude Include="..\..\ext\at3_standalone\intreadwrite.h" />
254+
<ClInclude Include="..\..\ext\at3_standalone\mathematics.h" />
255+
<ClInclude Include="..\..\ext\at3_standalone\mem.h" />
256+
<ClInclude Include="..\..\ext\at3_standalone\sinewin.h" />
243257
<ClInclude Include="..\..\ext\basis_universal\basisu.h" />
244258
<ClInclude Include="..\..\ext\basis_universal\basisu_containers.h" />
245259
<ClInclude Include="..\..\ext\basis_universal\basisu_containers_impl.h" />
@@ -381,6 +395,18 @@
381395
<ClCompile Include="..\..\Common\VR\VRRenderer.cpp" />
382396
<ClCompile Include="..\..\Common\x64Analyzer.cpp" />
383397
<ClCompile Include="..\..\Common\x64Emitter.cpp" />
398+
<ClCompile Include="..\..\ext\at3_standalone\atrac.cpp" />
399+
<ClCompile Include="..\..\ext\at3_standalone\atrac3.cpp" />
400+
<ClCompile Include="..\..\ext\at3_standalone\atrac3plus.cpp" />
401+
<ClCompile Include="..\..\ext\at3_standalone\atrac3plusdec.cpp" />
402+
<ClCompile Include="..\..\ext\at3_standalone\atrac3plusdsp.cpp" />
403+
<ClCompile Include="..\..\ext\at3_standalone\compat.cpp" />
404+
<ClCompile Include="..\..\ext\at3_standalone\fft.cpp" />
405+
<ClCompile Include="..\..\ext\at3_standalone\float_dsp.cpp" />
406+
<ClCompile Include="..\..\ext\at3_standalone\get_bits.cpp" />
407+
<ClCompile Include="..\..\ext\at3_standalone\mathematics.cpp" />
408+
<ClCompile Include="..\..\ext\at3_standalone\mem.cpp" />
409+
<ClCompile Include="..\..\ext\at3_standalone\sinewin.cpp" />
384410
<ClCompile Include="..\..\ext\basis_universal\basisu_transcoder.cpp" />
385411
<ClCompile Include="..\..\ext\libpng17\png.c" />
386412
<ClCompile Include="..\..\ext\libpng17\pngerror.c" />
@@ -423,6 +449,10 @@
423449
<Project>{c249f016-7f82-45cf-bb6e-0642a988c4d3}</Project>
424450
</ProjectReference>
425451
</ItemGroup>
452+
<ItemGroup>
453+
<Text Include="..\..\ext\at3_standalone\CMakeLists.txt" />
454+
<Text Include="..\..\ext\at3_standalone\README.txt" />
455+
</ItemGroup>
426456
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
427457
<ImportGroup Label="ExtensionTargets">
428458
</ImportGroup>

‎UWP/CommonUWP/CommonUWP.vcxproj.filters

Lines changed: 89 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -100,6 +100,9 @@
100100
<Filter Include="ext\minimp3">
101101
<UniqueIdentifier>{7b5c3ddc-225d-48d5-a829-9a1e71e304be}</UniqueIdentifier>
102102
</Filter>
103+
<Filter Include="ext\at3_standalone">
104+
<UniqueIdentifier>{47e3b9c8-3a5f-4c78-b62b-3fa65bf23594}</UniqueIdentifier>
105+
</Filter>
103106
</ItemGroup>
104107
<ItemGroup>
105108
<ClCompile Include="..\..\Common\ABI.cpp" />
@@ -462,6 +465,42 @@
462465
<ClCompile Include="..\..\ext\minimp3\minimp3.cpp">
463466
<Filter>ext\minimp3</Filter>
464467
</ClCompile>
468+
<ClCompile Include="..\..\ext\at3_standalone\atrac.cpp">
469+
<Filter>ext\at3_standalone</Filter>
470+
</ClCompile>
471+
<ClCompile Include="..\..\ext\at3_standalone\atrac3.cpp">
472+
<Filter>ext\at3_standalone</Filter>
473+
</ClCompile>
474+
<ClCompile Include="..\..\ext\at3_standalone\atrac3plus.cpp">
475+
<Filter>ext\at3_standalone</Filter>
476+
</ClCompile>
477+
<ClCompile Include="..\..\ext\at3_standalone\atrac3plusdec.cpp">
478+
<Filter>ext\at3_standalone</Filter>
479+
</ClCompile>
480+
<ClCompile Include="..\..\ext\at3_standalone\atrac3plusdsp.cpp">
481+
<Filter>ext\at3_standalone</Filter>
482+
</ClCompile>
483+
<ClCompile Include="..\..\ext\at3_standalone\compat.cpp">
484+
<Filter>ext\at3_standalone</Filter>
485+
</ClCompile>
486+
<ClCompile Include="..\..\ext\at3_standalone\fft.cpp">
487+
<Filter>ext\at3_standalone</Filter>
488+
</ClCompile>
489+
<ClCompile Include="..\..\ext\at3_standalone\float_dsp.cpp">
490+
<Filter>ext\at3_standalone</Filter>
491+
</ClCompile>
492+
<ClCompile Include="..\..\ext\at3_standalone\get_bits.cpp">
493+
<Filter>ext\at3_standalone</Filter>
494+
</ClCompile>
495+
<ClCompile Include="..\..\ext\at3_standalone\mathematics.cpp">
496+
<Filter>ext\at3_standalone</Filter>
497+
</ClCompile>
498+
<ClCompile Include="..\..\ext\at3_standalone\mem.cpp">
499+
<Filter>ext\at3_standalone</Filter>
500+
</ClCompile>
501+
<ClCompile Include="..\..\ext\at3_standalone\sinewin.cpp">
502+
<Filter>ext\at3_standalone</Filter>
503+
</ClCompile>
465504
</ItemGroup>
466505
<ItemGroup>
467506
<ClInclude Include="targetver.h" />
@@ -877,6 +916,48 @@
877916
<ClInclude Include="..\..\ext\minimp3\minimp3_ex.h">
878917
<Filter>ext\minimp3</Filter>
879918
</ClInclude>
919+
<ClInclude Include="..\..\ext\at3_standalone\aac_defines.h">
920+
<Filter>ext\at3_standalone</Filter>
921+
</ClInclude>
922+
<ClInclude Include="..\..\ext\at3_standalone\at3_decoders.h">
923+
<Filter>ext\at3_standalone</Filter>
924+
</ClInclude>
925+
<ClInclude Include="..\..\ext\at3_standalone\atrac.h">
926+
<Filter>ext\at3_standalone</Filter>
927+
</ClInclude>
928+
<ClInclude Include="..\..\ext\at3_standalone\atrac3data.h">
929+
<Filter>ext\at3_standalone</Filter>
930+
</ClInclude>
931+
<ClInclude Include="..\..\ext\at3_standalone\atrac3plus.h">
932+
<Filter>ext\at3_standalone</Filter>
933+
</ClInclude>
934+
<ClInclude Include="..\..\ext\at3_standalone\atrac3plus_data.h">
935+
<Filter>ext\at3_standalone</Filter>
936+
</ClInclude>
937+
<ClInclude Include="..\..\ext\at3_standalone\compat.h">
938+
<Filter>ext\at3_standalone</Filter>
939+
</ClInclude>
940+
<ClInclude Include="..\..\ext\at3_standalone\fft.h">
941+
<Filter>ext\at3_standalone</Filter>
942+
</ClInclude>
943+
<ClInclude Include="..\..\ext\at3_standalone\float_dsp.h">
944+
<Filter>ext\at3_standalone</Filter>
945+
</ClInclude>
946+
<ClInclude Include="..\..\ext\at3_standalone\get_bits.h">
947+
<Filter>ext\at3_standalone</Filter>
948+
</ClInclude>
949+
<ClInclude Include="..\..\ext\at3_standalone\intreadwrite.h">
950+
<Filter>ext\at3_standalone</Filter>
951+
</ClInclude>
952+
<ClInclude Include="..\..\ext\at3_standalone\mathematics.h">
953+
<Filter>ext\at3_standalone</Filter>
954+
</ClInclude>
955+
<ClInclude Include="..\..\ext\at3_standalone\mem.h">
956+
<Filter>ext\at3_standalone</Filter>
957+
</ClInclude>
958+
<ClInclude Include="..\..\ext\at3_standalone\sinewin.h">
959+
<Filter>ext\at3_standalone</Filter>
960+
</ClInclude>
880961
</ItemGroup>
881962
<ItemGroup>
882963
<None Include="..\..\Common\Math\fast\fast_matrix_neon.S">
@@ -917,4 +998,12 @@
917998
<Filter>ext\basis_universal</Filter>
918999
</None>
9191000
</ItemGroup>
1001+
<ItemGroup>
1002+
<Text Include="..\..\ext\at3_standalone\CMakeLists.txt">
1003+
<Filter>ext\at3_standalone</Filter>
1004+
</Text>
1005+
<Text Include="..\..\ext\at3_standalone\README.txt">
1006+
<Filter>ext\at3_standalone</Filter>
1007+
</Text>
1008+
</ItemGroup>
9201009
</Project>

‎UWP/CoreUWP/CoreUWP.vcxproj

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -261,6 +261,7 @@
261261
<ClInclude Include="..\..\Core\HW\MpegDemux.h" />
262262
<ClInclude Include="..\..\Core\HW\SasAudio.h" />
263263
<ClInclude Include="..\..\Core\HW\SasReverb.h" />
264+
<ClInclude Include="..\..\Core\HW\Atrac3Standalone.h" />
264265
<ClInclude Include="..\..\Core\HW\SimpleAudioDec.h" />
265266
<ClInclude Include="..\..\Core\HW\StereoResampler.h" />
266267
<ClInclude Include="..\..\Core\KeyMap.h" />
@@ -508,6 +509,7 @@
508509
<ClCompile Include="..\..\Core\HW\MpegDemux.cpp" />
509510
<ClCompile Include="..\..\Core\HW\SasAudio.cpp" />
510511
<ClCompile Include="..\..\Core\HW\SasReverb.cpp" />
512+
<ClCompile Include="..\..\Core\HW\Atrac3Standalone.cpp" />
511513
<ClCompile Include="..\..\Core\HW\SimpleAudioDec.cpp" />
512514
<ClCompile Include="..\..\Core\HW\StereoResampler.cpp" />
513515
<ClCompile Include="..\..\Core\KeyMap.cpp" />

‎UWP/CoreUWP/CoreUWP.vcxproj.filters

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -258,6 +258,9 @@
258258
<ClCompile Include="..\..\Core\HW\SimpleAudioDec.cpp">
259259
<Filter>HW</Filter>
260260
</ClCompile>
261+
<ClCompile Include="..\..\Core\HW\Atrac3Standalone.cpp">
262+
<Filter>HW</Filter>
263+
</ClCompile>
261264
<ClCompile Include="..\..\Core\HW\StereoResampler.cpp">
262265
<Filter>HW</Filter>
263266
</ClCompile>
@@ -1306,6 +1309,9 @@
13061309
<ClInclude Include="..\..\Core\HW\SimpleAudioDec.h">
13071310
<Filter>HW</Filter>
13081311
</ClInclude>
1312+
<ClInclude Include="..\..\Core\HW\Atrac3Standalone.h">
1313+
<Filter>HW</Filter>
1314+
</ClInclude>
13091315
<ClInclude Include="..\..\Core\HW\StereoResampler.h">
13101316
<Filter>HW</Filter>
13111317
</ClInclude>

‎android/jni/Android.mk

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,6 @@ AT3_STANDALONE_FILES := \
118118
${SRC}/ext/at3_standalone/atrac3plus.cpp \
119119
${SRC}/ext/at3_standalone/atrac3plusdec.cpp \
120120
${SRC}/ext/at3_standalone/atrac3plusdsp.cpp \
121-
${SRC}/ext/at3_standalone/avcodec.cpp \
122121
${SRC}/ext/at3_standalone/get_bits.cpp \
123122
${SRC}/ext/at3_standalone/compat.cpp \
124123
${SRC}/ext/at3_standalone/fft.cpp \

‎ext/at3_standalone/atrac.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
* ATRAC common header
2727
*/
2828

29-
#include "ext/at3_standalone/compat.h"
29+
#include "compat.h"
3030

3131
#ifndef AVCODEC_ATRAC_H
3232
#define AVCODEC_ATRAC_H

‎ext/at3_standalone/compat.cpp

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,3 @@
1-
#include <stdlib.h>
2-
#include <string.h>
3-
#include <stdint.h>
4-
5-
#include "ext/at3_standalone/compat.h"
1+
#include "compat.h"
62

73
void av_log(int level, const char *fmt, ...) {}

‎libretro/Makefile.common

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -718,6 +718,7 @@ SOURCES_CXX += \
718718
$(COREDIR)/HW/Camera.cpp \
719719
$(COREDIR)/HW/Display.cpp \
720720
$(COREDIR)/HW/SimpleAudioDec.cpp \
721+
$(COREDIR)/HW/Atrac3Standalone.cpp \
721722
$(COREDIR)/HW/AsyncIOManager.cpp \
722723
$(COREDIR)/HW/MediaEngine.cpp \
723724
$(COREDIR)/HW/MpegDemux.cpp \

0 commit comments

Comments
 (0)