Index: libmpcdec/trunk/include/mpcdec/config_win32.h =================================================================== --- libmpcdec/trunk/include/mpcdec/config_win32.h (revision 31) +++ libmpcdec/trunk/include/mpcdec/config_win32.h (revision 36) @@ -40,4 +40,6 @@ #define FALSE 0 +typedef __int8 mpc_int8_t; +typedef unsigned __int8 mpc_uint8_t; typedef __int16 mpc_int16_t; typedef unsigned __int16 mpc_uint16_t; @@ -46,3 +48,5 @@ typedef __int64 mpc_int64_t; +#define MPC_LITTLE_ENDIAN + #endif // __MUSEPACK_CONFIG_WIN32_H__ Index: libmpcdec/trunk/win32/libmpcdec.dsp =================================================================== --- libmpcdec/trunk/win32/libmpcdec.dsp (revision 31) +++ (revision ) @@ -1,233 +1,0 @@ -# Microsoft Developer Studio Project File - Name="libmpcdec" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "Win32 (x86) Static Library" 0x0104 - -CFG=libmpcdec - Win32 Debug -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "libmpcdec.mak". -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "libmpcdec.mak" CFG="libmpcdec - Win32 Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "libmpcdec - Win32 Release" (based on "Win32 (x86) Static Library") -!MESSAGE "libmpcdec - Win32 Debug" (based on "Win32 (x86) Static Library") -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName "" -# PROP Scc_LocalPath "" -CPP=xicl6.exe -RSC=rc.exe - -!IF "$(CFG)" == "libmpcdec - Win32 Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "LibRelease" -# PROP Intermediate_Dir "LibRelease" -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c -# ADD CPP /nologo /W3 /O2 /I "..\include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "MPC_LITTLE_ENDIAN" /FR /FD /c -# ADD BASE RSC /l 0x40c /d "NDEBUG" -# ADD RSC /l 0x409 /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LIB32=xilink6.exe -lib -# ADD BASE LIB32 /nologo -# ADD LIB32 /nologo - -!ELSEIF "$(CFG)" == "libmpcdec - Win32 Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Debug" -# PROP BASE Intermediate_Dir "Debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "LibDebug" -# PROP Intermediate_Dir "LibDebug" -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /GZ /c -# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "..\include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "MPC_LITTLE_ENDIAN" /FD /GZ /c -# SUBTRACT CPP /YX -# ADD BASE RSC /l 0x40c /d "_DEBUG" -# ADD RSC /l 0x409 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LIB32=xilink6.exe -lib -# ADD BASE LIB32 /nologo -# ADD LIB32 /nologo - -!ENDIF - -# Begin Target - -# Name "libmpcdec - Win32 Release" -# Name "libmpcdec - Win32 Debug" -# Begin Group "Source Files" - -# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" -# Begin Source File - -SOURCE=..\src\huffsv46.c - -!IF "$(CFG)" == "libmpcdec - Win32 Release" - -# SUBTRACT CPP /YX /Yc /Yu - -!ELSEIF "$(CFG)" == "libmpcdec - Win32 Debug" - -!ENDIF - -# End Source File -# Begin Source File - -SOURCE=..\src\huffsv7.c - -!IF "$(CFG)" == "libmpcdec - Win32 Release" - -# SUBTRACT CPP /YX /Yc /Yu - -!ELSEIF "$(CFG)" == "libmpcdec - Win32 Debug" - -!ENDIF - -# End Source File -# Begin Source File - -SOURCE=..\src\idtag.c - -!IF "$(CFG)" == "libmpcdec - Win32 Release" - -# SUBTRACT CPP /YX /Yc /Yu - -!ELSEIF "$(CFG)" == "libmpcdec - Win32 Debug" - -!ENDIF - -# End Source File -# Begin Source File - -SOURCE=..\src\mpc_decoder.c - -!IF "$(CFG)" == "libmpcdec - Win32 Release" - -# SUBTRACT CPP /YX /Yc /Yu - -!ELSEIF "$(CFG)" == "libmpcdec - Win32 Debug" - -!ENDIF - -# End Source File -# Begin Source File - -SOURCE=..\src\mpc_reader.c - -!IF "$(CFG)" == "libmpcdec - Win32 Release" - -# SUBTRACT CPP /YX /Yc /Yu - -!ELSEIF "$(CFG)" == "libmpcdec - Win32 Debug" - -!ENDIF - -# End Source File -# Begin Source File - -SOURCE=..\src\requant.c - -!IF "$(CFG)" == "libmpcdec - Win32 Release" - -# SUBTRACT CPP /YX /Yc /Yu - -!ELSEIF "$(CFG)" == "libmpcdec - Win32 Debug" - -!ENDIF - -# End Source File -# Begin Source File - -SOURCE=..\src\streaminfo.c - -!IF "$(CFG)" == "libmpcdec - Win32 Release" - -# SUBTRACT CPP /YX /Yc /Yu - -!ELSEIF "$(CFG)" == "libmpcdec - Win32 Debug" - -!ENDIF - -# End Source File -# Begin Source File - -SOURCE=..\src\synth_filter.c - -!IF "$(CFG)" == "libmpcdec - Win32 Release" - -# SUBTRACT CPP /YX /Yc /Yu - -!ELSEIF "$(CFG)" == "libmpcdec - Win32 Debug" - -!ENDIF - -# End Source File -# End Group -# Begin Group "Header Files" - -# PROP Default_Filter "h;hpp;hxx;hm;inl" -# Begin Source File - -SOURCE=..\include\mpcdec\config_win32.h -# End Source File -# Begin Source File - -SOURCE=..\include\mpcdec\decoder.h -# End Source File -# Begin Source File - -SOURCE=..\include\mpcdec\huffman.h -# End Source File -# Begin Source File - -SOURCE=..\include\mpcdec\internal.h -# End Source File -# Begin Source File - -SOURCE=..\include\mpcdec\math.h -# End Source File -# Begin Source File - -SOURCE=..\include\mpcdec\mpcdec.h -# End Source File -# Begin Source File - -SOURCE=..\include\mpcdec\reader.h -# End Source File -# Begin Source File - -SOURCE=..\include\mpcdec\requant.h -# End Source File -# Begin Source File - -SOURCE=..\include\mpcdec\streaminfo.h -# End Source File -# End Group -# End Target -# End Project Index: libmpcdec/trunk/win32/libmpcdec.dsw =================================================================== --- libmpcdec/trunk/win32/libmpcdec.dsw (revision 31) +++ (revision ) @@ -1,29 +1,0 @@ -Microsoft Developer Studio Workspace File, Format Version 6.00 -# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE! - -############################################################################### - -Project: "libmpcdec"=".\libmpcdec.dsp" - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -Global: - -Package=<5> -{{{ -}}} - -Package=<3> -{{{ -}}} - -############################################################################### - Index: libmpcdec/trunk/win32/libmpcdec.sln =================================================================== --- libmpcdec/trunk/win32/libmpcdec.sln (revision 36) +++ libmpcdec/trunk/win32/libmpcdec.sln (revision 36) @@ -0,0 +1,29 @@ + +Microsoft Visual Studio Solution File, Format Version 9.00 +# Visual Studio 2005 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libmpcdec", "libmpcdec.vcproj", "{4C5362CD-0BF2-4B3B-971B-8293EB1A1DC3}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sample", "sample.vcproj", "{E6B9828A-A74A-4D82-B1CA-2149E22EBF8C}" + ProjectSection(ProjectDependencies) = postProject + {4C5362CD-0BF2-4B3B-971B-8293EB1A1DC3} = {4C5362CD-0BF2-4B3B-971B-8293EB1A1DC3} + EndProjectSection +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Win32 = Debug|Win32 + Release|Win32 = Release|Win32 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {4C5362CD-0BF2-4B3B-971B-8293EB1A1DC3}.Debug|Win32.ActiveCfg = Debug|Win32 + {4C5362CD-0BF2-4B3B-971B-8293EB1A1DC3}.Debug|Win32.Build.0 = Debug|Win32 + {4C5362CD-0BF2-4B3B-971B-8293EB1A1DC3}.Release|Win32.ActiveCfg = Release|Win32 + {4C5362CD-0BF2-4B3B-971B-8293EB1A1DC3}.Release|Win32.Build.0 = Release|Win32 + {E6B9828A-A74A-4D82-B1CA-2149E22EBF8C}.Debug|Win32.ActiveCfg = Debug|Win32 + {E6B9828A-A74A-4D82-B1CA-2149E22EBF8C}.Debug|Win32.Build.0 = Debug|Win32 + {E6B9828A-A74A-4D82-B1CA-2149E22EBF8C}.Release|Win32.ActiveCfg = Release|Win32 + {E6B9828A-A74A-4D82-B1CA-2149E22EBF8C}.Release|Win32.Build.0 = Release|Win32 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal Index: libmpcdec/trunk/win32/libmpcdec.vcproj =================================================================== --- libmpcdec/trunk/win32/libmpcdec.vcproj (revision 36) +++ libmpcdec/trunk/win32/libmpcdec.vcproj (revision 36) @@ -0,0 +1,224 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Index: libmpcdec/trunk/win32/sample.dsp =================================================================== --- libmpcdec/trunk/win32/sample.dsp (revision 31) +++ (revision ) @@ -1,102 +1,0 @@ -# Microsoft Developer Studio Project File - Name="sample" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "Win32 (x86) Console Application" 0x0103 - -CFG=sample - Win32 Debug -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "sample.mak". -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "sample.mak" CFG="sample - Win32 Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "sample - Win32 Release" (based on "Win32 (x86) Console Application") -!MESSAGE "sample - Win32 Debug" (based on "Win32 (x86) Console Application") -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName "" -# PROP Scc_LocalPath "" -CPP=xicl6.exe -RSC=rc.exe - -!IF "$(CFG)" == "sample - Win32 Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "sample___Win32_Release" -# PROP BASE Intermediate_Dir "sample___Win32_Release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "SampleRelease" -# PROP Intermediate_Dir "SampleRelease" -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c -# ADD CPP /nologo /W3 /GX /O2 /I "..\include" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c -# ADD BASE RSC /l 0x40c /d "NDEBUG" -# ADD RSC /l 0x40c /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=xilink6.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 -# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib libmpcdec.lib /nologo /subsystem:console /machine:I386 /libpath:"libRelease" - -!ELSEIF "$(CFG)" == "sample - Win32 Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "sample___Win32_Debug" -# PROP BASE Intermediate_Dir "sample___Win32_Debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "SampleDebug" -# PROP Intermediate_Dir "SampleDebug" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c -# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "..\include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "MPC_LITTLE_ENDIAN" /YX /FD /GZ /c -# ADD BASE RSC /l 0x40c /d "_DEBUG" -# ADD RSC /l 0x40c /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=xilink6.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept -# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib libmpcdec.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"libDebug" -# SUBTRACT LINK32 /nodefaultlib - -!ENDIF - -# Begin Target - -# Name "sample - Win32 Release" -# Name "sample - Win32 Debug" -# Begin Group "Source Files" - -# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" -# Begin Source File - -SOURCE=..\src\sample.cpp -# End Source File -# End Group -# Begin Group "Header Files" - -# PROP Default_Filter "h;hpp;hxx;hm;inl" -# End Group -# Begin Group "Resource Files" - -# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" -# End Group -# End Target -# End Project Index: libmpcdec/trunk/win32/sample.dsw =================================================================== --- libmpcdec/trunk/win32/sample.dsw (revision 31) +++ (revision ) @@ -1,29 +1,0 @@ -Microsoft Developer Studio Workspace File, Format Version 6.00 -# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE! - -############################################################################### - -Project: "sample"=".\sample.dsp" - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -Global: - -Package=<5> -{{{ -}}} - -Package=<3> -{{{ -}}} - -############################################################################### - Index: libmpcdec/trunk/win32/sample.vcproj =================================================================== --- libmpcdec/trunk/win32/sample.vcproj (revision 36) +++ libmpcdec/trunk/win32/sample.vcproj (revision 36) @@ -0,0 +1,183 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +