ref: 0d7bafcebcfde8e1536791e9d387fa11fe6f43d4
parent: 6938cfce078ce088e2497f734c497a07a8e9c820
parent: 5c5dcfb14cc94a1861b5c033700dacb056e58204
author: Ethan Hugg <[email protected]>
date: Tue Jan 28 04:40:17 EST 2014
Merge pull request #248 from mstorsjo/msvc-proj-cleanup MSVC project file warning cleanup
--- a/codec/build/win32/dec/WelsDecPlus.vcproj
+++ b/codec/build/win32/dec/WelsDecPlus.vcproj
@@ -280,7 +280,7 @@
Name="VCLinkerTool"
AdditionalDependencies=".\..\..\..\..\bin\win32\Debug\welsdcore.lib"
OutputFile="$(OutDir)\welsdec.dll"
- LinkIncremental="1"
+ LinkIncremental="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories="..\..\..\libs\debug"
ModuleDefinitionFile="..\..\..\decoder\plus\src\wels_dec_export.def"
@@ -377,7 +377,7 @@
Name="VCLinkerTool"
AdditionalDependencies=".\..\..\..\..\bin\win64\Debug\welsdcore.lib"
OutputFile="$(OutDir)\welsdec.dll"
- LinkIncremental="1"
+ LinkIncremental="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories="..\..\..\libs\debug"
ModuleDefinitionFile="..\..\..\decoder\plus\src\wels_dec_export.def"
--- a/codec/build/win32/enc/encConsole.vcproj
+++ b/codec/build/win32/enc/encConsole.vcproj
@@ -169,7 +169,6 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalOptions="/LTCG"
AdditionalDependencies="$(OutDir)\welsenc.lib"
OutputFile="$(OutDir)\encConsole.exe"
LinkIncremental="1"
@@ -361,7 +360,6 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalOptions="/LTCG"
AdditionalDependencies="$(OutDir)\welsenc.lib"
OutputFile="$(OutDir)\encConsole.exe"
LinkIncremental="1"
--- a/codec/encoder/plus/src/DllEntry.cpp
+++ b/codec/encoder/plus/src/DllEntry.cpp
@@ -34,16 +34,10 @@
/////////////////////////////////////////////////////////////////////////////
// DLL Entry Point
-HANDLE g_hInstDll;
BOOL WINAPI DllEntryPoint (HINSTANCE hInstance, DWORD dwReason, LPVOID lpReserved) {- g_hInstDll = hInstance;
if (DLL_PROCESS_ATTACH == dwReason) {DisableThreadLibraryCalls (hInstance);
}
-// else if (DLL_PROCESS_DETACH == dwReason)
-// {-//
-// }
return TRUE;
-}
\ No newline at end of file
+}