libcurl static crt

CGSSAssetDownloader.sln → CGSSAssetsDownloader.sln

@@ -3,7 +3,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 15
 VisualStudioVersion = 15.0.28010.2036
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CGSSAssetDownloader", "CGSSAssetDownloader.vcxproj", "{9D8C967A-CF50-4A53-9F90-5059F67F9BE9}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CGSSAssetsDownloader", "CGSSAssetsDownloader.vcxproj", "{9D8C967A-CF50-4A53-9F90-5059F67F9BE9}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution

CGSSAssetDownloader.vcxproj → CGSSAssetsDownloader.vcxproj

@@ -21,33 +21,34 @@
   <PropertyGroup Label="Globals">
     <VCProjectVersion>15.0</VCProjectVersion>
     <ProjectGuid>{9D8C967A-CF50-4A53-9F90-5059F67F9BE9}</ProjectGuid>
-    <RootNamespace>CGSSAssetDownloader</RootNamespace>
-    <WindowsTargetPlatformVersion>10.0.17134.0</WindowsTargetPlatformVersion>
+    <RootNamespace>CGSSAssetsDownloader</RootNamespace>
+    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
+    <ProjectName>CGSSAssetsDownloader</ProjectName>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v141</PlatformToolset>
+    <PlatformToolset>v142</PlatformToolset>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v141</PlatformToolset>
+    <PlatformToolset>v142</PlatformToolset>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v141</PlatformToolset>
+    <PlatformToolset>v142</PlatformToolset>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v141</PlatformToolset>
+    <PlatformToolset>v142</PlatformToolset>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
@@ -119,8 +120,9 @@
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
       <AdditionalLibraryDirectories>$(ProjectDir)lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <AdditionalDependencies>libcurl_a.lib;libmp3lame-static.lib;libmpghip-static.lib;ws2_32.lib;winmm.lib;wldap32.lib;crypt32.lib;Normaliz.lib;msvcrt.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <IgnoreSpecificDefaultLibraries>libcmt.lib</IgnoreSpecificDefaultLibraries>
+      <AdditionalDependencies>libcurl_a.lib;libmp3lame-static.lib;libmpghip-static.lib;ws2_32.lib;winmm.lib;wldap32.lib;crypt32.lib;Normaliz.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <IgnoreSpecificDefaultLibraries>
+      </IgnoreSpecificDefaultLibraries>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">

src/CGSSAssetsDownloader.cpp

@@ -42,8 +42,8 @@ static bool wav2mp3(std::string wavPath, std::string mp3Path) {
 
   const int CHANNEL = 2;
 
-  short int wav_buffer[WAV_SIZE * CHANNEL];
-  unsigned char mp3_buffer[MP3_SIZE];
+  short int *wav_buffer = new short int[WAV_SIZE * CHANNEL];
+  unsigned char *mp3_buffer = new unsigned char[MP3_SIZE];
 
   lame_t lame = lame_init();
   lame_set_in_samplerate(lame, 44100);
@@ -65,6 +65,8 @@ static bool wav2mp3(std::string wavPath, std::string mp3Path) {
     fwrite(mp3_buffer, sizeof(unsigned char), static_cast<size_t>(write), mp3);
   } while (read != 0);
 
+  delete[] wav_buffer;
+  delete[] mp3_buffer;
   // lame_mp3_tags_fid(lame, mp3);
   lame_close(lame);
   fclose(mp3);
@@ -212,15 +214,15 @@ void Downloader::download_single(string file) {
 }
 
 void show_introduction() {
-  printf("CGSSAssetsDownloader VERSION 2.0.0-pre2\n\n");
+  printf("CGSSAssetsDownloader VERSION 2.0.0\n\n");
 
   printf("Usage: \n");
   printf("CGSSAssetsDownloader [-v resource_version] [-a] [-u] [-mp3]\n");
   printf("CGSSAssetsDownloader [-v resource_version] [-o option or filename] [-u] [-mp3]\n");
   printf("CGSSAssetsDownloader file1 file2 file3 ...\n\n");
 
   printf("Example: \n");
-  printf("CGSSAssetsDownloader -o -bgm -u\n");
+  printf("CGSSAssetsDownloader -o bgm -u\n");
   printf("CGSSAssetsDownloader -v 10028005 -o gachaselect_30145.unity3d\n");
   printf("CGSSAssetsDownloader -v 10031250 -a -u -mp3\n");
   printf("CGSSAssetsDownloader path\\to\\NoSuffixFile path\\to\\ACBFile.acb path\\to\\HCAFile.hca ...\n\n");
@@ -318,10 +320,11 @@ void hcadec (string hcafile) {
   }
 
   printf("Decoding %s...\n", hcafile.c_str());
-  clHCA hca(ciphKey1, ciphKey2);
-  if (!hca.DecodeToWavefile(hcafile.c_str(), filenameOut, volume, mode, loop)) {
+  clHCA* hca = new clHCA(ciphKey1, ciphKey2);
+  if (!hca->DecodeToWavefile(hcafile.c_str(), filenameOut, volume, mode, loop)) {
     printf("Error: Decoding failed.\n");
   }
+  delete hca;
 }
 
 int exist(void *data, int argc, char **argv, char **azColName) {