cleanup: move clHCA to coding to simplify

Also has changed a lot from the original so it's barely external now

src/Makefile.autotools.am

@@ -10,10 +10,8 @@ SUBDIRS = coding layout meta
 # sources/headers are updated automatically by ./bootstrap script (not all headers are needed though)
 libvgmstream_la_LDFLAGS = coding/libcoding.la layout/liblayout.la meta/libmeta.la
 libvgmstream_la_SOURCES = (auto-updated)
-libvgmstream_la_SOURCES += ../ext_libs/clHCA.c
 libvgmstream_la_LIBADD = -lm
 EXTRA_DIST = (auto-updated)
-EXTRA_DIST += ../ext_includes/clHCA.h
 
 AM_CFLAGS += -DVGM_USE_G7221
 

src/coding/coding.h

@@ -2,6 +2,8 @@
 #define _CODING_H
 
 #include "../vgmstream.h"
+//todo remove
+#include "hca_decoder_clhca.h"
 
 /* adx_decoder */
 void decode_adx(VGMSTREAMCHANNEL* stream, sample_t* outbuf, int channelspacing, int32_t first_sample, int32_t samples_to_do, int32_t frame_bytes, coding_t coding_type);

src/coding/hca_decoder.c

@@ -1,5 +1,5 @@
 #include "coding.h"
-#include <clHCA.h>
+#include "hca_decoder_clhca.h"
 
 
 struct hca_codec_data {

src/coding/hca_decoder_clhca.c

@@ -25,7 +25,7 @@
 //--------------------------------------------------
 // Includes
 //--------------------------------------------------
-#include "clHCA.h"
+#include "hca_decoder_clhca.h"
 #include <stddef.h>
 #include <stdlib.h>
 #include <memory.h>

src/libvgmstream.vcxproj

@@ -83,7 +83,7 @@
     </ClCompile>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClInclude Include="..\ext_includes\clHCA.h" />
+    <ClInclude Include="coding\hca_decoder_clhca.h" />
     <ClInclude Include="coding\mpeg_bitreader.h" />
     <ClInclude Include="coding\mpeg_decoder.h" />
     <ClInclude Include="coding\vorbis_bitreader.h" />
@@ -622,6 +622,7 @@
     <ClCompile Include="coding\g7221_decoder_aes.c" />
     <ClCompile Include="coding\g7221_decoder_lib.c" />
     <ClCompile Include="coding\hca_decoder.c" />
+    <ClCompile Include="coding\hca_decoder_clhca.c" />
     <ClCompile Include="coding\ima_decoder.c" />
     <ClCompile Include="coding\imuse_decoder.c" />
     <ClCompile Include="coding\l5_555_decoder.c" />
@@ -706,7 +707,6 @@
     <ClCompile Include="layout\blocked_xa.c" />
     <ClCompile Include="layout\blocked_xa_aiff.c" />
     <ClCompile Include="layout\blocked_xvas.c" />
-    <ClCompile Include="..\ext_libs\clHCA.c" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">

src/libvgmstream.vcxproj.filters

@@ -263,8 +263,8 @@
     <ClInclude Include="layout\layout.h">
       <Filter>layout\Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\ext_includes\clHCA.h">
-      <Filter>ext_libs\Header Files</Filter>
+    <ClInclude Include="coding\hca_decoder_clhca.h">
+      <Filter>coding\Header Files</Filter>
     </ClInclude>
     <ClInclude Include="coding\mpeg_bitreader.h">
       <Filter>coding\Header Files</Filter>
@@ -1333,6 +1333,9 @@
     <ClCompile Include="coding\hca_decoder.c">
       <Filter>coding\Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="coding\hca_decoder_clhca.c">
+      <Filter>coding\Source Files</Filter>
+    </ClCompile>
     <ClCompile Include="coding\ima_decoder.c">
       <Filter>coding\Source Files</Filter>
     </ClCompile>
@@ -1789,9 +1792,6 @@
     <ClCompile Include="coding\g719_decoder.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\ext_libs\clHCA.c">
-      <Filter>ext_libs\Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="meta\ffmpeg.c">
       <Filter>meta\Source Files</Filter>
     </ClCompile>

src/meta/hca.c

@@ -1,7 +1,7 @@
 #include "meta.h"
 #include "hca_keys.h"
 #include "../coding/coding.h"
-#include <clHCA.h>
+#include "../coding/hca_decoder_clhca.h"
 
 //#define HCA_BRUTEFORCE
 #ifdef HCA_BRUTEFORCE

src/vgmstream.h

@@ -42,8 +42,6 @@ enum {
 #include <aacdecoder_lib.h>
 #endif
 
-#include <clHCA.h>
-
 #include "coding/g72x_state.h"