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

Backed out revisions 2221:2219 and most of change 2216.

Browse Source
This commit is contained in:
Andreas Huggel 2010-05-25 15:04:16 +00:00
parent 03057632f5
commit 5d24e744c2
3 changed files with 4 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
msvc/exiv2lib/exiv2lib.vcproj
View File

@ -36,7 +36,6 @@
Name="VCCustomBuildTool"/>
<Tool
Name="VCLibrarianTool"
AdditionalDependencies="Ws2_32.lib"
OutputFile="$(OutDir)/exiv2.lib"
AdditionalLibraryDirectories="..\xmpsdk\Debug;..\..\..\expat-2.0.1\win32\bin\debug"/>
<Tool
@ -92,7 +91,6 @@ cd ..\..\exiv2lib
Name="VCCustomBuildTool"/>
<Tool
Name="VCLibrarianTool"
AdditionalDependencies="Ws2_32.lib"
OutputFile="$(OutDir)/exiv2.lib"
AdditionalLibraryDirectories="..\xmpsdk\Release;..\..\..\expat-2.0.1\win32\bin\release"/>
<Tool
@ -156,7 +154,7 @@ cd ..\..\exiv2lib
<Tool
Name="VCLinkerTool"
AdditionalOptions="/NODEFAULTLIB:LIBMTD"
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 Ws2_32.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"
ImportLibrary="$(TargetDir)\exiv2.lib"
@ -223,7 +221,7 @@ copy/y ..\..\..\zlib-1.2.3\projects\visualc6\Win32_DLL_Debug\zlib1d.dll $(OutDir
<Tool
Name="VCLinkerTool"
AdditionalOptions="/NODEFAULTLIB:LIBCMT"
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 Ws2_32.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"
ImportLibrary="$(TargetDir)\exiv2.lib"

8
src/CMakeLists.txt
View File

@ -187,13 +187,7 @@ SET_TARGET_PROPERTIES( exiv2 PROPERTIES VERSION ${GENERIC_LIB_VERSION}
DEFINE_SYMBOL EXV_BUILDING_LIB
)
IF(WIN32)
SET(OS_SPECIFIC_LIBS wsock32)
ELSE(WIN32)
SET(OS_SPECIFIC_LIBS )
ENDIF(WIN32)
TARGET_LINK_LIBRARIES( exiv2 ${EXPAT_LIBRARIES} ${OS_SPECIFIC_LIBS})
TARGET_LINK_LIBRARIES( exiv2 ${EXPAT_LIBRARIES} )
if( EXIV2_EXIV2_ENABLE_LIBXMP )
TARGET_LINK_LIBRARIES( exiv2 ${XMPLIB} )

10
src/makernote.cpp
View File

@ -30,18 +30,10 @@ EXIV2_RCSID("@(#) $Id$")
// *****************************************************************************
// included header files
// htonl method (sony_decrypt)
#ifdef _MSC_VER // MSVC case
#ifdef _MSC_VER
# include "exv_msvc.h"
# include <winsock.h>
#else
# include "exv_conf.h"
# ifdef WIN32 // MINGW32 case
# include <winsock2.h>
# else // LINUX case
# include <arpa/inet.h>
# endif
#endif
#include "makernote_int.hpp"