build mikmod and the music code on windows

diff --git a/dosdemo.sln b/dosdemo.sln
index e1f1692..5d53990 100644 (file)
--- a/dosdemo.sln
+++ b/dosdemo.sln
@@ -4,9 +4,15 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 VisualStudioVersion = 12.0.40629.0\r
 MinimumVisualStudioVersion = 10.0.40219.1\r
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dosdemo", "dosdemo.vcxproj", "{15AB3B8C-B8BE-42ED-9DBC-EAE9C8FB9B9F}"\r
+       ProjectSection(ProjectDependencies) = postProject\r
+               {5DDB5403-A105-470E-882B-4276EFDDAAB0} = {5DDB5403-A105-470E-882B-4276EFDDAAB0}\r
+               {A5835F2B-734E-4730-8D0B-6288CDA4F73C} = {A5835F2B-734E-4730-8D0B-6288CDA4F73C}\r
+       EndProjectSection\r
 EndProject\r
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "imago", "libs\imago\imago.vcxproj", "{5DDB5403-A105-470E-882B-4276EFDDAAB0}"\r
 EndProject\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mikmod", "libs\mikmod\mikmod.vcxproj", "{A5835F2B-734E-4730-8D0B-6288CDA4F73C}"\r
+EndProject\r
 Global\r
        GlobalSection(SolutionConfigurationPlatforms) = preSolution\r
                Debug|Win32 = Debug|Win32\r
@@ -21,6 +27,10 @@ Global
                {5DDB5403-A105-470E-882B-4276EFDDAAB0}.Debug|Win32.Build.0 = Debug|Win32\r
                {5DDB5403-A105-470E-882B-4276EFDDAAB0}.Release|Win32.ActiveCfg = Release|Win32\r
                {5DDB5403-A105-470E-882B-4276EFDDAAB0}.Release|Win32.Build.0 = Release|Win32\r
+               {A5835F2B-734E-4730-8D0B-6288CDA4F73C}.Debug|Win32.ActiveCfg = Debug|Win32\r
+               {A5835F2B-734E-4730-8D0B-6288CDA4F73C}.Debug|Win32.Build.0 = Debug|Win32\r
+               {A5835F2B-734E-4730-8D0B-6288CDA4F73C}.Release|Win32.ActiveCfg = Release|Win32\r
+               {A5835F2B-734E-4730-8D0B-6288CDA4F73C}.Release|Win32.Build.0 = Release|Win32\r
        EndGlobalSection\r
        GlobalSection(SolutionProperties) = preSolution\r
                HideSolutionNode = FALSE\r

diff --git a/dosdemo.vcxproj b/dosdemo.vcxproj
index b1bb483..ce9de26 100644 (file)
--- a/dosdemo.vcxproj
+++ b/dosdemo.vcxproj
@@ -52,13 +52,13 @@
       <WarningLevel>Level3</WarningLevel>\r
       <Optimization>Disabled</Optimization>\r
       <PreprocessorDefinitions>WIN32;_USE_MATH_DEFINES;_DEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
-      <AdditionalIncludeDirectories>$(ProjectDir)\src;$(ProjectDir)\src\sdl;$(ProjectDir)\libs\imago\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
+      <AdditionalIncludeDirectories>$(ProjectDir)\src;$(ProjectDir)\src\sdl;$(ProjectDir)\libs\imago\src;$(ProjectDir)\libs\mikmod\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
       <DisableSpecificWarnings>4996;4244</DisableSpecificWarnings>\r
     </ClCompile>\r
     <Link>\r
       <SubSystem>Console</SubSystem>\r
       <GenerateDebugInformation>true</GenerateDebugInformation>\r
-      <AdditionalDependencies>SDL.lib;SDLmain.lib;imago.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
+      <AdditionalDependencies>SDL.lib;SDLmain.lib;imago.lib;mikmod.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
       <AdditionalLibraryDirectories>$(IntDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
     </Link>\r
   </ItemDefinitionGroup>\r
@@ -71,7 +71,7 @@
       <FunctionLevelLinking>true</FunctionLevelLinking>\r
       <IntrinsicFunctions>true</IntrinsicFunctions>\r
       <PreprocessorDefinitions>WIN32;_USE_MATH_DEFINES;NDEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
-      <AdditionalIncludeDirectories>$(ProjectDir)\src;$(ProjectDir)\src\sdl;$(ProjectDir)\libs\imago\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
+      <AdditionalIncludeDirectories>$(ProjectDir)\src;$(ProjectDir)\src\sdl;$(ProjectDir)\libs\imago\src;$(ProjectDir)\libs\mikmod\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
       <DisableSpecificWarnings>4996;4244</DisableSpecificWarnings>\r
     </ClCompile>\r
     <Link>\r
@@ -79,7 +79,7 @@
       <GenerateDebugInformation>true</GenerateDebugInformation>\r
       <EnableCOMDATFolding>true</EnableCOMDATFolding>\r
       <OptimizeReferences>true</OptimizeReferences>\r
-      <AdditionalDependencies>SDL.lib;SDLmain.lib;imago.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
+      <AdditionalDependencies>SDL.lib;SDLmain.lib;imago.lib;mikmod.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
       <AdditionalLibraryDirectories>$(IntDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
     </Link>\r
   </ItemDefinitionGroup>\r
@@ -94,6 +94,7 @@
     <ClCompile Include="src\polytest.c" />\r
     <ClCompile Include="src\screen.c" />\r
     <ClCompile Include="src\sdl\main.c" />\r
+    <ClCompile Include="src\sdl\music.c" />\r
     <ClCompile Include="src\tinyfps.c" />\r
     <ClCompile Include="src\tunnel.c" />\r
   </ItemGroup>\r

diff --git a/dosdemo.vcxproj.filters b/dosdemo.vcxproj.filters
index fd7403d..af78c9e 100644 (file)
--- a/dosdemo.vcxproj.filters
+++ b/dosdemo.vcxproj.filters
@@ -46,6 +46,9 @@
     <ClCompile Include="src\tinyfps.c">\r
       <Filter>src</Filter>\r
     </ClCompile>\r
+    <ClCompile Include="src\sdl\music.c">\r
+      <Filter>src\sdl</Filter>\r
+    </ClCompile>\r
   </ItemGroup>\r
   <ItemGroup>\r
     <ClInclude Include="src\demo.h">\r

diff --git a/libs/mikmod/config.h b/libs/mikmod/config.h
index 92683f5..24caf3c 100644 (file)
--- a/libs/mikmod/config.h
+++ b/libs/mikmod/config.h
@@ -1,9 +1,7 @@
-/* config.h.in.  Generated from configure.ac by autoheader.  */
-
 #define HAVE_LIMITS_H 1
 #define HAVE_MEMCMP 1
 #define HAVE_STDLIB_H 1
-#define HAVE_STRINGS_H 1
+#define HAVE_STRING_H 1
 #define HAVE_STRSTR 1
 
 #ifdef DOS
@@ -39,8 +37,12 @@
 
 
 #if defined(WIN32)
+#define DRV_SDL 1
+
 #define HAVE_WINDOWS_H 1
 #define HAVE_MALLOC_H 1
+
+#define NO_SDL_CONFIG 1
 #endif
 
 #undef MIKMOD_DEBUG
@@ -80,6 +82,6 @@
 
 /* Define to `__inline__' or `__inline' if that's what the C compiler
    calls it, or to nothing if 'inline' is not supported under any name.  */
-#ifndef __cplusplus
-#undef inline
+#if !defined(__cplusplus) && defined(_MSC_VER)
+#define inline __inline
 #endif

diff --git a/libs/mikmod/include/mikmod.h b/libs/mikmod/include/mikmod.h
index 6bfe938..536a0d8 100644 (file)
--- a/libs/mikmod/include/mikmod.h
+++ b/libs/mikmod/include/mikmod.h
@@ -34,6 +34,10 @@
 extern "C" {
 #endif
 
+#ifndef MIKMOD_STATIC
+#define MIKMOD_STATIC
+#endif
+
 /*
  * ========== Compiler magic for shared libraries
  *

diff --git a/libs/mikmod/loaders/load_mod.c b/libs/mikmod/loaders/load_mod.c
index 6fffac0..55bc04c 100644 (file)
--- a/libs/mikmod/loaders/load_mod.c
+++ b/libs/mikmod/loaders/load_mod.c
@@ -348,7 +348,7 @@ static BOOL ML_LoadPatterns(void)
                /* Generic module pattern */
                for (t = 0; t < of.numpat; t++) {
                        /* Load the pattern into the temp buffer and convert it */
-                       for (s = 0; s < (64U * of.numchn); s++) {
+                       for (s = 0; s < (int)(64U * of.numchn); s++) {
                                patbuf[s].a = _mm_read_UBYTE(modreader);
                                patbuf[s].b = _mm_read_UBYTE(modreader);
                                patbuf[s].c = _mm_read_UBYTE(modreader);

diff --git a/libs/mikmod/mikmod.vcxproj b/libs/mikmod/mikmod.vcxproj
new file mode 100644 (file)
index 0000000..9b23001
--- /dev/null
+++ b/libs/mikmod/mikmod.vcxproj
@@ -0,0 +1,120 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="depackers\mmcmp.c" />
+    <ClCompile Include="depackers\pp20.c" />
+    <ClCompile Include="depackers\s404.c" />
+    <ClCompile Include="depackers\xpk.c" />
+    <ClCompile Include="drivers\drv_nos.c" />
+    <ClCompile Include="drivers\drv_oss.c" />
+    <ClCompile Include="drivers\drv_sb.c" />
+    <ClCompile Include="drivers\drv_sdl.c" />
+    <ClCompile Include="drivers\drv_ultra.c" />
+    <ClCompile Include="drivers\drv_wss.c" />
+    <ClCompile Include="loaders\load_it.c" />
+    <ClCompile Include="loaders\load_mod.c" />
+    <ClCompile Include="loaders\load_s3m.c" />
+    <ClCompile Include="loaders\load_xm.c" />
+    <ClCompile Include="mmio\mmalloc.c" />
+    <ClCompile Include="mmio\mmerror.c" />
+    <ClCompile Include="mmio\mmio.c" />
+    <ClCompile Include="playercode\mdreg.c" />
+    <ClCompile Include="playercode\mdriver.c" />
+    <ClCompile Include="playercode\mdulaw.c" />
+    <ClCompile Include="playercode\mloader.c" />
+    <ClCompile Include="playercode\mlreg.c" />
+    <ClCompile Include="playercode\mlutil.c" />
+    <ClCompile Include="playercode\mplayer.c" />
+    <ClCompile Include="playercode\munitrk.c" />
+    <ClCompile Include="playercode\mwav.c" />
+    <ClCompile Include="playercode\npertab.c" />
+    <ClCompile Include="playercode\sloader.c" />
+    <ClCompile Include="playercode\virtch.c" />
+    <ClCompile Include="playercode\virtch2.c" />
+    <ClCompile Include="playercode\virtch_common.c" />
+    <ClCompile Include="posix\strcasecmp.c" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="config.h" />
+    <ClInclude Include="include\mikmod.h" />
+    <ClInclude Include="include\mikmod_ctype.h" />
+    <ClInclude Include="include\mikmod_internals.h" />
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{A5835F2B-734E-4730-8D0B-6288CDA4F73C}</ProjectGuid>
+    <Keyword>Win32Proj</Keyword>
+    <RootNamespace>mikmod</RootNamespace>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>v120</PlatformToolset>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>v120</PlatformToolset>
+    <WholeProgramOptimization>false</WholeProgramOptimization>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup />
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>Disabled</Optimization>
+      <PreprocessorDefinitions>WIN32;MIKMOD_BUILD;MIKMOD_STATIC;HAVE_CONFIG_H;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>.;drivers;loaders;depackers;include;mmio;posix;playercode</AdditionalIncludeDirectories>
+      <DisableSpecificWarnings>4244;4996</DisableSpecificWarnings>
+    </ClCompile>
+    <Link>
+      <SubSystem>Windows</SubSystem>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <Optimization>MaxSpeed</Optimization>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <PreprocessorDefinitions>WIN32;MIKMOD_BUILD;MIKMOD_STATIC;HAVE_CONFIG_H;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>.;drivers;loaders;depackers;include;mmio;posix;playercode</AdditionalIncludeDirectories>
+      <DisableSpecificWarnings>4244;4996</DisableSpecificWarnings>
+    </ClCompile>
+    <Link>
+      <SubSystem>Windows</SubSystem>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+    </Link>
+  </ItemDefinitionGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file

diff --git a/libs/mikmod/mikmod.vcxproj.filters b/libs/mikmod/mikmod.vcxproj.filters
new file mode 100644 (file)
index 0000000..87465c5
--- /dev/null
+++ b/libs/mikmod/mikmod.vcxproj.filters
@@ -0,0 +1,137 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="drivers">
+      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
+      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
+    </Filter>
+    <Filter Include="loaders">
+      <UniqueIdentifier>{017243a1-5836-429c-b07f-1c41ae84dab3}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="depackers">
+      <UniqueIdentifier>{9502d697-4f36-483a-9cd4-9a622b9f972f}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="include">
+      <UniqueIdentifier>{811f40e2-6099-4a33-8010-f8c7ded742c2}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="mmio">
+      <UniqueIdentifier>{8d8d8423-0563-415b-be3f-132de39d20ab}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="playercode">
+      <UniqueIdentifier>{6c502424-758a-4ba5-ad0f-16fe1d8b78b6}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="posix">
+      <UniqueIdentifier>{282937aa-35d1-403d-85ab-ae64b1eb0d5b}</UniqueIdentifier>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="drivers\drv_nos.c">
+      <Filter>drivers</Filter>
+    </ClCompile>
+    <ClCompile Include="drivers\drv_oss.c">
+      <Filter>drivers</Filter>
+    </ClCompile>
+    <ClCompile Include="drivers\drv_sb.c">
+      <Filter>drivers</Filter>
+    </ClCompile>
+    <ClCompile Include="drivers\drv_sdl.c">
+      <Filter>drivers</Filter>
+    </ClCompile>
+    <ClCompile Include="drivers\drv_ultra.c">
+      <Filter>drivers</Filter>
+    </ClCompile>
+    <ClCompile Include="drivers\drv_wss.c">
+      <Filter>drivers</Filter>
+    </ClCompile>
+    <ClCompile Include="loaders\load_it.c">
+      <Filter>loaders</Filter>
+    </ClCompile>
+    <ClCompile Include="loaders\load_mod.c">
+      <Filter>loaders</Filter>
+    </ClCompile>
+    <ClCompile Include="loaders\load_s3m.c">
+      <Filter>loaders</Filter>
+    </ClCompile>
+    <ClCompile Include="loaders\load_xm.c">
+      <Filter>loaders</Filter>
+    </ClCompile>
+    <ClCompile Include="depackers\mmcmp.c">
+      <Filter>depackers</Filter>
+    </ClCompile>
+    <ClCompile Include="depackers\pp20.c">
+      <Filter>depackers</Filter>
+    </ClCompile>
+    <ClCompile Include="depackers\s404.c">
+      <Filter>depackers</Filter>
+    </ClCompile>
+    <ClCompile Include="depackers\xpk.c">
+      <Filter>depackers</Filter>
+    </ClCompile>
+    <ClCompile Include="mmio\mmalloc.c">
+      <Filter>mmio</Filter>
+    </ClCompile>
+    <ClCompile Include="mmio\mmerror.c">
+      <Filter>mmio</Filter>
+    </ClCompile>
+    <ClCompile Include="mmio\mmio.c">
+      <Filter>mmio</Filter>
+    </ClCompile>
+    <ClCompile Include="posix\strcasecmp.c">
+      <Filter>posix</Filter>
+    </ClCompile>
+    <ClCompile Include="playercode\mdreg.c">
+      <Filter>playercode</Filter>
+    </ClCompile>
+    <ClCompile Include="playercode\mdriver.c">
+      <Filter>playercode</Filter>
+    </ClCompile>
+    <ClCompile Include="playercode\mdulaw.c">
+      <Filter>playercode</Filter>
+    </ClCompile>
+    <ClCompile Include="playercode\mloader.c">
+      <Filter>playercode</Filter>
+    </ClCompile>
+    <ClCompile Include="playercode\mlreg.c">
+      <Filter>playercode</Filter>
+    </ClCompile>
+    <ClCompile Include="playercode\mlutil.c">
+      <Filter>playercode</Filter>
+    </ClCompile>
+    <ClCompile Include="playercode\mplayer.c">
+      <Filter>playercode</Filter>
+    </ClCompile>
+    <ClCompile Include="playercode\munitrk.c">
+      <Filter>playercode</Filter>
+    </ClCompile>
+    <ClCompile Include="playercode\mwav.c">
+      <Filter>playercode</Filter>
+    </ClCompile>
+    <ClCompile Include="playercode\npertab.c">
+      <Filter>playercode</Filter>
+    </ClCompile>
+    <ClCompile Include="playercode\sloader.c">
+      <Filter>playercode</Filter>
+    </ClCompile>
+    <ClCompile Include="playercode\virtch.c">
+      <Filter>playercode</Filter>
+    </ClCompile>
+    <ClCompile Include="playercode\virtch_common.c">
+      <Filter>playercode</Filter>
+    </ClCompile>
+    <ClCompile Include="playercode\virtch2.c">
+      <Filter>playercode</Filter>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="include\mikmod.h">
+      <Filter>include</Filter>
+    </ClInclude>
+    <ClInclude Include="include\mikmod_ctype.h">
+      <Filter>include</Filter>
+    </ClInclude>
+    <ClInclude Include="include\mikmod_internals.h">
+      <Filter>include</Filter>
+    </ClInclude>
+    <ClInclude Include="config.h" />
+  </ItemGroup>
+</Project>
\ No newline at end of file

diff --git a/libs/mikmod/playercode/mlutil.c b/libs/mikmod/playercode/mlutil.c
index 21dcb20..845721b 100644 (file)
--- a/libs/mikmod/playercode/mlutil.c
+++ b/libs/mikmod/playercode/mlutil.c
@@ -94,18 +94,18 @@ int speed_to_finetune(ULONG speed,int sample)
     int ctmp=0,tmp,note=1,ft=0;
 
     speed>>=1;
-    while((tmp=getfrequency(of.flags,getlinearperiod(note<<1,0)))<speed) {
+    while((tmp=(int)getfrequency(of.flags,getlinearperiod(note<<1,0)))<speed) {
         ctmp=tmp;
         note++;
     }
 
     if(tmp!=speed) {
         if((tmp-speed)<(speed-ctmp))
-            while(tmp>speed)
+            while(tmp>(int)speed)
                 tmp=getfrequency(of.flags,getlinearperiod(note<<1,--ft));
         else {
             note--;
-            while(ctmp<speed)
+            while(ctmp<(int)speed)
                 ctmp=getfrequency(of.flags,getlinearperiod(note<<1,++ft));
         }
     }

diff --git a/libs/mikmod/playercode/virtch.c b/libs/mikmod/playercode/virtch.c
index 9342978..00ca799 100644 (file)
--- a/libs/mikmod/playercode/virtch.c
+++ b/libs/mikmod/playercode/virtch.c
@@ -1161,7 +1161,7 @@ void VC1_WriteSamples(SBYTE* buf,ULONG todo)
                        if(vc_mode & DMODE_SOFT_MUSIC) md_player();
                        tickleft=(md_mixfreq*125L)/(md_bpm*50L);
                }
-               left = MIN(tickleft, todo);
+               left = MIN(tickleft, (long)todo);
                buffer    = buf;
                tickleft -= left;
                todo     -= left;

diff --git a/libs/mikmod/playercode/virtch2.c b/libs/mikmod/playercode/virtch2.c
index 6b9807d..1807b4a 100644 (file)
--- a/libs/mikmod/playercode/virtch2.c
+++ b/libs/mikmod/playercode/virtch2.c
@@ -1165,7 +1165,7 @@ void VC2_WriteSamples(SBYTE* buf,ULONG todo)
                        tickleft=(md_mixfreq*125L*SAMPLING_FACTOR)/(md_bpm*50L);
                        tickleft&=~(SAMPLING_FACTOR-1);
                }
-               left = MIN(tickleft, todo);
+               left = MIN(tickleft, (long)todo);
                buffer    = buf;
                tickleft -= left;
                todo     -= left;