Fixed compilation in Visual Studio 2008.

This commit is contained in:
LoRd_MuldeR 2011-06-21 22:07:22 +02:00
parent 63bf596ce8
commit e0131ac18b
6 changed files with 200 additions and 5 deletions

2
.gitignore vendored
View File

@ -2,6 +2,8 @@
/LameXP_*.opensdf /LameXP_*.opensdf
/LameXP_*.sdf /LameXP_*.sdf
/LameXP_*.suo /LameXP_*.suo
/LameXP_*.ncb
/LameXP_*.sln.docstates
/bin /bin
etc/Deployment/*.exe etc/Deployment/*.exe
etc/Deployment/_postproc.bat etc/Deployment/_postproc.bat

View File

@ -66,7 +66,7 @@
<Tool <Tool
Name="VCLinkerTool" Name="VCLinkerTool"
AdditionalOptions="&quot;/MANIFESTDEPENDENCY:type=&apos;win32&apos; name=&apos;Microsoft.Windows.Common-Controls&apos; version=&apos;6.0.0.0&apos; publicKeyToken=&apos;6595b64144ccf1df&apos; language=&apos;*&apos; processorArchitecture=&apos;*&apos;&quot;" AdditionalOptions="&quot;/MANIFESTDEPENDENCY:type=&apos;win32&apos; name=&apos;Microsoft.Windows.Common-Controls&apos; version=&apos;6.0.0.0&apos; publicKeyToken=&apos;6595b64144ccf1df&apos; language=&apos;*&apos; processorArchitecture=&apos;*&apos;&quot;"
AdditionalDependencies="qtmaind.lib QtCored4.lib QtGuid4.lib Winmm.lib Shlwapi.lib psapi.lib" AdditionalDependencies="qtmaind.lib QtCored4.lib QtGuid4.lib Winmm.lib Shlwapi.lib Wininet.lib psapi.lib"
LinkIncremental="1" LinkIncremental="1"
AdditionalLibraryDirectories="&quot;$(QTDIR)\lib&quot;;&quot;$(QTDIR)\plugins\imageformats&quot;" AdditionalLibraryDirectories="&quot;$(QTDIR)\lib&quot;;&quot;$(QTDIR)\plugins\imageformats&quot;"
GenerateDebugInformation="true" GenerateDebugInformation="true"
@ -155,7 +155,7 @@
<Tool <Tool
Name="VCLinkerTool" Name="VCLinkerTool"
AdditionalOptions="&quot;/MANIFESTDEPENDENCY:type=&apos;win32&apos; name=&apos;Microsoft.Windows.Common-Controls&apos; version=&apos;6.0.0.0&apos; publicKeyToken=&apos;6595b64144ccf1df&apos; language=&apos;*&apos; processorArchitecture=&apos;*&apos;&quot;" AdditionalOptions="&quot;/MANIFESTDEPENDENCY:type=&apos;win32&apos; name=&apos;Microsoft.Windows.Common-Controls&apos; version=&apos;6.0.0.0&apos; publicKeyToken=&apos;6595b64144ccf1df&apos; language=&apos;*&apos; processorArchitecture=&apos;*&apos;&quot;"
AdditionalDependencies="qtmain.lib QtCore4.lib QtGui4.lib Winmm.lib Shlwapi.lib" AdditionalDependencies="qtmain.lib QtCore4.lib QtGui4.lib Winmm.lib Shlwapi.lib Wininet.lib"
ShowProgress="2" ShowProgress="2"
Version="" Version=""
LinkIncremental="1" LinkIncremental="1"
@ -253,7 +253,7 @@
<Tool <Tool
Name="VCLinkerTool" Name="VCLinkerTool"
AdditionalOptions="&quot;/MANIFESTDEPENDENCY:type=&apos;win32&apos; name=&apos;Microsoft.Windows.Common-Controls&apos; version=&apos;6.0.0.0&apos; publicKeyToken=&apos;6595b64144ccf1df&apos; language=&apos;*&apos; processorArchitecture=&apos;*&apos;&quot;" AdditionalOptions="&quot;/MANIFESTDEPENDENCY:type=&apos;win32&apos; name=&apos;Microsoft.Windows.Common-Controls&apos; version=&apos;6.0.0.0&apos; publicKeyToken=&apos;6595b64144ccf1df&apos; language=&apos;*&apos; processorArchitecture=&apos;*&apos;&quot;"
AdditionalDependencies="qtmain.lib QtCore.lib QtGui.lib QtSvg.lib qsvg.lib qico.lib Winmm.lib imm32.lib ws2_32.lib Shlwapi.lib" AdditionalDependencies="qtmain.lib QtCore.lib QtGui.lib QtSvg.lib qsvg.lib qico.lib Winmm.lib imm32.lib ws2_32.lib Shlwapi.lib Wininet.lib"
ShowProgress="2" ShowProgress="2"
LinkIncremental="1" LinkIncremental="1"
AdditionalLibraryDirectories="&quot;$(SolutionDir)\etc\Prerequisites\qt4_static\lib&quot;;&quot;$(SolutionDir)\etc\Prerequisites\qt4_static\plugins\imageformats&quot;" AdditionalLibraryDirectories="&quot;$(SolutionDir)\etc\Prerequisites\qt4_static\lib&quot;;&quot;$(SolutionDir)\etc\Prerequisites\qt4_static\plugins\imageformats&quot;"
@ -320,6 +320,10 @@
RelativePath=".\src\Decoder_ALAC.cpp" RelativePath=".\src\Decoder_ALAC.cpp"
> >
</File> </File>
<File
RelativePath=".\src\Decoder_Avisynth.cpp"
>
</File>
<File <File
RelativePath=".\src\Decoder_FLAC.cpp" RelativePath=".\src\Decoder_FLAC.cpp"
> >
@ -368,6 +372,10 @@
RelativePath=".\src\Dialog_About.cpp" RelativePath=".\src\Dialog_About.cpp"
> >
</File> </File>
<File
RelativePath=".\src\Dialog_CueImport.cpp"
>
</File>
<File <File
RelativePath=".\src\Dialog_DropBox.cpp" RelativePath=".\src\Dialog_DropBox.cpp"
> >
@ -408,6 +416,10 @@
RelativePath=".\src\Encoder_Abstract.cpp" RelativePath=".\src\Encoder_Abstract.cpp"
> >
</File> </File>
<File
RelativePath=".\src\Encoder_AC3.cpp"
>
</File>
<File <File
RelativePath=".\src\Encoder_FLAC.cpp" RelativePath=".\src\Encoder_FLAC.cpp"
> >
@ -468,6 +480,10 @@
RelativePath=".\src\Model_AudioFile.cpp" RelativePath=".\src\Model_AudioFile.cpp"
> >
</File> </File>
<File
RelativePath=".\src\Model_CueSheet.cpp"
>
</File>
<File <File
RelativePath=".\src\Model_FileList.cpp" RelativePath=".\src\Model_FileList.cpp"
> >
@ -500,6 +516,10 @@
RelativePath=".\src\ShellIntegration.cpp" RelativePath=".\src\ShellIntegration.cpp"
> >
</File> </File>
<File
RelativePath=".\src\Thread_CueSplitter.cpp"
>
</File>
<File <File
RelativePath=".\src\Thread_DiskObserver.cpp" RelativePath=".\src\Thread_DiskObserver.cpp"
> >
@ -592,6 +612,10 @@
RelativePath=".\src\Decoder_ALAC.h" RelativePath=".\src\Decoder_ALAC.h"
> >
</File> </File>
<File
RelativePath=".\src\Decoder_Avisynth.h"
>
</File>
<File <File
RelativePath=".\src\Decoder_FLAC.h" RelativePath=".\src\Decoder_FLAC.h"
> >
@ -670,6 +694,40 @@
/> />
</FileConfiguration> </FileConfiguration>
</File> </File>
<File
RelativePath=".\src\Dialog_CueImport.h"
>
<FileConfiguration
Name="Debug|Win32"
>
<Tool
Name="VCCustomBuildTool"
Description="MOC &quot;$(SolutionDir)tmp\MOC_$(SafeInputName).cpp&quot;"
CommandLine="&quot;$(QTDIR)\bin\moc.exe&quot; -o &quot;$(SolutionDir)tmp\MOC_$(SafeInputName).cpp&quot; &quot;$(InputPath)&quot;"
Outputs="&quot;$(SolutionDir)tmp\MOC_$(SafeInputName).cpp&quot;"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32"
>
<Tool
Name="VCCustomBuildTool"
Description="MOC &quot;$(SolutionDir)tmp\MOC_$(SafeInputName).cpp&quot;"
CommandLine="&quot;$(QTDIR)\bin\moc.exe&quot; -o &quot;$(SolutionDir)tmp\MOC_$(SafeInputName).cpp&quot; &quot;$(InputPath)&quot;"
Outputs="&quot;$(SolutionDir)tmp\MOC_$(SafeInputName).cpp&quot;"
/>
</FileConfiguration>
<FileConfiguration
Name="Release_Static|Win32"
>
<Tool
Name="VCCustomBuildTool"
Description="MOC &quot;$(SolutionDir)tmp\MOC_$(SafeInputName).cpp&quot;"
CommandLine="&quot;$(QTDIR)\bin\moc.exe&quot; -o &quot;$(SolutionDir)tmp\MOC_$(SafeInputName).cpp&quot; &quot;$(InputPath)&quot;"
Outputs="&quot;$(SolutionDir)tmp\MOC_$(SafeInputName).cpp&quot;"
/>
</FileConfiguration>
</File>
<File <File
RelativePath=".\src\Dialog_DropBox.h" RelativePath=".\src\Dialog_DropBox.h"
> >
@ -1010,6 +1068,20 @@
/> />
</FileConfiguration> </FileConfiguration>
</File> </File>
<File
RelativePath=".\src\Encoder_AC3.h"
>
<FileConfiguration
Name="Release|Win32"
>
<Tool
Name="VCCustomBuildTool"
Description="MOC &quot;$(SolutionDir)tmp\MOC_$(SafeInputName).cpp&quot;"
CommandLine="&quot;$(QTDIR)\bin\moc.exe&quot; -o &quot;$(SolutionDir)tmp\MOC_$(SafeInputName).cpp&quot; &quot;$(InputPath)&quot;"
Outputs="&quot;$(SolutionDir)tmp\MOC_$(SafeInputName).cpp&quot;"
/>
</FileConfiguration>
</File>
<File <File
RelativePath=".\src\Encoder_FLAC.h" RelativePath=".\src\Encoder_FLAC.h"
> >
@ -1246,6 +1318,40 @@
/> />
</FileConfiguration> </FileConfiguration>
</File> </File>
<File
RelativePath=".\src\Model_CueSheet.h"
>
<FileConfiguration
Name="Debug|Win32"
>
<Tool
Name="VCCustomBuildTool"
Description="MOC &quot;$(SolutionDir)tmp\MOC_$(SafeInputName).cpp&quot;"
CommandLine="&quot;$(QTDIR)\bin\moc.exe&quot; -o &quot;$(SolutionDir)tmp\MOC_$(SafeInputName).cpp&quot; &quot;$(InputPath)&quot;"
Outputs="&quot;$(SolutionDir)tmp\MOC_$(SafeInputName).cpp&quot;"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32"
>
<Tool
Name="VCCustomBuildTool"
Description="MOC &quot;$(SolutionDir)tmp\MOC_$(SafeInputName).cpp&quot;"
CommandLine="&quot;$(QTDIR)\bin\moc.exe&quot; -o &quot;$(SolutionDir)tmp\MOC_$(SafeInputName).cpp&quot; &quot;$(InputPath)&quot;"
Outputs="&quot;$(SolutionDir)tmp\MOC_$(SafeInputName).cpp&quot;"
/>
</FileConfiguration>
<FileConfiguration
Name="Release_Static|Win32"
>
<Tool
Name="VCCustomBuildTool"
Description="MOC &quot;$(SolutionDir)tmp\MOC_$(SafeInputName).cpp&quot;"
CommandLine="&quot;$(QTDIR)\bin\moc.exe&quot; -o &quot;$(SolutionDir)tmp\MOC_$(SafeInputName).cpp&quot; &quot;$(InputPath)&quot;"
Outputs="&quot;$(SolutionDir)tmp\MOC_$(SafeInputName).cpp&quot;"
/>
</FileConfiguration>
</File>
<File <File
RelativePath=".\src\Model_FileList.h" RelativePath=".\src\Model_FileList.h"
> >
@ -1436,6 +1542,40 @@
RelativePath=".\src\Targetver.h" RelativePath=".\src\Targetver.h"
> >
</File> </File>
<File
RelativePath=".\src\Thread_CueSplitter.h"
>
<FileConfiguration
Name="Debug|Win32"
>
<Tool
Name="VCCustomBuildTool"
Description="MOC &quot;$(SolutionDir)tmp\MOC_$(SafeInputName).cpp&quot;"
CommandLine="&quot;$(QTDIR)\bin\moc.exe&quot; -o &quot;$(SolutionDir)tmp\MOC_$(SafeInputName).cpp&quot; &quot;$(InputPath)&quot;"
Outputs="&quot;$(SolutionDir)tmp\MOC_$(SafeInputName).cpp&quot;"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32"
>
<Tool
Name="VCCustomBuildTool"
Description="MOC &quot;$(SolutionDir)tmp\MOC_$(SafeInputName).cpp&quot;"
CommandLine="&quot;$(QTDIR)\bin\moc.exe&quot; -o &quot;$(SolutionDir)tmp\MOC_$(SafeInputName).cpp&quot; &quot;$(InputPath)&quot;"
Outputs="&quot;$(SolutionDir)tmp\MOC_$(SafeInputName).cpp&quot;"
/>
</FileConfiguration>
<FileConfiguration
Name="Release_Static|Win32"
>
<Tool
Name="VCCustomBuildTool"
Description="MOC &quot;$(SolutionDir)tmp\MOC_$(SafeInputName).cpp&quot;"
CommandLine="&quot;$(QTDIR)\bin\moc.exe&quot; -o &quot;$(SolutionDir)tmp\MOC_$(SafeInputName).cpp&quot; &quot;$(InputPath)&quot;"
Outputs="&quot;$(SolutionDir)tmp\MOC_$(SafeInputName).cpp&quot;"
/>
</FileConfiguration>
</File>
<File <File
RelativePath=".\src\Thread_DiskObserver.h" RelativePath=".\src\Thread_DiskObserver.h"
> >
@ -1692,6 +1832,10 @@
RelativePath=".\tmp\MOC_Dialog_About.cpp" RelativePath=".\tmp\MOC_Dialog_About.cpp"
> >
</File> </File>
<File
RelativePath=".\tmp\MOC_Dialog_CueImport.cpp"
>
</File>
<File <File
RelativePath=".\tmp\MOC_Dialog_DropBox.cpp" RelativePath=".\tmp\MOC_Dialog_DropBox.cpp"
> >
@ -1732,6 +1876,10 @@
RelativePath=".\tmp\MOC_Encoder_Abstract.cpp" RelativePath=".\tmp\MOC_Encoder_Abstract.cpp"
> >
</File> </File>
<File
RelativePath=".\tmp\MOC_Encoder_AC3.cpp"
>
</File>
<File <File
RelativePath=".\tmp\MOC_Encoder_FLAC.cpp" RelativePath=".\tmp\MOC_Encoder_FLAC.cpp"
> >
@ -1756,6 +1904,10 @@
RelativePath=".\tmp\MOC_Model_AudioFile.cpp" RelativePath=".\tmp\MOC_Model_AudioFile.cpp"
> >
</File> </File>
<File
RelativePath=".\tmp\MOC_Model_CueSheet.cpp"
>
</File>
<File <File
RelativePath=".\tmp\MOC_Model_FileList.cpp" RelativePath=".\tmp\MOC_Model_FileList.cpp"
> >
@ -1776,6 +1928,10 @@
RelativePath=".\tmp\MOC_ShellIntegration.cpp" RelativePath=".\tmp\MOC_ShellIntegration.cpp"
> >
</File> </File>
<File
RelativePath=".\tmp\MOC_Thread_CueSplitter.cpp"
>
</File>
<File <File
RelativePath=".\tmp\MOC_Thread_DiskObserver.cpp" RelativePath=".\tmp\MOC_Thread_DiskObserver.cpp"
> >
@ -2051,6 +2207,40 @@
<Filter <Filter
Name="Dialogs" Name="Dialogs"
> >
<File
RelativePath=".\gui\CueSheetImport.ui"
>
<FileConfiguration
Name="Debug|Win32"
>
<Tool
Name="VCCustomBuildTool"
Description="UIC &quot;$(SolutionDir)tmp\UIC_$(SafeInputName).h&quot;"
CommandLine="&quot;$(QTDIR)\bin\uic.exe&quot; -o &quot;$(SolutionDir)tmp\UIC_$(SafeInputName).h&quot; &quot;$(InputPath)&quot;"
Outputs="&quot;$(SolutionDir)tmp\UIC_$(SafeInputName).h&quot;"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32"
>
<Tool
Name="VCCustomBuildTool"
Description="UIC &quot;$(SolutionDir)tmp\UIC_$(SafeInputName).h&quot;"
CommandLine="&quot;$(QTDIR)\bin\uic.exe&quot; -o &quot;$(SolutionDir)tmp\UIC_$(SafeInputName).h&quot; &quot;$(InputPath)&quot;"
Outputs="&quot;$(SolutionDir)tmp\UIC_$(SafeInputName).h&quot;"
/>
</FileConfiguration>
<FileConfiguration
Name="Release_Static|Win32"
>
<Tool
Name="VCCustomBuildTool"
Description="UIC &quot;$(SolutionDir)tmp\UIC_$(SafeInputName).h&quot;"
CommandLine="&quot;$(QTDIR)\bin\uic.exe&quot; -o &quot;$(SolutionDir)tmp\UIC_$(SafeInputName).h&quot; &quot;$(InputPath)&quot;"
Outputs="&quot;$(SolutionDir)tmp\UIC_$(SafeInputName).h&quot;"
/>
</FileConfiguration>
</File>
<File <File
RelativePath=".\gui\DropBox.ui" RelativePath=".\gui\DropBox.ui"
> >

View File

@ -38,6 +38,7 @@
#include <QLabel> #include <QLabel>
#include <MMSystem.h> #include <MMSystem.h>
#include <math.h>
//Helper macros //Helper macros
#define LINK(URL) QString("<a href=\"%1\">%2</a>").arg(URL).arg(URL) #define LINK(URL) QString("<a href=\"%1\">%2</a>").arg(URL).arg(URL)

View File

@ -52,6 +52,7 @@
#include <io.h> #include <io.h>
#include <fcntl.h> #include <fcntl.h>
#include <intrin.h> #include <intrin.h>
#include <math.h>
//COM includes //COM includes
#include <Objbase.h> #include <Objbase.h>

View File

@ -28,8 +28,7 @@
// If you wish to build your application for a previous Windows platform, include WinSDKVer.h and // If you wish to build your application for a previous Windows platform, include WinSDKVer.h and
// set the _WIN32_WINNT macro to the platform you wish to support before including SDKDDKVer.h. // set the _WIN32_WINNT macro to the platform you wish to support before including SDKDDKVer.h.
//#include <WinSDKVer.h>
#include <WinSDKVer.h>
// Modify the following defines if you have to target a platform prior to the ones specified below. // Modify the following defines if you have to target a platform prior to the ones specified below.
// Refer to MSDN for the latest info on corresponding values for different platforms. // Refer to MSDN for the latest info on corresponding values for different platforms.

View File

@ -36,6 +36,8 @@
#include <QDebug> #include <QDebug>
#include <math.h> #include <math.h>
#include <float.h>
#include <limits>
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
// Constructor // Constructor