third_party/exiv2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

#621 : Windows build changes.

Browse Source 
I discovered while doing a private build for a user that msvc/include/exv_msvc.h still contains the #pragma comment code.
I've removed that (again!) and fixed a consequential link error on exiv2lib.vcproj DebugDLL | ReleaseDLL
Rebuilt everything on VS2003/5/8 and all run the runner.bat test OK.
This commit is contained in:
Robin Mills 2009-03-20 03:40:14 +00:00
parent 953f387e5c
commit 891827b6ce
2 changed files with 2 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
msvc/exiv2lib/exiv2lib.vcproj
View File

@ -212,7 +212,7 @@
<Tool
Name="VCLinkerTool"
AdditionalOptions="/NODEFAULTLIB:LIBMTD"
AdditionalDependencies="..\xmpsdk\DebugDLL\xmpsdk.lib ..\..\..\expat-2.0.1\win32\bin\debug\libexpat.lib"
AdditionalDependencies="..\xmpsdk\DebugDLL\xmpsdk.lib ..\..\..\expat-2.0.1\win32\bin\debug\libexpat.lib ..\..\..\zlib-1.2.3\projects\visualc6\Win32_DLL_Debug\zlib1d.lib"
OutputFile="$(OutDir)\exiv2.dll"
GenerateDebugInformation="true"
RandomizedBaseAddress="1"
@ -297,7 +297,7 @@
<Tool
Name="VCLinkerTool"
AdditionalOptions="/NODEFAULTLIB:LIBCMT"
AdditionalDependencies="..\xmpsdk\ReleaseDLL\xmpsdk.lib ..\..\..\expat-2.0.1\win32\bin\release\libexpat.lib"
AdditionalDependencies="..\xmpsdk\ReleaseDLL\xmpsdk.lib ..\..\..\expat-2.0.1\win32\bin\release\libexpat.lib ..\..\..\zlib-1.2.3\projects\visualc6\Win32_DLL_Release\zlib1.lib"
OutputFile="$(OutDir)\exiv2.dll"
GenerateDebugInformation="false"
RandomizedBaseAddress="1"

14
msvc/include/exv_msvc.h
View File

@ -55,20 +55,6 @@ typedef int pid_t;
#define HAVE_LIBZ 1
#if HAVE_LIBZ
#define EXV_HAVE_LIBZ
#if EXV_HAVE_DLL
#ifdef _DEBUG
#pragma comment(lib,"../../../zlib-1.2.3/projects/visualc6/Win32_DLL_Debug/zlib1d.lib")
#else
#pragma comment(lib,"../../../zlib-1.2.3/projects/visualc6/Win32_DLL_Release/zlib1.lib")
#endif
#else
#ifdef _DEBUG
#pragma comment(lib,"../../../zlib-1.2.3/projects/visualc6/Win32_LIB_Debug/zlibd.lib")
#else
#pragma comment(lib,"../../../zlib-1.2.3/projects/visualc6/Win32_LIB_Release/zlib.lib")
#endif
#endif
#define EXV_HAVE_LIBZ
// assist VC7.1 to compile vsnprintf
#if (_MSC_VER < 1400) && !defined(vsnprintf)