[Deinterlace-checkins] SF.net SVN: deinterlace:[4634] trunk/DScaler/Plugins
Brought to you by:
adcockj,
dschmelzer
From: <ad...@us...> - 2009-06-14 17:02:50
|
Revision: 4634 http://deinterlace.svn.sourceforge.net/deinterlace/?rev=4634&view=rev Author: adcockj Date: 2009-06-14 17:02:47 +0000 (Sun, 14 Jun 2009) Log Message: ----------- Remove linkage of CRT with the deinterlace dlls Modified Paths: -------------- trunk/DScaler/Plugins/DI_Adaptive/DI_Adaptive.c trunk/DScaler/Plugins/DI_Adaptive/DI_Adaptive.dsp trunk/DScaler/Plugins/DI_Adaptive/DI_Adaptive2005.vcproj trunk/DScaler/Plugins/DI_BlendedClip/DI_BlendedClip.c trunk/DScaler/Plugins/DI_BlendedClip/DI_BlendedClip.dsp trunk/DScaler/Plugins/DI_BlendedClip/DI_BlendedClip2005.vcproj trunk/DScaler/Plugins/DI_Bob/DI_Bob.c trunk/DScaler/Plugins/DI_Bob/DI_Bob.dsp trunk/DScaler/Plugins/DI_Bob/DI_Bob2005.vcproj trunk/DScaler/Plugins/DI_EvenOnly/DI_EvenOnly.c trunk/DScaler/Plugins/DI_EvenOnly/DI_EvenOnly.dsp trunk/DScaler/Plugins/DI_EvenOnly/DI_EvenOnly2005.vcproj trunk/DScaler/Plugins/DI_Greedy/DI_Greedy.c trunk/DScaler/Plugins/DI_Greedy/DI_Greedy.dsp trunk/DScaler/Plugins/DI_Greedy/DI_Greedy2005.vcproj trunk/DScaler/Plugins/DI_Greedy2Frame/DI_Greedy2Frame.c trunk/DScaler/Plugins/DI_Greedy2Frame/DI_Greedy2Frame.dsp trunk/DScaler/Plugins/DI_Greedy2Frame/DI_Greedy2Frame2005.vcproj trunk/DScaler/Plugins/DI_GreedyH/DI_GreedyH.c trunk/DScaler/Plugins/DI_GreedyH/DI_GreedyH.dsp trunk/DScaler/Plugins/DI_GreedyH/DI_GreedyH2005.vcproj trunk/DScaler/Plugins/DI_MoComp2/DI_MoComp2.c trunk/DScaler/Plugins/DI_MoComp2/DI_MoComp2.dsp trunk/DScaler/Plugins/DI_MoComp2/DI_MoComp22005.vcproj trunk/DScaler/Plugins/DI_OddOnly/DI_OddOnly.c trunk/DScaler/Plugins/DI_OddOnly/DI_OddOnly.dsp trunk/DScaler/Plugins/DI_OddOnly/DI_OddOnly2005.vcproj trunk/DScaler/Plugins/DI_OldGame/DI_OldGame.c trunk/DScaler/Plugins/DI_OldGame/DI_OldGame.dsp trunk/DScaler/Plugins/DI_OldGame/DI_OldGame2005.vcproj trunk/DScaler/Plugins/DI_ScalerBob/DI_ScalerBob.c trunk/DScaler/Plugins/DI_ScalerBob/DI_ScalerBob.dsp trunk/DScaler/Plugins/DI_ScalerBob/DI_ScalerBob2005.vcproj trunk/DScaler/Plugins/DI_TomsMoComp/DI_TomsMoComp.c trunk/DScaler/Plugins/DI_TomsMoComp/DI_TomsMoComp.dsp trunk/DScaler/Plugins/DI_TomsMoComp/DI_TomsMoComp2005.vcproj trunk/DScaler/Plugins/DI_TwoFrame/DI_TwoFrame.c trunk/DScaler/Plugins/DI_TwoFrame/DI_TwoFrame.dsp trunk/DScaler/Plugins/DI_TwoFrame/DI_TwoFrame2005.vcproj trunk/DScaler/Plugins/DI_VideoBob/DI_VideoBob.c trunk/DScaler/Plugins/DI_VideoBob/DI_VideoBob.dsp trunk/DScaler/Plugins/DI_VideoBob/DI_VideoBob2005.vcproj trunk/DScaler/Plugins/DI_VideoWeave/DI_VideoWeave.c trunk/DScaler/Plugins/DI_VideoWeave/DI_VideoWeave.dsp trunk/DScaler/Plugins/DI_VideoWeave/DI_VideoWeave2005.vcproj trunk/DScaler/Plugins/DI_Weave/DI_Weave.c trunk/DScaler/Plugins/DI_Weave/DI_Weave.dsp trunk/DScaler/Plugins/DI_Weave/DI_Weave2005.vcproj trunk/DScaler/Plugins/FLT_BlackWhite/FLT_BlackWhite.dsp trunk/DScaler/Plugins/FLT_BlackWhite/FLT_BlackWhite2005.vcproj trunk/DScaler/Plugins/FLT_Chroma/FLT_Chroma.dsp trunk/DScaler/Plugins/FLT_Chroma/FLT_Chroma2005.vcproj trunk/DScaler/Plugins/FLT_Colorimetry/FLT_Colorimetry.dsp trunk/DScaler/Plugins/FLT_Colorimetry/FLT_Colorimetry2005.vcproj trunk/DScaler/Plugins/FLT_ColourInversion/FLT_ColourInversion.dsp trunk/DScaler/Plugins/FLT_ColourInversion/FLT_ColourInversion2005.vcproj trunk/DScaler/Plugins/FLT_DScopeVIDEO/FLT_DScopeVIDEO.dsp trunk/DScaler/Plugins/FLT_DScopeVIDEO/FLT_DScopeVIDEO2005.vcproj trunk/DScaler/Plugins/FLT_Gamma/FLT_Gamma.dsp trunk/DScaler/Plugins/FLT_Gamma/FLT_Gamma2005.vcproj trunk/DScaler/Plugins/FLT_Histogram/FLT_Histogram.dsp trunk/DScaler/Plugins/FLT_Histogram/FLT_Histogram2005.vcproj trunk/DScaler/Plugins/FLT_LogoKill/FLT_LogoKill2005.vcproj trunk/DScaler/Plugins/FLT_LuminChromaShift/FLT_LuminChromaShift.dsp trunk/DScaler/Plugins/FLT_LuminChromaShift/FLT_LuminChromaShift2005.vcproj Modified: trunk/DScaler/Plugins/DI_Adaptive/DI_Adaptive.c =================================================================== --- trunk/DScaler/Plugins/DI_Adaptive/DI_Adaptive.c 2009-06-14 17:00:31 UTC (rev 4633) +++ trunk/DScaler/Plugins/DI_Adaptive/DI_Adaptive.c 2009-06-14 17:02:47 UTC (rev 4634) @@ -293,7 +293,7 @@ return &AdaptiveMethod; } -BOOL WINAPI DllMain(HANDLE hInst, ULONG ul_reason_for_call, LPVOID lpReserved) +BOOL WINAPI NoCRTDllMain(HANDLE hInst, ULONG ul_reason_for_call, LPVOID lpReserved) { return TRUE; } Modified: trunk/DScaler/Plugins/DI_Adaptive/DI_Adaptive.dsp =================================================================== --- trunk/DScaler/Plugins/DI_Adaptive/DI_Adaptive.dsp 2009-06-14 17:00:31 UTC (rev 4633) +++ trunk/DScaler/Plugins/DI_Adaptive/DI_Adaptive.dsp 2009-06-14 17:02:47 UTC (rev 4634) @@ -43,7 +43,7 @@ # PROP Ignore_Export_Lib 1 # PROP Target_Dir "" # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "DI_ADAPTIVE_EXPORTS" /YX /FD /c -# ADD CPP /nologo /MT /W3 /Ox /Ot /Ow /Og /Oi /Oy /Ob2 /I "..\..\Api" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "DI_ADAPTIVE_EXPORTS" /FD /c +# ADD CPP /nologo /MT /W3 /Ox /Ot /Ow /Og /Oi /Ob2 /I "..\..\Api" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "DI_ADAPTIVE_EXPORTS" /FD /c # SUBTRACT CPP /YX # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 @@ -54,7 +54,7 @@ # ADD BSC32 /nologo LINK32=link.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 /dll /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 /nologo /dll /machine:I386 /out:"..\..\Release/DI_Adaptive.dll" /OPT:NOWIN98 +# 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 /nologo /entry:"NoCRTDllMain" /dll /machine:I386 /out:"..\..\Release/DI_Adaptive.dll" /OPT:NOWIN98 # SUBTRACT LINK32 /pdb:none !ELSEIF "$(CFG)" == "DI_Adaptive - Win32 Debug" @@ -81,7 +81,7 @@ # ADD BSC32 /nologo LINK32=link.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 /dll /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 /nologo /dll /incremental:no /debug /machine:I386 /out:"..\..\Debug/DI_Adaptive.dll" /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 /nologo /entry:"NoCRTDllMain" /dll /incremental:no /debug /machine:I386 /out:"..\..\Debug/DI_Adaptive.dll" /pdbtype:sept !ENDIF Modified: trunk/DScaler/Plugins/DI_Adaptive/DI_Adaptive2005.vcproj =================================================================== --- trunk/DScaler/Plugins/DI_Adaptive/DI_Adaptive2005.vcproj 2009-06-14 17:00:31 UTC (rev 4633) +++ trunk/DScaler/Plugins/DI_Adaptive/DI_Adaptive2005.vcproj 2009-06-14 17:02:47 UTC (rev 4634) @@ -85,6 +85,7 @@ SuppressStartupBanner="true" ProgramDatabaseFile=".\Release/DI_Adaptive.pdb" OptimizeForWindows98="1" + EntryPointSymbol="NoCRTDllMain" ImportLibrary=".\Release/DI_Adaptive.lib" TargetMachine="1" /> @@ -114,9 +115,9 @@ /> </Configuration> <Configuration - Name="Debug|Win32" - OutputDirectory=".\Debug" - IntermediateDirectory=".\Debug" + Name="Release|x64" + OutputDirectory="$(PlatformName)\$(ConfigurationName)" + IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" ConfigurationType="2" InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" UseOfMFC="0" @@ -137,26 +138,28 @@ /> <Tool Name="VCMIDLTool" - PreprocessorDefinitions="_DEBUG" + PreprocessorDefinitions="NDEBUG" MkTypLibCompatible="true" SuppressStartupBanner="true" - TargetEnvironment="1" - TypeLibraryName=".\Debug/DI_Adaptive.tlb" + TargetEnvironment="3" + TypeLibraryName=".\Release/DI_Adaptive.tlb" HeaderFileName="" /> <Tool Name="VCCLCompilerTool" - Optimization="0" + Optimization="3" + InlineFunctionExpansion="2" + EnableIntrinsicFunctions="true" + FavorSizeOrSpeed="1" AdditionalIncludeDirectories="..\..\Api" - PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;DI_ADAPTIVE_EXPORTS" - RuntimeLibrary="1" - PrecompiledHeaderFile=".\Debug/DI_Adaptive.pch" - AssemblerListingLocation=".\Debug/" - ObjectFile=".\Debug/" - ProgramDataBaseFileName=".\Debug/" + PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;DI_ADAPTIVE_EXPORTS" + RuntimeLibrary="0" + PrecompiledHeaderFile=".\Release/DI_Adaptive.pch" + AssemblerListingLocation=".\Release/" + ObjectFile=".\Release/" + ProgramDataBaseFileName=".\Release/" WarningLevel="3" SuppressStartupBanner="true" - DebugInformationFormat="3" CompileAs="0" /> <Tool @@ -164,22 +167,24 @@ /> <Tool Name="VCResourceCompilerTool" - PreprocessorDefinitions="_DEBUG" - Culture="1033" + PreprocessorDefinitions="NDEBUG" + Culture="2057" /> <Tool Name="VCPreLinkEventTool" /> <Tool Name="VCLinkerTool" + IgnoreImportLibrary="true" AdditionalDependencies="user32.lib" - OutputFile="..\..\Debug/DI_Adaptive.dll" + OutputFile="..\..\Release/DI_Adaptive.dll" LinkIncremental="1" SuppressStartupBanner="true" - GenerateDebugInformation="true" - ProgramDatabaseFile=".\Debug/DI_Adaptive.pdb" - ImportLibrary=".\Debug/DI_Adaptive.lib" - TargetMachine="1" + ProgramDatabaseFile=".\Release/DI_Adaptive.pdb" + OptimizeForWindows98="1" + EntryPointSymbol="NoCRTDllMain" + ImportLibrary=".\Release/DI_Adaptive.lib" + TargetMachine="17" /> <Tool Name="VCALinkTool" @@ -207,9 +212,9 @@ /> </Configuration> <Configuration - Name="Debug_Express|Win32" - OutputDirectory="$(ConfigurationName)" - IntermediateDirectory="$(ConfigurationName)" + Name="Debug|Win32" + OutputDirectory=".\Debug" + IntermediateDirectory=".\Debug" ConfigurationType="2" InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" UseOfMFC="0" @@ -243,12 +248,10 @@ AdditionalIncludeDirectories="..\..\Api" PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;DI_ADAPTIVE_EXPORTS" RuntimeLibrary="1" - PrecompiledHeaderFile="" - AssemblerListingLocation="$(IntDir)\" - ObjectFile="$(IntDir)\" - ProgramDataBaseFileName="$(IntDir)\" - BrowseInformation="1" - BrowseInformationFile="$(IntDir)\" + PrecompiledHeaderFile=".\Debug/DI_Adaptive.pch" + AssemblerListingLocation=".\Debug/" + ObjectFile=".\Debug/" + ProgramDataBaseFileName=".\Debug/" WarningLevel="3" SuppressStartupBanner="true" DebugInformationFormat="3" @@ -272,8 +275,9 @@ LinkIncremental="1" SuppressStartupBanner="true" GenerateDebugInformation="true" - ProgramDatabaseFile="$(IntDir)\DI_Adaptive.pdb" - ImportLibrary="$(IntDir)\DI_Adaptive.lib" + ProgramDatabaseFile=".\Debug/DI_Adaptive.pdb" + EntryPointSymbol="NoCRTDllMain" + ImportLibrary=".\Debug/DI_Adaptive.lib" TargetMachine="1" /> <Tool @@ -302,9 +306,9 @@ /> </Configuration> <Configuration - Name="Release_Express|Win32" - OutputDirectory="$(ConfigurationName)" - IntermediateDirectory="$(ConfigurationName)" + Name="Debug|x64" + OutputDirectory="$(PlatformName)\$(ConfigurationName)" + IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" ConfigurationType="2" InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" UseOfMFC="0" @@ -325,28 +329,26 @@ /> <Tool Name="VCMIDLTool" - PreprocessorDefinitions="NDEBUG" + PreprocessorDefinitions="_DEBUG" MkTypLibCompatible="true" SuppressStartupBanner="true" - TargetEnvironment="1" - TypeLibraryName=".\Release/DI_Adaptive.tlb" + TargetEnvironment="3" + TypeLibraryName=".\Debug/DI_Adaptive.tlb" HeaderFileName="" /> <Tool Name="VCCLCompilerTool" - Optimization="3" - InlineFunctionExpansion="2" - EnableIntrinsicFunctions="true" - FavorSizeOrSpeed="1" + Optimization="0" AdditionalIncludeDirectories="..\..\Api" - PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;DI_ADAPTIVE_EXPORTS" - RuntimeLibrary="0" - PrecompiledHeaderFile="" - AssemblerListingLocation="$(IntDir)\" - ObjectFile="$(IntDir)\" - ProgramDataBaseFileName="$(IntDir)\" + PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;DI_ADAPTIVE_EXPORTS" + RuntimeLibrary="1" + PrecompiledHeaderFile=".\Debug/DI_Adaptive.pch" + AssemblerListingLocation=".\Debug/" + ObjectFile=".\Debug/" + ProgramDataBaseFileName=".\Debug/" WarningLevel="3" SuppressStartupBanner="true" + DebugInformationFormat="3" CompileAs="0" /> <Tool @@ -354,23 +356,23 @@ /> <Tool Name="VCResourceCompilerTool" - PreprocessorDefinitions="NDEBUG" - Culture="2057" + PreprocessorDefinitions="_DEBUG" + Culture="1033" /> <Tool Name="VCPreLinkEventTool" /> <Tool Name="VCLinkerTool" - IgnoreImportLibrary="true" AdditionalDependencies="user32.lib" - OutputFile="..\..\Release/DI_Adaptive.dll" + OutputFile="..\..\Debug/DI_Adaptive.dll" LinkIncremental="1" SuppressStartupBanner="true" - ProgramDatabaseFile="$(IntDir)\DI_Adaptive.pdb" - OptimizeForWindows98="1" - ImportLibrary="$(IntDir)\DI_Adaptive.lib" - TargetMachine="1" + GenerateDebugInformation="true" + ProgramDatabaseFile=".\Debug/DI_Adaptive.pdb" + EntryPointSymbol="NoCRTDllMain" + ImportLibrary=".\Debug/DI_Adaptive.lib" + TargetMachine="17" /> <Tool Name="VCALinkTool" @@ -398,9 +400,9 @@ /> </Configuration> <Configuration - Name="Release|x64" - OutputDirectory="$(PlatformName)\$(ConfigurationName)" - IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" + Name="Debug_Express|Win32" + OutputDirectory="$(ConfigurationName)" + IntermediateDirectory="$(ConfigurationName)" ConfigurationType="2" InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" UseOfMFC="0" @@ -421,28 +423,28 @@ /> <Tool Name="VCMIDLTool" - PreprocessorDefinitions="NDEBUG" + PreprocessorDefinitions="_DEBUG" MkTypLibCompatible="true" SuppressStartupBanner="true" - TargetEnvironment="3" - TypeLibraryName=".\Release/DI_Adaptive.tlb" + TargetEnvironment="1" + TypeLibraryName=".\Debug/DI_Adaptive.tlb" HeaderFileName="" /> <Tool Name="VCCLCompilerTool" - Optimization="3" - InlineFunctionExpansion="2" - EnableIntrinsicFunctions="true" - FavorSizeOrSpeed="1" + Optimization="0" AdditionalIncludeDirectories="..\..\Api" - PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;DI_ADAPTIVE_EXPORTS" - RuntimeLibrary="0" - PrecompiledHeaderFile=".\Release/DI_Adaptive.pch" - AssemblerListingLocation=".\Release/" - ObjectFile=".\Release/" - ProgramDataBaseFileName=".\Release/" + PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;DI_ADAPTIVE_EXPORTS" + RuntimeLibrary="1" + PrecompiledHeaderFile="" + AssemblerListingLocation="$(IntDir)\" + ObjectFile="$(IntDir)\" + ProgramDataBaseFileName="$(IntDir)\" + BrowseInformation="1" + BrowseInformationFile="$(IntDir)\" WarningLevel="3" SuppressStartupBanner="true" + DebugInformationFormat="3" CompileAs="0" /> <Tool @@ -450,23 +452,23 @@ /> <Tool Name="VCResourceCompilerTool" - PreprocessorDefinitions="NDEBUG" - Culture="2057" + PreprocessorDefinitions="_DEBUG" + Culture="1033" /> <Tool Name="VCPreLinkEventTool" /> <Tool Name="VCLinkerTool" - IgnoreImportLibrary="true" AdditionalDependencies="user32.lib" - OutputFile="..\..\Release/DI_Adaptive.dll" + OutputFile="..\..\Debug/DI_Adaptive.dll" LinkIncremental="1" SuppressStartupBanner="true" - ProgramDatabaseFile=".\Release/DI_Adaptive.pdb" - OptimizeForWindows98="1" - ImportLibrary=".\Release/DI_Adaptive.lib" - TargetMachine="17" + GenerateDebugInformation="true" + ProgramDatabaseFile="$(IntDir)\DI_Adaptive.pdb" + EntryPointSymbol="NoCRTDllMain" + ImportLibrary="$(IntDir)\DI_Adaptive.lib" + TargetMachine="1" /> <Tool Name="VCALinkTool" @@ -494,7 +496,7 @@ /> </Configuration> <Configuration - Name="Debug|x64" + Name="Debug_Express|x64" OutputDirectory="$(PlatformName)\$(ConfigurationName)" IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" ConfigurationType="2" @@ -530,10 +532,12 @@ AdditionalIncludeDirectories="..\..\Api" PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;DI_ADAPTIVE_EXPORTS" RuntimeLibrary="1" - PrecompiledHeaderFile=".\Debug/DI_Adaptive.pch" - AssemblerListingLocation=".\Debug/" - ObjectFile=".\Debug/" - ProgramDataBaseFileName=".\Debug/" + PrecompiledHeaderFile="" + AssemblerListingLocation="$(IntDir)\" + ObjectFile="$(IntDir)\" + ProgramDataBaseFileName="$(IntDir)\" + BrowseInformation="1" + BrowseInformationFile="$(IntDir)\" WarningLevel="3" SuppressStartupBanner="true" DebugInformationFormat="3" @@ -557,8 +561,9 @@ LinkIncremental="1" SuppressStartupBanner="true" GenerateDebugInformation="true" - ProgramDatabaseFile=".\Debug/DI_Adaptive.pdb" - ImportLibrary=".\Debug/DI_Adaptive.lib" + ProgramDatabaseFile="$(IntDir)\DI_Adaptive.pdb" + EntryPointSymbol="NoCRTDllMain" + ImportLibrary="$(IntDir)\DI_Adaptive.lib" TargetMachine="17" /> <Tool @@ -587,9 +592,9 @@ /> </Configuration> <Configuration - Name="Debug_Express|x64" - OutputDirectory="$(PlatformName)\$(ConfigurationName)" - IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" + Name="Release_Express|Win32" + OutputDirectory="$(ConfigurationName)" + IntermediateDirectory="$(ConfigurationName)" ConfigurationType="2" InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" UseOfMFC="0" @@ -610,28 +615,28 @@ /> <Tool Name="VCMIDLTool" - PreprocessorDefinitions="_DEBUG" + PreprocessorDefinitions="NDEBUG" MkTypLibCompatible="true" SuppressStartupBanner="true" - TargetEnvironment="3" - TypeLibraryName=".\Debug/DI_Adaptive.tlb" + TargetEnvironment="1" + TypeLibraryName=".\Release/DI_Adaptive.tlb" HeaderFileName="" /> <Tool Name="VCCLCompilerTool" - Optimization="0" + Optimization="3" + InlineFunctionExpansion="2" + EnableIntrinsicFunctions="true" + FavorSizeOrSpeed="1" AdditionalIncludeDirectories="..\..\Api" - PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;DI_ADAPTIVE_EXPORTS" - RuntimeLibrary="1" + PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;DI_ADAPTIVE_EXPORTS" + RuntimeLibrary="0" PrecompiledHeaderFile="" AssemblerListingLocation="$(IntDir)\" ObjectFile="$(IntDir)\" ProgramDataBaseFileName="$(IntDir)\" - BrowseInformation="1" - BrowseInformationFile="$(IntDir)\" WarningLevel="3" SuppressStartupBanner="true" - DebugInformationFormat="3" CompileAs="0" /> <Tool @@ -639,22 +644,24 @@ /> <Tool Name="VCResourceCompilerTool" - PreprocessorDefinitions="_DEBUG" - Culture="1033" + PreprocessorDefinitions="NDEBUG" + Culture="2057" /> <Tool Name="VCPreLinkEventTool" /> <Tool Name="VCLinkerTool" + IgnoreImportLibrary="true" AdditionalDependencies="user32.lib" - OutputFile="..\..\Debug/DI_Adaptive.dll" + OutputFile="..\..\Release/DI_Adaptive.dll" LinkIncremental="1" SuppressStartupBanner="true" - GenerateDebugInformation="true" ProgramDatabaseFile="$(IntDir)\DI_Adaptive.pdb" + OptimizeForWindows98="1" + EntryPointSymbol="NoCRTDllMain" ImportLibrary="$(IntDir)\DI_Adaptive.lib" - TargetMachine="17" + TargetMachine="1" /> <Tool Name="VCALinkTool" @@ -749,6 +756,7 @@ SuppressStartupBanner="true" ProgramDatabaseFile="$(IntDir)\DI_Adaptive.pdb" OptimizeForWindows98="1" + EntryPointSymbol="NoCRTDllMain" ImportLibrary="$(IntDir)\DI_Adaptive.lib" TargetMachine="17" /> Modified: trunk/DScaler/Plugins/DI_BlendedClip/DI_BlendedClip.c =================================================================== --- trunk/DScaler/Plugins/DI_BlendedClip/DI_BlendedClip.c 2009-06-14 17:00:31 UTC (rev 4633) +++ trunk/DScaler/Plugins/DI_BlendedClip/DI_BlendedClip.c 2009-06-14 17:02:47 UTC (rev 4634) @@ -932,7 +932,7 @@ return &BlendedClipMethod; } -BOOL WINAPI DllMain(HANDLE hInstance, ULONG ul_reason_for_call, LPVOID lpReserved) +BOOL WINAPI NoCRTDllMain(HANDLE hInstance, ULONG ul_reason_for_call, LPVOID lpReserved) { hInst = hInstance; return TRUE; Modified: trunk/DScaler/Plugins/DI_BlendedClip/DI_BlendedClip.dsp =================================================================== --- trunk/DScaler/Plugins/DI_BlendedClip/DI_BlendedClip.dsp 2009-06-14 17:00:31 UTC (rev 4633) +++ trunk/DScaler/Plugins/DI_BlendedClip/DI_BlendedClip.dsp 2009-06-14 17:02:47 UTC (rev 4634) @@ -43,7 +43,7 @@ # PROP Ignore_Export_Lib 1 # PROP Target_Dir "" # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "DI_BLENDEDCLIP_EXPORTS" /YX /FD /c -# ADD CPP /nologo /MT /W3 /Ox /Ot /Ow /Og /Oi /Oy /Ob2 /I "..\..\Api" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "DI_BLENDEDCLIP_EXPORTS" /FD /c +# ADD CPP /nologo /MT /W3 /Ox /Ot /Ow /Og /Oi /Ob2 /I "..\..\Api" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "DI_BLENDEDCLIP_EXPORTS" /FD /c # SUBTRACT CPP /YX # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 @@ -54,7 +54,7 @@ # ADD BSC32 /nologo LINK32=link.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 /dll /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 /nologo /dll /machine:I386 /out:"..\..\Release/DI_BlendedClip.dll" /OPT:NOWIN98 +# 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 /nologo /entry:"NoCRTDllMain" /dll /machine:I386 /out:"..\..\Release/DI_BlendedClip.dll" /OPT:NOWIN98 # SUBTRACT LINK32 /pdb:none !ELSEIF "$(CFG)" == "DI_BlendedClip - Win32 Debug" @@ -82,7 +82,7 @@ # ADD BSC32 /nologo LINK32=link.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 /dll /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 /nologo /dll /incremental:no /debug /machine:I386 /out:"..\..\Debug/DI_BlendedClip.dll" /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 /nologo /entry:"NoCRTDllMain" /dll /incremental:no /debug /machine:I386 /out:"..\..\Debug/DI_BlendedClip.dll" /pdbtype:sept !ENDIF Modified: trunk/DScaler/Plugins/DI_BlendedClip/DI_BlendedClip2005.vcproj =================================================================== --- trunk/DScaler/Plugins/DI_BlendedClip/DI_BlendedClip2005.vcproj 2009-06-14 17:00:31 UTC (rev 4633) +++ trunk/DScaler/Plugins/DI_BlendedClip/DI_BlendedClip2005.vcproj 2009-06-14 17:02:47 UTC (rev 4634) @@ -81,6 +81,7 @@ SuppressStartupBanner="true" GenerateDebugInformation="true" ProgramDatabaseFile=".\Debug/DI_BlendedClip.pdb" + EntryPointSymbol="NoCRTDllMain" ImportLibrary=".\Debug/DI_BlendedClip.lib" TargetMachine="1" /> @@ -110,9 +111,9 @@ /> </Configuration> <Configuration - Name="Release|Win32" - OutputDirectory=".\Release" - IntermediateDirectory=".\Release" + Name="Debug|x64" + OutputDirectory="$(PlatformName)\$(ConfigurationName)" + IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" ConfigurationType="2" InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" UseOfMFC="0" @@ -132,28 +133,26 @@ /> <Tool Name="VCMIDLTool" - PreprocessorDefinitions="NDEBUG" + PreprocessorDefinitions="_DEBUG" MkTypLibCompatible="true" SuppressStartupBanner="true" - TargetEnvironment="1" - TypeLibraryName=".\Release/DI_BlendedClip.tlb" + TargetEnvironment="3" + TypeLibraryName=".\Debug/DI_BlendedClip.tlb" HeaderFileName="" /> <Tool Name="VCCLCompilerTool" - Optimization="3" - InlineFunctionExpansion="2" - EnableIntrinsicFunctions="true" - FavorSizeOrSpeed="1" + Optimization="0" AdditionalIncludeDirectories="..\..\Api" - PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;DI_BLENDEDCLIP_EXPORTS" - RuntimeLibrary="0" - PrecompiledHeaderFile=".\Release/DI_BlendedClip.pch" - AssemblerListingLocation=".\Release/" - ObjectFile=".\Release/" - ProgramDataBaseFileName=".\Release/" + PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS;DI_BLENDEDCLIP_EXPORTS" + RuntimeLibrary="1" + PrecompiledHeaderFile=".\Debug/DI_BlendedClip.pch" + AssemblerListingLocation=".\Debug/" + ObjectFile=".\Debug/" + ProgramDataBaseFileName=".\Debug/" WarningLevel="3" SuppressStartupBanner="true" + DebugInformationFormat="3" CompileAs="0" /> <Tool @@ -161,23 +160,23 @@ /> <Tool Name="VCResourceCompilerTool" - PreprocessorDefinitions="NDEBUG" - Culture="2057" + PreprocessorDefinitions="_DEBUG" + Culture="1033" /> <Tool Name="VCPreLinkEventTool" /> <Tool Name="VCLinkerTool" - IgnoreImportLibrary="true" AdditionalDependencies="user32.lib" - OutputFile="..\..\Release/DI_BlendedClip.dll" + OutputFile="..\..\Debug/DI_BlendedClip.dll" LinkIncremental="1" SuppressStartupBanner="true" - ProgramDatabaseFile=".\Release/DI_BlendedClip.pdb" - OptimizeForWindows98="1" - ImportLibrary=".\Release/DI_BlendedClip.lib" - TargetMachine="1" + GenerateDebugInformation="true" + ProgramDatabaseFile=".\Debug/DI_BlendedClip.pdb" + EntryPointSymbol="NoCRTDllMain" + ImportLibrary=".\Debug/DI_BlendedClip.lib" + TargetMachine="17" /> <Tool Name="VCALinkTool" @@ -205,9 +204,9 @@ /> </Configuration> <Configuration - Name="Debug_Express|Win32" - OutputDirectory="$(ConfigurationName)" - IntermediateDirectory="$(ConfigurationName)" + Name="Release|Win32" + OutputDirectory=".\Release" + IntermediateDirectory=".\Release" ConfigurationType="2" InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" UseOfMFC="0" @@ -227,27 +226,28 @@ /> <Tool Name="VCMIDLTool" - PreprocessorDefinitions="_DEBUG" + PreprocessorDefinitions="NDEBUG" MkTypLibCompatible="true" SuppressStartupBanner="true" TargetEnvironment="1" - TypeLibraryName=".\Debug/DI_BlendedClip.tlb" + TypeLibraryName=".\Release/DI_BlendedClip.tlb" HeaderFileName="" /> <Tool Name="VCCLCompilerTool" - Optimization="0" + Optimization="3" + InlineFunctionExpansion="2" + EnableIntrinsicFunctions="true" + FavorSizeOrSpeed="1" AdditionalIncludeDirectories="..\..\Api" - PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS;DI_BLENDEDCLIP_EXPORTS" - RuntimeLibrary="1" - PrecompiledHeaderFile="" - AssemblerListingLocation="$(IntDir)\" - ObjectFile="$(IntDir)\" - ProgramDataBaseFileName="$(IntDir)\" - BrowseInformation="1" + PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;DI_BLENDEDCLIP_EXPORTS" + RuntimeLibrary="0" + PrecompiledHeaderFile=".\Release/DI_BlendedClip.pch" + AssemblerListingLocation=".\Release/" + ObjectFile=".\Release/" + ProgramDataBaseFileName=".\Release/" WarningLevel="3" SuppressStartupBanner="true" - DebugInformationFormat="3" CompileAs="0" /> <Tool @@ -255,21 +255,23 @@ /> <Tool Name="VCResourceCompilerTool" - PreprocessorDefinitions="_DEBUG" - Culture="1033" + PreprocessorDefinitions="NDEBUG" + Culture="2057" /> <Tool Name="VCPreLinkEventTool" /> <Tool Name="VCLinkerTool" + IgnoreImportLibrary="true" AdditionalDependencies="user32.lib" - OutputFile="..\..\Debug/DI_BlendedClip.dll" + OutputFile="..\..\Release/DI_BlendedClip.dll" LinkIncremental="1" SuppressStartupBanner="true" - GenerateDebugInformation="true" - ProgramDatabaseFile="$(IntDir)\DI_BlendedClip.pdb" - ImportLibrary="$(IntDir)\DI_BlendedClip.lib" + ProgramDatabaseFile=".\Release/DI_BlendedClip.pdb" + OptimizeForWindows98="1" + EntryPointSymbol="NoCRTDllMain" + ImportLibrary=".\Release/DI_BlendedClip.lib" TargetMachine="1" /> <Tool @@ -298,9 +300,9 @@ /> </Configuration> <Configuration - Name="Release_Express|Win32" - OutputDirectory="$(ConfigurationName)" - IntermediateDirectory="$(ConfigurationName)" + Name="Release|x64" + OutputDirectory="$(PlatformName)\$(ConfigurationName)" + IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" ConfigurationType="2" InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" UseOfMFC="0" @@ -323,7 +325,7 @@ PreprocessorDefinitions="NDEBUG" MkTypLibCompatible="true" SuppressStartupBanner="true" - TargetEnvironment="1" + TargetEnvironment="3" TypeLibraryName=".\Release/DI_BlendedClip.tlb" HeaderFileName="" /> @@ -336,10 +338,10 @@ AdditionalIncludeDirectories="..\..\Api" PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;DI_BLENDEDCLIP_EXPORTS" RuntimeLibrary="0" - PrecompiledHeaderFile="" - AssemblerListingLocation="$(IntDir)\" - ObjectFile="$(IntDir)\" - ProgramDataBaseFileName="$(IntDir)\" + PrecompiledHeaderFile=".\Release/DI_BlendedClip.pch" + AssemblerListingLocation=".\Release/" + ObjectFile=".\Release/" + ProgramDataBaseFileName=".\Release/" WarningLevel="3" SuppressStartupBanner="true" CompileAs="0" @@ -362,10 +364,11 @@ OutputFile="..\..\Release/DI_BlendedClip.dll" LinkIncremental="1" SuppressStartupBanner="true" - ProgramDatabaseFile="$(IntDir)\DI_BlendedClip.pdb" + ProgramDatabaseFile=".\Release/DI_BlendedClip.pdb" OptimizeForWindows98="1" - ImportLibrary="$(IntDir)\DI_BlendedClip.lib" - TargetMachine="1" + EntryPointSymbol="NoCRTDllMain" + ImportLibrary=".\Release/DI_BlendedClip.lib" + TargetMachine="17" /> <Tool Name="VCALinkTool" @@ -393,9 +396,9 @@ /> </Configuration> <Configuration - Name="Debug|x64" - OutputDirectory="$(PlatformName)\$(ConfigurationName)" - IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" + Name="Debug_Express|Win32" + OutputDirectory="$(ConfigurationName)" + IntermediateDirectory="$(ConfigurationName)" ConfigurationType="2" InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" UseOfMFC="0" @@ -418,7 +421,7 @@ PreprocessorDefinitions="_DEBUG" MkTypLibCompatible="true" SuppressStartupBanner="true" - TargetEnvironment="3" + TargetEnvironment="1" TypeLibraryName=".\Debug/DI_BlendedClip.tlb" HeaderFileName="" /> @@ -428,10 +431,11 @@ AdditionalIncludeDirectories="..\..\Api" PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS;DI_BLENDEDCLIP_EXPORTS" RuntimeLibrary="1" - PrecompiledHeaderFile=".\Debug/DI_BlendedClip.pch" - AssemblerListingLocation=".\Debug/" - ObjectFile=".\Debug/" - ProgramDataBaseFileName=".\Debug/" + PrecompiledHeaderFile="" + AssemblerListingLocation="$(IntDir)\" + ObjectFile="$(IntDir)\" + ProgramDataBaseFileName="$(IntDir)\" + BrowseInformation="1" WarningLevel="3" SuppressStartupBanner="true" DebugInformationFormat="3" @@ -455,9 +459,10 @@ LinkIncremental="1" SuppressStartupBanner="true" GenerateDebugInformation="true" - ProgramDatabaseFile=".\Debug/DI_BlendedClip.pdb" - ImportLibrary=".\Debug/DI_BlendedClip.lib" - TargetMachine="17" + ProgramDatabaseFile="$(IntDir)\DI_BlendedClip.pdb" + EntryPointSymbol="NoCRTDllMain" + ImportLibrary="$(IntDir)\DI_BlendedClip.lib" + TargetMachine="1" /> <Tool Name="VCALinkTool" @@ -485,7 +490,7 @@ /> </Configuration> <Configuration - Name="Release|x64" + Name="Debug_Express|x64" OutputDirectory="$(PlatformName)\$(ConfigurationName)" IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" ConfigurationType="2" @@ -507,28 +512,27 @@ /> <Tool Name="VCMIDLTool" - PreprocessorDefinitions="NDEBUG" + PreprocessorDefinitions="_DEBUG" MkTypLibCompatible="true" SuppressStartupBanner="true" TargetEnvironment="3" - TypeLibraryName=".\Release/DI_BlendedClip.tlb" + TypeLibraryName=".\Debug/DI_BlendedClip.tlb" HeaderFileName="" /> <Tool Name="VCCLCompilerTool" - Optimization="3" - InlineFunctionExpansion="2" - EnableIntrinsicFunctions="true" - FavorSizeOrSpeed="1" + Optimization="0" AdditionalIncludeDirectories="..\..\Api" - PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;DI_BLENDEDCLIP_EXPORTS" - RuntimeLibrary="0" - PrecompiledHeaderFile=".\Release/DI_BlendedClip.pch" - AssemblerListingLocation=".\Release/" - ObjectFile=".\Release/" - ProgramDataBaseFileName=".\Release/" + PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS;DI_BLENDEDCLIP_EXPORTS" + RuntimeLibrary="1" + PrecompiledHeaderFile="" + AssemblerListingLocation="$(IntDir)\" + ObjectFile="$(IntDir)\" + ProgramDataBaseFileName="$(IntDir)\" + BrowseInformation="1" WarningLevel="3" SuppressStartupBanner="true" + DebugInformationFormat="3" CompileAs="0" /> <Tool @@ -536,22 +540,22 @@ /> <Tool Name="VCResourceCompilerTool" - PreprocessorDefinitions="NDEBUG" - Culture="2057" + PreprocessorDefinitions="_DEBUG" + Culture="1033" /> <Tool Name="VCPreLinkEventTool" /> <Tool Name="VCLinkerTool" - IgnoreImportLibrary="true" AdditionalDependencies="user32.lib" - OutputFile="..\..\Release/DI_BlendedClip.dll" + OutputFile="..\..\Debug/DI_BlendedClip.dll" LinkIncremental="1" SuppressStartupBanner="true" - ProgramDatabaseFile=".\Release/DI_BlendedClip.pdb" - OptimizeForWindows98="1" - ImportLibrary=".\Release/DI_BlendedClip.lib" + GenerateDebugInformation="true" + ProgramDatabaseFile="$(IntDir)\DI_BlendedClip.pdb" + EntryPointSymbol="NoCRTDllMain" + ImportLibrary="$(IntDir)\DI_BlendedClip.lib" TargetMachine="17" /> <Tool @@ -580,9 +584,9 @@ /> </Configuration> <Configuration - Name="Debug_Express|x64" - OutputDirectory="$(PlatformName)\$(ConfigurationName)" - IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" + Name="Release_Express|Win32" + OutputDirectory="$(ConfigurationName)" + IntermediateDirectory="$(ConfigurationName)" ConfigurationType="2" InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" UseOfMFC="0" @@ -602,27 +606,28 @@ /> <Tool Name="VCMIDLTool" - PreprocessorDefinitions="_DEBUG" + PreprocessorDefinitions="NDEBUG" MkTypLibCompatible="true" SuppressStartupBanner="true" - TargetEnvironment="3" - TypeLibraryName=".\Debug/DI_BlendedClip.tlb" + TargetEnvironment="1" + TypeLibraryName=".\Release/DI_BlendedClip.tlb" HeaderFileName="" /> <Tool Name="VCCLCompilerTool" - Optimization="0" + Optimization="3" + InlineFunctionExpansion="2" + EnableIntrinsicFunctions="true" + FavorSizeOrSpeed="1" AdditionalIncludeDirectories="..\..\Api" - PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS;DI_BLENDEDCLIP_EXPORTS" - RuntimeLibrary="1" + PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;DI_BLENDEDCLIP_EXPORTS" + RuntimeLibrary="0" PrecompiledHeaderFile="" AssemblerListingLocation="$(IntDir)\" ObjectFile="$(IntDir)\" ProgramDataBaseFileName="$(IntDir)\" - BrowseInformation="1" WarningLevel="3" SuppressStartupBanner="true" - DebugInformationFormat="3" CompileAs="0" /> <Tool @@ -630,22 +635,24 @@ /> <Tool Name="VCResourceCompilerTool" - PreprocessorDefinitions="_DEBUG" - Culture="1033" + PreprocessorDefinitions="NDEBUG" + Culture="2057" /> <Tool Name="VCPreLinkEventTool" /> <Tool Name="VCLinkerTool" + IgnoreImportLibrary="true" AdditionalDependencies="user32.lib" - OutputFile="..\..\Debug/DI_BlendedClip.dll" + OutputFile="..\..\Release/DI_BlendedClip.dll" LinkIncremental="1" SuppressStartupBanner="true" - GenerateDebugInformation="true" ProgramDatabaseFile="$(IntDir)\DI_BlendedClip.pdb" + OptimizeForWindows98="1" + EntryPointSymbol="NoCRTDllMain" ImportLibrary="$(IntDir)\DI_BlendedClip.lib" - TargetMachine="17" + TargetMachine="1" /> <Tool Name="VCALinkTool" @@ -739,6 +746,7 @@ SuppressStartupBanner="true" ProgramDatabaseFile="$(IntDir)\DI_BlendedClip.pdb" OptimizeForWindows98="1" + EntryPointSymbol="NoCRTDllMain" ImportLibrary="$(IntDir)\DI_BlendedClip.lib" TargetMachine="17" /> Modified: trunk/DScaler/Plugins/DI_Bob/DI_Bob.c =================================================================== --- trunk/DScaler/Plugins/DI_Bob/DI_Bob.c 2009-06-14 17:00:31 UTC (rev 4633) +++ trunk/DScaler/Plugins/DI_Bob/DI_Bob.c 2009-06-14 17:02:47 UTC (rev 4634) @@ -254,7 +254,7 @@ return &BobMethod; } -BOOL WINAPI DllMain(HANDLE hInst, ULONG ul_reason_for_call, LPVOID lpReserved) +BOOL WINAPI NoCRTDllMain(HANDLE hInst, ULONG ul_reason_for_call, LPVOID lpReserved) { return TRUE; } Modified: trunk/DScaler/Plugins/DI_Bob/DI_Bob.dsp =================================================================== --- trunk/DScaler/Plugins/DI_Bob/DI_Bob.dsp 2009-06-14 17:00:31 UTC (rev 4633) +++ trunk/DScaler/Plugins/DI_Bob/DI_Bob.dsp 2009-06-14 17:02:47 UTC (rev 4634) @@ -43,7 +43,7 @@ # PROP Ignore_Export_Lib 1 # PROP Target_Dir "" # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "DI_BOB_EXPORTS" /YX /FD /c -# ADD CPP /nologo /MT /W3 /Ox /Ot /Ow /Og /Oi /Oy /Ob2 /I "..\..\Api" /D "DI_BOB_EXPORTS" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /FD /c +# ADD CPP /nologo /MT /W3 /Ox /Ot /Ow /Og /Oi /Ob2 /I "..\..\Api" /D "DI_BOB_EXPORTS" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /FD /c # SUBTRACT CPP /YX # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 @@ -54,7 +54,7 @@ # ADD BSC32 /nologo LINK32=link.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 /dll /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 /nologo /dll /pdb:none /machine:I386 /out:"..\..\Release/DI_Bob.dll" /OPT:NOWIN98 +# 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 /nologo /entry:"NoCRTDllMain" /dll /pdb:none /machine:I386 /out:"..\..\Release/DI_Bob.dll" /OPT:NOWIN98 # SUBTRACT LINK32 /map /nodefaultlib !ELSEIF "$(CFG)" == "DI_Bob - Win32 Debug" @@ -82,7 +82,7 @@ # ADD BSC32 /nologo LINK32=link.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 /dll /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 /nologo /dll /incremental:no /debug /machine:I386 /out:"..\..\Debug/DI_Bob.dll" /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 /nologo /entry:"NoCRTDllMain" /dll /incremental:no /debug /machine:I386 /out:"..\..\Debug/DI_Bob.dll" /pdbtype:sept # SUBTRACT LINK32 /pdb:none /map /nodefaultlib !ENDIF Modified: trunk/DScaler/Plugins/DI_Bob/DI_Bob2005.vcproj =================================================================== --- trunk/DScaler/Plugins/DI_Bob/DI_Bob2005.vcproj 2009-06-14 17:00:31 UTC (rev 4633) +++ trunk/DScaler/Plugins/DI_Bob/DI_Bob2005.vcproj 2009-06-14 17:02:47 UTC (rev 4634) @@ -4,6 +4,7 @@ Version="8.00" Name="DI_Bob" ProjectGUID="{EAD803A2-490A-4428-9DDF-17956F1F1C66}" + RootNamespace="DI_Bob" > <Platforms> <Platform @@ -81,6 +82,7 @@ LinkIncremental="1" SuppressStartupBanner="true" OptimizeForWindows98="1" + EntryPointSymbol="NoCRTDllMain" ImportLibrary=".\Release/DI_Bob.lib" TargetMachine="1" /> @@ -110,9 +112,9 @@ /> </Configuration> <Configuration - Name="Debug|Win32" - OutputDirectory=".\Debug" - IntermediateDirectory=".\Debug" + Name="Release|x64" + OutputDirectory="$(PlatformName)\$(ConfigurationName)" + IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" ConfigurationType="2" InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" UseOfMFC="0" @@ -132,26 +134,28 @@ /> <Tool Name="VCMIDLTool" - PreprocessorDefinitions="_DEBUG" + PreprocessorDefinitions="NDEBUG" MkTypLibCompatible="true" SuppressStartupBanner="true" - TargetEnvironment="1" - TypeLibraryName=".\Debug/DI_Bob.tlb" + TargetEnvironment="3" + TypeLibraryName=".\Release/DI_Bob.tlb" HeaderFileName="" /> <Tool Name="VCCLCompilerTool" - Optimization="0" + Optimization="3" + InlineFunctionExpansion="2" + EnableIntrinsicFunctions="true" + FavorSizeOrSpeed="1" AdditionalIncludeDirectories="..\..\Api" - PreprocessorDefinitions="DI_BOB_EXPORTS;WIN32;_DEBUG;_WINDOWS" - RuntimeLibrary="1" - PrecompiledHeaderFile=".\Debug/DI_Bob.pch" - AssemblerListingLocation=".\Debug/" - ObjectFile=".\Debug/" - ProgramDataBaseFileName=".\Debug/" + PreprocessorDefinitions="DI_BOB_EXPORTS;WIN32;NDEBUG;_WINDOWS" + RuntimeLibrary="0" + PrecompiledHeaderFile=".\Release/DI_Bob.pch" + AssemblerListingLocation=".\Release/" + ObjectFile=".\Release/" + ProgramDataBaseFileName=".\Release/" WarningLevel="3" SuppressStartupBanner="true" - DebugInformationFormat="3" CompileAs="0" /> <Tool @@ -159,21 +163,22 @@ /> <Tool Name="VCResourceCompilerTool" - PreprocessorDefinitions="_DEBUG" - Culture="1033" + PreprocessorDefinitions="NDEBUG" + Culture="2057" /> <Tool Name="VCPreLinkEventTool" /> <Tool Name="VCLinkerTool" - OutputFile="..\..\Debug/DI_Bob.dll" + IgnoreImportLibrary="true" + OutputFile="..\..\Release/DI_Bob.dll" LinkIncremental="1" SuppressStartupBanner="true" - GenerateDebugInformation="true" - ProgramDatabaseFile=".\Debug/DI_Bob.pdb" - ImportLibrary=".\Debug/DI_Bob.lib" - TargetMachine="1" + OptimizeForWindows98="1" + EntryPointSymbol="NoCRTDllMain" + ImportLibrary=".\Release/DI_Bob.lib" + TargetMachine="17" /> <Tool Name="VCALinkTool" @@ -201,9 +206,9 @@ /> </Configuration> <Configuration - Name="Debug_Express|Win32" - OutputDirectory="$(ConfigurationName)" - IntermediateDirectory="$(ConfigurationName)" + Name="Debug|Win32" + OutputDirectory=".\Debug" + IntermediateDirectory=".\Debug" ConfigurationType="2" InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" UseOfMFC="0" @@ -236,11 +241,10 @@ AdditionalIncludeDirectories="..\..\Api" PreprocessorDefinitions="DI_BOB_EXPORTS;WIN32;_DEBUG;_WINDOWS" RuntimeLibrary="1" - PrecompiledHeaderFile="" - AssemblerListingLocation="$(IntDir)\" - ObjectFile="$(IntDir)\" - ProgramDataBaseFileName="$(IntDir)\" - BrowseInformation="1" + PrecompiledHeaderFile=".\Debug/DI_Bob.pch" + AssemblerListingLocation=".\Debug/" + ObjectFile=".\Debug/" + ProgramDataBaseFileName=".\Debug/" WarningLevel="3" SuppressStartupBanner="true" DebugInformationFormat="3" @@ -259,13 +263,13 @@ /> <Tool Name="VCLinkerTool" - AdditionalDependencies="user32.lib" OutputFile="..\..\Debug/DI_Bob.dll" LinkIncremental="1" SuppressStartupBanner="true" GenerateDebugInformation="true" - ProgramDatabaseFile="$(IntDir)\DI_Bob.pdb" - ImportLibrary="$(IntDir)\DI_Bob.lib" + ProgramDatabaseFile=".\Debug/DI_Bob.pdb" + EntryPointSymbol="NoCRTDllMain" + ImportLibrary=".\Debug/DI_Bob.lib" TargetMachine="1" /> <Tool @@ -294,9 +298,9 @@ /> </Configuration> <Configuration - Name="Release_Express|Win32" - OutputDirectory="$(ConfigurationName)" - IntermediateDirectory="$(ConfigurationName)" + Name="Debug|x64" + OutputDirectory="$(PlatformName)\$(ConfigurationName)" + IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" ConfigurationType="2" InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" UseOfMFC="0" @@ -316,28 +320,26 @@ /> <Tool Name="VCMIDLTool" - PreprocessorDefinitions="NDEBUG" + PreprocessorDefinitions="_DEBUG" MkTypLibCompatible="true" SuppressStartupBanner="true" - TargetEnvironment="1" - TypeLibraryName=".\Release/DI_Bob.tlb" + TargetEnvironment="3" + TypeLibraryName=".\Debug/DI_Bob.tlb" HeaderFileName="" /> <Tool Name="VCCLCompilerTool" - Optimization="3" - InlineFunctionExpansion="2" - EnableIntrinsicFunctions="true" - FavorSizeOrSpeed="1" + Optimization="0" AdditionalIncludeDirectories="..\..\Api" - PreprocessorDefinitions="DI_BOB_EXPORTS;WIN32;NDEBUG;_WINDOWS" - RuntimeLibrary="0" - PrecompiledHeaderFile="" - AssemblerListingLocation="$(IntDir)\" - ObjectFile="$(IntDir)\" - ProgramDataBaseFileName="$(IntDir)\" + PreprocessorDefinitions="DI_BOB_EXPORTS;WIN32;_DEBUG;_WINDOWS" + RuntimeLibrary="1" + PrecompiledHeaderFile=".\Debug/DI_Bob.pch" + AssemblerListingLocation=".\Debug/" + ObjectFile=".\Debug/" + ProgramDataBaseFileName=".\Debug/" WarningLevel="3" SuppressStartupBanner="true" + DebugInformationFormat="3" CompileAs="0" /> <Tool @@ -345,22 +347,22 @@ /> <Tool Name="VCResourceCompilerTool" - PreprocessorDefinitions="NDEBUG" - Culture="2057" + PreprocessorDefinitions="_DEBUG" + Culture="1033" /> <Tool Name="VCPreLinkEventTool" /> <Tool Name="VCLinkerTool" - IgnoreImportLibrary="true" - AdditionalDependencies="user32.lib" - OutputFile="..\..\Release/DI_Bob.dll" + OutputFile="..\..\Debug/DI_Bob.dll" LinkIncremental="1" SuppressStartupBanner="true" - OptimizeForWindows98="1" - ImportLibrary="$(IntDir)\DI_Bob.lib" - TargetMachine="1" + GenerateDebugInformation="true" + ProgramDatabaseFile=".\Debug/DI_Bob.pdb" + EntryPointSymbol="NoCRTDllMain" + ImportLibrary=".\Debug/DI_Bob.lib" + TargetMachine="17" /> <Tool Name="VCALinkTool" @@ -388,9 +390,9 @@ /> </Configuration> <Configuration - Name="Release|x64" - OutputDirectory="$(PlatformName)\$(ConfigurationName)" - IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" + Name="Debug_Express|Win32" + OutputDirectory="$(ConfigurationName)" + IntermediateDirectory="$(ConfigurationName)" ConfigurationType="2" InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" UseOfMFC="0" @@ -410,28 +412,27 @@ /> <Tool Name="VCMIDLTool" - PreprocessorDefinitions="NDEBUG" + PreprocessorDefinitions="_DEBUG" MkTypLibCompatible="true" SuppressStartupBanner="true" - TargetEnvironment="3" - TypeLibraryName=".\Release/DI_Bob.tlb" + TargetEnvironment="1" + TypeLibraryName=".\Debug/DI_Bob.tlb" HeaderFileName="" /> <Tool Name="VCCLCompilerTool" - Optimization="3" - InlineFunctionExpansion="2" - EnableIntrinsicFunctions="true" - FavorSizeOrSpeed="1" + Optimization="0" AdditionalIncludeDirectories="..\..\Api" - PreprocessorDefinitions="DI_BOB_EXPORTS;WIN32;NDEBUG;_WINDOWS" - RuntimeLibrary="0" - PrecompiledHeaderFile=".\Release/DI_Bob.pch" - AssemblerListingLocation=".\Release/" - ObjectFile=".\Release/" - ProgramDataBaseFileName=".\Release/" + PreprocessorDefinitions="DI_BOB_EXPORTS;WIN32;_DEBUG;_WINDOWS" + RuntimeLibrary="1" + PrecompiledHeaderFile="" + AssemblerListingLocation="$(IntDir)\" + ObjectFile="$(IntDir)\" + ProgramDataBaseFileName="$(IntDir)\" + BrowseInformation="1" WarningLevel="3" SuppressStartupBanner="true" + DebugInformationFormat="3" CompileAs="0" /> <Tool @@ -439,21 +440,23 @@ /> <Tool Name="VCResourceCompilerTool" - PreprocessorDefinitions="NDEBUG" - Culture="2057" + PreprocessorDefinitions="_DEBUG" + Culture="1033" /> <Tool Name="VCPreLinkEventTool" /> <Tool Name="VCLinkerTool" - IgnoreImportLibrary="true" - OutputFile="..\..\Release/DI_Bob.dll" + AdditionalDependencies="user32.lib" + OutputFile="..\..\Debug/DI_Bob.dll" LinkIncremental="1" SuppressStartupBanner="true" - OptimizeForWindows98="1" - ImportLibrary=".\Release/DI_Bob.lib" - TargetMachine="17" + GenerateDebugInformation="true" + ProgramDatabaseFile="$(IntDir)\DI_Bob.pdb" + EntryPointSymbol="NoCRTDllMain" + ImportLibrary="$(IntDir)\DI_Bob.lib" + TargetMachine="1" /> <Tool Name="VCALinkTool" @@ -481,7 +484,7 @@ /> </Configuration> <Configuration - Name="Debug|x64" + Name="Debug_Express|x64" OutputDirectory="$(PlatformName)\$(ConfigurationName)" IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" ConfigurationType="2" @@ -516,10 +519,11 @@ AdditionalIncludeDirectories="..\..\Api" PreprocessorDefinitions="DI_BOB_EXPORTS;WIN32;_DEBUG;_WINDOWS" RuntimeLibrary="1" - PrecompiledHeaderFile=".\Debug/DI_Bob.pch" - AssemblerListingLocation=".\Debug/" - ObjectFile=".\Debug/" - ProgramDataBaseFileName=".\Debug/" + PrecompiledHeaderFile="" + AssemblerListingLocation="$(IntDir)\" + ObjectFile="$(IntDir)\" + ProgramDataBaseFileName="$(IntDir)\" + BrowseInformation="1" WarningLevel="3" SuppressStartupBanner="true" DebugInformationFormat="3" @@ -538,12 +542,14 @@ /> <Tool Name="VCLinkerTool" + AdditionalDependencies="user32.lib" OutputFile="..\..\Debug/DI_Bob.dll" LinkIncremental="1" SuppressStartupBanner="true" GenerateDebugInformation="true" - ProgramDatabaseFile=".\Debug/DI_Bob.pdb" - ImportLibrary=".\Debug/DI_Bob.lib" + ProgramDatabaseFile="$(IntDir)\DI_Bob.pdb" + EntryPointSymbol="NoCRTDllMain" + ImportLibrary="$(IntDir)\DI_Bob.lib" TargetMachine="17" /> <Tool @@ -572,9 +578,9 @@ /> </Configuration> <Configuration - Name="Debug_Express|x64" - OutputDirectory="$(PlatformName)\$(ConfigurationName)" - IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" + Name="Release_Express|Win32" + OutputDirectory="$(ConfigurationName)" + IntermediateDirectory="$(ConfigurationName)" ConfigurationType="2" InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" UseOfMFC="0" @@ -594,27 +600,28 @@ /> <Tool Name="VCMIDLTool" - PreprocessorDefinitions="_DEBUG" + PreprocessorDefinitions="NDEBUG" MkTypLibCompatible="true" SuppressStartupBanner="true" - TargetEnvironment="3" - TypeLibraryName=".\Debug/DI_Bob.tlb" + TargetEnvironment="1" + TypeLibraryName=".\Release/DI_Bob.tlb" HeaderFileName="" /> <Tool Name="VCCLCompilerTool" - Optimization="0" + Optimization="3" + InlineFunctionExpansion="2" + EnableIntrinsicFunctions="true" + FavorSizeOrSpeed="1" AdditionalIncludeDirectories="..\..\Api" - PreprocessorDefinitions="DI_BOB_EXPORTS;WIN32;_DEBUG;_WINDOWS" - RuntimeLibrary="1" + PreprocessorDefinitions="DI_BOB_EXPORTS;WIN32;NDEBUG;_WINDOWS" + RuntimeLibrary="0" PrecompiledHeaderFile="" AssemblerListingLocation="$(IntDir)\" ObjectFile="$(IntDir)\" ProgramDataBaseFileName="$(IntDir)\" - BrowseInformation="1" WarningLevel="3" SuppressStartupBanner="true" - DebugInformationFormat="3" CompileAs="0" /> <Tool @@ -622,22 +629,23 @@ /> <Tool Name="VCResourceCompilerTool" - PreprocessorDefinitions="_DEBUG" - Culture="1033" + PreprocessorDefinitions="NDEBUG" + Culture="2057" /> <Tool Name="VCPreLinkEventTool" /> <Tool Name="VCLinkerTool" + IgnoreImportLibrary="true" AdditionalDependencies="user32.lib" - OutputFile="..\..\Debug/DI_Bob.dll" + OutputFile="..\..\Release/DI_Bob.dll" LinkIncremental="1" SuppressStartupBanner="true" - GenerateDebugInformation="true" - ProgramDatabaseFile="$(IntDir)\DI_Bob.pdb" + OptimizeForWindows98="1" + EntryPointSymbol="NoCRTDllMain" ImportLibrary="$(IntDir)\DI_Bob.lib" - TargetMachine="17" + TargetMachine="1" /> <Tool Name="VCALinkTool" @@ -730,6 +738,7 @@ LinkIncremental="1" SuppressStartupBanner="true" OptimizeForWindows98="1" + EntryPointSymbol="NoCRTDllMain" ImportLibrary="$(IntDir)\DI_Bob.lib" TargetMachine="17" /> Modified: trunk/DScaler/Plugins/DI_EvenOnly/DI_EvenOnly.c =================================================================== --- trunk/DScaler/Plugins/DI_EvenOnly/DI_EvenOnly.c 2009-06-14 17:00:31 UTC (rev 4633) +++ trunk/DScaler/Plugins/DI_EvenOnly/DI_EvenOnly.c 2009-06-14 17:02:47 UTC (rev 4634) @@ -81,7 +81,7 @@ return &EvenOnlyMethod; } -BOOL WINAPI DllMain(HANDLE hInst, ULONG ul_reason_for_call, LPVOID lpReserved) +BOOL WINAPI NoCRTDllMain(HANDLE hInst, ULONG ul_reason_for_call, LPVOID lpReserved) { return TRUE; } Modified: trunk/DScaler/Plugins/DI_EvenOnly/DI_EvenOnly.dsp =================================================================== --- trunk/DScaler/Plugins/DI_EvenOnly/DI_EvenOnly.dsp 2009-06-14 17:00:31 UTC (rev 4633) +++ trunk/DScaler/Plugins/DI_EvenOnly/DI_EvenOnly.dsp 2009-06-14 17:02:47 UTC (rev 4634) @@ -43,7 +43,7 @@ # PROP Ignore_Export_Lib 1 # PROP Target_Dir "" # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "DI_EVENONLY_EXPORTS" /YX /FD /c -# ADD CPP /nologo /MT /W3 /Ox /Ot /Ow /Og /Oi /Oy /Ob2 /I "..\..\Api" /D "DI_EVENONLY_EXPORTS" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /FD /c +# ADD CPP /nologo /MT /W3 /Ox /Ot /Ow /Og /Oi /Ob2 /I "..\..\Api" /D "DI_EVENONLY_EXPORTS" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /FD /c # SUBTRACT CPP /YX # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 @@ -54,7 +54,7 @@ # ADD BSC32 /nologo LINK32=link.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 /dll /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 /nologo /dll /pdb:none /machine:I386 /out:"..\..\Release/DI_EvenOnly.dll" /OPT:NOWIN98 +# 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 /nologo /entry:"NoCRTDllMain" /dll /pdb:none /machine:I386 /out:"..\..\Release/DI_EvenOnly.dll" /OPT:NOWIN98 # SUBTRACT LINK32 /map /nodefaultlib !ELSEIF "$(CFG)" == "DI_EvenOnly - Win32 Debug" @@ -82,7 +82,7 @@ # ADD BSC32 /nologo LINK32=link.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 /dll /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 /nologo /dll /incremental:no /debug /machine:I386 /out:"..\..\Debug/DI_EvenOnly.dll" /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 /nologo /entry:"NoCRTDllMain" /dll /incremental:no /debug /machine:I386 /out:"..\..\Debug/DI_EvenOnly.dll" /pdbtype:sept # SUBTRACT LINK32 /pdb:none /map /nodefaultlib !ENDIF Modified: trunk/DScaler/Plugins/DI_EvenOnly/DI_EvenOnly2005.vcproj =================================================================== --- trunk/DScaler/Plugins/DI_EvenOnly/DI_EvenOnly2005.vcproj 2009-06-14 17:00:31 UTC (rev 4633) +++ trunk/DScaler/Plugins/DI_EvenOnly/DI_EvenOnly2005.vcproj 2009-06-14 17:02:47 UTC (rev 4634) @@ -4,6 +4,7 @@ Version="8.00" Name="DI_EvenOnly" ProjectGUID="{8F886664-F7B6-4444-ACF9-3E567D86115E}" + RootNamespace="DI_EvenOnly" > <Platforms> <Platform @@ -79,6 +80,7 @@ SuppressStartupBanner="true" GenerateDebugInformation="true" ProgramDatabaseFile=".\Debug/DI_EvenOnly.pdb" + EntryPointSymbol="NoCRTDllMain" ImportLibrary=".\Debug/DI_EvenOnly.lib" TargetMachine="1" /> @@ -108,9 +110,9 @@ /> </Configuration> <Configuration - Name="Release|Win32" - OutputDirectory=".\Release" - IntermediateDirectory=".\Release" + Name="Debug|x64" + OutputDirectory="$(PlatformName)\$(ConfigurationName)" + IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" ConfigurationType="2" InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" UseOfMFC="0" @@ -130,28 +132,26 @@ /> <Tool Name="VCMIDLTool" - PreprocessorDefinitions="NDEBUG" + PreprocessorDefinitions="_DEBUG" MkTypLibCompatible="true" SuppressStartupBanner="true" - TargetEnvironment="1" - TypeLibraryName=".\Release/DI_EvenOnly.tlb" + TargetEnvironment="3" + TypeLibraryName=".\Debug/DI_EvenOnly.tlb" HeaderFileName="" /> <Tool Name="VCCLCompilerTool" - Optimization="3" - InlineFunctionExpansion="2" - EnableIntrinsicFunctions="true" - FavorSizeOrSpeed="1" + Optimization="0" AdditionalIncludeDirectories="..\..\Api" - PreprocessorDefinitions="DI_EVENONLY_EXPORTS;WIN32;NDEBUG;_WINDOWS" - RuntimeLibrary="0" - PrecompiledHeaderFile=".\Release/DI_EvenOnly.pch" - AssemblerListingLocation=".\Release/" - ObjectFile=".\Release/" - ProgramDataBaseFileName=".\Release/" + PreprocessorDefinitions="DI_EVENONLY_EXPORTS;WIN32;_DEBUG;_WINDOWS" + RuntimeLibrary="1" + PrecompiledHeaderFile=".\Debug/DI_EvenOnly.pch" + AssemblerListingLocation=".\Debug/" + ObjectFile=".\Debug/" + ProgramDataBaseFileName=".\Debug/" WarningLevel="3" SuppressStartupBanner="true" + DebugInformationFormat="3" CompileAs="0" /> <Tool @@ -159,21 +159,22 @@ /> <Tool Name="VCResourceCompilerTool" - Prepro... [truncated message content] |