Fixed 64-bit build on Visual Studio

libsdl-org · Oct 13, 2017 · 5bd1209 · 5bd1209
1 parent f23f283
commit 5bd1209
Show file tree

Hide file tree

Showing 7 changed files with 12 additions and 27 deletions.
diff --git a/VisualC/SDL_mixer.vcxproj b/VisualC/SDL_mixer.vcxproj
@@ -278,15 +278,6 @@
       <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Copying %(Filename)%(Extension)</Message>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)\$(Platform)\$(Configuration)\%(Filename)%(Extension)</Outputs>
     </CustomBuild>
-    <CustomBuild Include="external\lib\x64\libmikmod-2.dll">
-      <FileType>Document</FileType>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">copy %(FullPath) $(SolutionDir)\$(Platform)\$(Configuration)\</Command>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Copying %(Filename)%(Extension)</Message>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)\$(Platform)\$(Configuration)\%(Filename)%(Extension)</Outputs>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">copy %(FullPath) $(SolutionDir)\$(Platform)\$(Configuration)\</Command>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Copying %(Filename)%(Extension)</Message>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)\$(Platform)\$(Configuration)\%(Filename)%(Extension)</Outputs>
-    </CustomBuild>
     <CustomBuild Include="external\lib\x64\libmodplug-1.dll">
       <FileType>Document</FileType>
       <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">copy %(FullPath) $(SolutionDir)\$(Platform)\$(Configuration)\</Command>

diff --git a/VisualC/SDL_mixer.vcxproj.filters b/VisualC/SDL_mixer.vcxproj.filters
@@ -186,9 +186,6 @@
     <CustomBuild Include="external\lib\x64\libmodplug-1.dll">
       <Filter>x64</Filter>
     </CustomBuild>
-    <CustomBuild Include="external\lib\x64\libmikmod-2.dll">
-      <Filter>x64</Filter>
-    </CustomBuild>
     <CustomBuild Include="external\lib\x64\smpeg2.dll">
       <Filter>x64</Filter>
     </CustomBuild>

diff --git a/load_voc.c b/load_voc.c
@@ -329,7 +329,7 @@ static int voc_get_block(SDL_RWops *src, vs_t *v, SDL_AudioSpec *spec)
 
 static int voc_read(SDL_RWops *src, vs_t *v, Uint8 *buf, SDL_AudioSpec *spec)
 {
-    int done = 0;
+    Uint32 done = 0;
     Uint8 silence = 0x80;
 
     if (v->rest == 0)
@@ -354,7 +354,7 @@ static int voc_read(SDL_RWops *src, vs_t *v, Uint8 *buf, SDL_AudioSpec *spec)
 
     else
     {
-        done = SDL_RWread(src, buf, 1, v->rest);
+        done = (Uint32)SDL_RWread(src, buf, 1, v->rest);
         v->rest -= done;
         if (v->size == ST_SIZE_WORD)
         {

diff --git a/music_flac.c b/music_flac.c
@@ -211,8 +211,7 @@ static FLAC__StreamDecoderWriteStatus flac_write_music_cb(
         else {
             // we need to write to the overflow
             if (!data->flac_data.overflow) {
-                data->flac_data.overflow_len =
-                                            4 * (frame->header.blocksize - i);
+                data->flac_data.overflow_len = (int)(4 * (frame->header.blocksize - i));
                 data->flac_data.overflow_read = 0;
 
                 // make it big enough for the rest of the block
@@ -409,18 +408,18 @@ static void FLAC_getsome(FLAC_music *music)
                 SDL_memcpy (music->flac_data.overflow,
                     music->flac_data.overflow + music->flac_data.max_to_read,
                     overflow_extra_len);
-                music->flac_data.overflow_len = overflow_extra_len;
-                music->flac_data.overflow_read = overflow_extra_len;
+                music->flac_data.overflow_len = (int)overflow_extra_len;
+                music->flac_data.overflow_read = (int)overflow_extra_len;
                 music->flac_data.max_to_read = 0;
             } else {
                 SDL_memcpy (music->flac_data.data+music->flac_data.data_read,
                     music->flac_data.overflow, overflow_len);
-                music->flac_data.data_read += overflow_len;
+                music->flac_data.data_read += (int)overflow_len;
                 SDL_free (music->flac_data.overflow);
                 music->flac_data.overflow = NULL;
                 music->flac_data.overflow_len = 0;
                 music->flac_data.overflow_read = 0;
-                music->flac_data.max_to_read -= overflow_len;
+                music->flac_data.max_to_read -= (int)overflow_len;
             }
         }
         else {

diff --git a/music_modplug.c b/music_modplug.c
@@ -124,7 +124,7 @@ modplug_data *modplug_new_RW(SDL_RWops *src, int freesrc)
             music = (modplug_data*)SDL_malloc(sizeof(modplug_data));
             if (music) {
                 music->playing = 0;
-                music->file = modplug.ModPlug_Load(buf, sz);
+                music->file = modplug.ModPlug_Load(buf, (int)sz);
                 if (!music->file) {
                     SDL_free(music);
                     music = NULL;

diff --git a/timidity/common.c b/timidity/common.c
@@ -136,7 +136,7 @@ FILE *open_file(const char *name, int decompress, int noise_mode)
     while (plp)  /* Try along the path then */
       {
 	*current_filename=0;
-	l=strlen(plp->path);
+	l=(int)strlen(plp->path);
 	if(l)
 	  {
 	    strcpy(current_filename, plp->path);

diff --git a/wavestream.c b/wavestream.c
@@ -233,7 +233,7 @@ static int PlaySome(Uint8 *stream, int len)
         if ((stop - pos) < original_len) {
             original_len = (int)(stop - pos);
         }
-        original_len = SDL_RWread(music->src, music->cvt.buf, 1, original_len);
+        original_len = (int)SDL_RWread(music->src, music->cvt.buf, 1, original_len);
         music->cvt.len = original_len;
         SDL_ConvertAudio(&music->cvt);
         SDL_MixAudioFormat(stream, music->cvt.buf, mixer.format,music->cvt.len_cvt, wavestream_volume);
@@ -245,7 +245,7 @@ static int PlaySome(Uint8 *stream, int len)
         }
         data = SDL_stack_alloc(Uint8, len);
         if (data) {
-            len = SDL_RWread(music->src, data, 1, len);
+            len = (int)SDL_RWread(music->src, data, 1, len);
             SDL_MixAudioFormat(stream, data, mixer.format, len, wavestream_volume);
             SDL_stack_free(data);
         }
@@ -404,7 +404,7 @@ static SDL_bool ParseSMPL(WAVStream *wave, Uint32 chunk_length)
 {
     SamplerChunk *chunk;
     Uint8 *data;
-    int i;
+    Uint32 i;
     SDL_bool loaded = SDL_FALSE;
 
     data = (Uint8 *)SDL_malloc(chunk_length);
@@ -427,8 +427,6 @@ static SDL_bool ParseSMPL(WAVStream *wave, Uint32 chunk_length)
     }
 
     loaded = SDL_TRUE;
-
-done:
     SDL_free(data);
     return loaded;
 }