[SCM] exiv2 packaging branch, master, updated. debian/0.25-3.1-3734-gdcbc29a
Maximiliano Curia
maxy at moszumanska.debian.org
Thu Jul 13 17:42:07 UTC 2017
Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/exiv2.git;a=commitdiff;h=3935e4f
The following commit has been merged in the master branch:
commit 3935e4f4216c400946053729e45fc87dd685e016
Author: Robin Mills <robin at clanmills.com>
Date: Tue Dec 7 18:13:50 2010 +0000
msvc64: exiv2.exe (and associated libraries) now build and execute correctly in Debug/Release/DebugDLL/ReleaseDLL x64/Win32
---
msvc64/ReadMe.txt | 64 +-
msvc64/addmoddel/addmoddel.vcproj | 8 -
msvc64/addmoddel/addmoddel.vcproj.7.10.old | 399 ------------
msvc64/convert-test/convert-test.vcproj | 8 -
msvc64/convert-test/convert-test.vcproj.7.10.old | 399 ------------
msvc64/exifcomment/exifcomment.vcproj | 8 -
msvc64/exifcomment/exifcomment.vcproj.7.10.old | 397 ------------
msvc64/exifdata-test/exifdata-test.vcproj | 8 -
msvc64/exifdata-test/exifdata-test.vcproj.7.10.old | 380 -----------
msvc64/exifprint/exifprint.vcproj | 8 -
msvc64/exifprint/exifprint.vcproj.7.10.old | 396 ------------
msvc64/exiv2.sln | 82 ++-
msvc64/exiv2/exiv2.vcproj | 78 +--
msvc64/exiv2/exiv2.vcproj.7.10.old | 441 -------------
msvc64/exiv2lib/exiv2lib.vcproj | 62 +-
msvc64/exiv2lib/exiv2lib.vcproj.7.10.old | 711 ---------------------
msvc64/exivsimple/exivsimple.vcproj | 8 -
msvc64/exivsimple/exivsimple.vcproj.7.10.old | 445 -------------
msvc64/expat201/expat.sln | 18 +-
msvc64/expat201/expat.vcproj | 534 ++++++++++++++--
msvc64/expat201/expat_static.vcproj | 559 ----------------
msvc64/iotest/iotest.vcproj | 8 -
msvc64/iotest/iotest.vcproj.7.10.old | 391 -----------
msvc64/iptceasy/iptceasy.vcproj | 8 -
msvc64/iptceasy/iptceasy.vcproj.7.10.old | 391 -----------
msvc64/iptcprint/iptcprint.vcproj | 8 -
msvc64/iptcprint/iptcprint.vcproj.7.10.old | 391 -----------
msvc64/iptctest/iptctest.vcproj | 8 -
msvc64/iptctest/iptctest.vcproj.7.10.old | 396 ------------
msvc64/largeiptc-test/largeiptc-test.vcproj | 8 -
.../largeiptc-test/largeiptc-test.vcproj.7.10.old | 391 -----------
msvc64/metacopy/metacopy.vcproj | 8 -
msvc64/metacopy/metacopy.vcproj.7.10.old | 415 ------------
msvc64/mmap-test/mmap-test.vcproj | 8 -
msvc64/mmap-test/mmap-test.vcproj.7.10.old | 399 ------------
msvc64/organize/organize.vcproj | 408 ------------
msvc64/prevtest/prevtest.vcproj | 8 -
msvc64/prevtest/prevtest.vcproj.7.10.old | 407 ------------
msvc64/stringto-test/stringto-test.vcproj | 8 -
msvc64/stringto-test/stringto-test.vcproj.7.10.old | 392 ------------
msvc64/taglist/taglist.vcproj | 8 -
msvc64/taglist/taglist.vcproj.7.10.old | 395 ------------
msvc64/tiff-test/tiff-test.vcproj | 8 -
msvc64/tiff-test/tiff-test.vcproj.7.10.old | 399 ------------
msvc64/utiltest/utiltest.vcproj | 8 -
msvc64/utiltest/utiltest.vcproj.7.10.old | 411 ------------
msvc64/write-test/write-test.vcproj | 8 -
msvc64/write-test/write-test.vcproj.7.10.old | 395 ------------
msvc64/write2-test/write2-test.vcproj | 8 -
msvc64/write2-test/write2-test.vcproj.7.10.old | 395 ------------
msvc64/xmpparse/xmpparse.vcproj | 8 -
msvc64/xmpparse/xmpparse.vcproj.7.10.old | 395 ------------
.../xmpparser-test/xmpparser-test.vcproj.7.10.old | 395 ------------
msvc64/xmpsample/xmpsample.vcproj | 8 -
msvc64/xmpsample/xmpsample.vcproj.7.10.old | 395 ------------
msvc64/xmpsdk/xmpsdk.vcproj | 32 +-
msvc64/xmpsdk/xmpsdk.vcproj.7.10.old | 481 --------------
msvc64/zlib123/zlib.vcproj | 16 +-
58 files changed, 700 insertions(+), 12131 deletions(-)
diff --git a/msvc64/ReadMe.txt b/msvc64/ReadMe.txt
index e7a92a8..71d8639 100644
--- a/msvc64/ReadMe.txt
+++ b/msvc64/ReadMe.txt
@@ -1,11 +1,11 @@
exiv2\msvc64\ReadMe.txt
-----------------------
-Updated: 2010-12-06
+Updated: 2010-12-07
-expat and zlib do not provide 64bit builds for DevStudio, so it has been necessary to create the build environments for exiv2.
-This is "work in progress". So far, I've only ported build environments for expat and zlib.
+This is "work in progress". At this time, you can build the libraries and the exiv2.exe application.
+You cannot build the test applications such as exifprint.exe
Robin Mills
http://clanmills.com
@@ -15,9 +15,14 @@ email: robin at clanmills.com
T A B L E of C O N T E N T S
1 Design
+1.1 Architecture
+1.2 Changing the version of expat/zlib/xmpsdk
+1.3 Relationship with msvc build environment
+
2 Acknowledgment of prior work
2.1 Differences between inherited project and the exiv2 projects
+3 Build Instructions
## end of table of contents ##
####
@@ -25,22 +30,49 @@ T A B L E of C O N T E N T S
1 Design
-However, we don't include the source code for zlib or expat - only the build environment. You are expected to install the "vanilla" expat and zlib libraries in a directory at the same level as exiv2. I personally always build in the directory c:\gnu - however the name/location/spaces of the build directory are all irrelevant, it's only the relative position of expat-2.0.1 and zlib-1.2.3 which matter. The names expat-2.0.1 and zlib-1.2.3 are fixed.
+expat and zlib do not provide 64bit builds for DevStudio, so it has been necessary to create the build environments for exiv2. However, we don't include the source code for zlib or expat - only the build environment. You are expected to install the "vanilla" expat and zlib libraries in a directory at the same level as exiv2. I personally always build in the directory c:\gnu - however the name/location/spaces of the build directory are all irrelevant, it's only the relative position of expat-2.0.1 and zlib-1.2.3 which matter. The names expat-2.0.1 and zlib-1.2.3 are fixed.
c:\gnu>dir
Directory of c:\gnu
-2010-12-05 10:05 <DIR> exiv2
-2010-12-02 21:06 <DIR> expat-2.0.1
-2010-12-02 20:58 <DIR> zlib-1.2.3
+2010-12-05 10:05 <DIR> exiv2
+2010-12-02 21:06 <DIR> expat-2.0.1
+2010-12-02 20:58 <DIR> zlib-1.2.3
c:\gnu>
zlib and expat
-msvc64\zlib123\zlib.{sln|vcproj} DevStudio Solution and Project files
-..\..\..\zlib-1.2.3\ Source code
-
-msvc64\expat201\expat.sln expat.vcproj expat_static.vcproj DevStudio Solution and Project files
-..\..\..\expat-2.0.1\ Source code
-
+msvc64\zlib123\zlib.{sln|vcproj} DevStudio Solution and Project files
+..\..\..\zlib-1.2.3\ Source code
+
+msvc64\expat201\expat.sln expat.vcproj DevStudio Solution and Project files
+..\..\..\expat-2.0.1\ Source code
+
+1.1 Architecture
+ There are directories for every component:
+ The libraries: zlib123, expat201, xmpsdk, exiv2lib
+ Applications: exiv2, exifprint etc......
+
+ For each component, there are three build directories:
+ exiv2libuild intermediate results
+ exiv2lib\Win32\{Debug|Release|DebugDLL|ReleaseDLL} 32 bit builds
+ exiv2lib\x64\{Debug|Release|DebugDLL|ReleaseDLL} 64 bit builds
+
+1.2 Changing the version of expat/zlib/xmpsdk
+ The directory expat is a copy of expat201, zlib is a copy of zlib123
+
+ As new versions of the libraries become available (eg zlib125) it will be added.
+ To build exiv2 with zlib125, the directory zlib125 should be copied to zlib.
+
+1.3 Relationship with msvc build environment
+ This environment is similar to msvc (same build engineer). However there are significant differences:
+ 1) Support 64bit and 32bit builds
+ 2) Provides projects to build expat and zlib
+ 3) Is designed to accomodate new versios of expat and zlib when they become available.
+ 4) Does not require you to build 'vanilla' expat and zlib projects in advance
+ 5) Does not support the organize application
+ 6) Supports DevStudio 2008 and 2010 (no support for 2003 and 2005)
+
+ msvc will continue to be supported for 32 bit builds using DevStudio 2003 and 2005,
+ however there is no plan to enhance or develop that environment going forward.
2 Acknowledgement of prior work
This work is based on work by the following people:
@@ -61,5 +93,11 @@ msvc64\expat201\expat.sln expat.vcproj expat_static.vcproj DevStudio Solution an
2.1 Differences between inherited project and the exiv2 projects
There is no compatiblity.
+3 Build Instructions
+ 1) Install zlib and expat sources
+ 2) Open exiv2.sln, batch build, select all, build
+
+ If you don't have the x64 compiler available, don't select the 64 bit configurations!
+
# That's all Folks!
##
diff --git a/msvc64/addmoddel/addmoddel.vcproj b/msvc64/addmoddel/addmoddel.vcproj
index 193528e..66eb976 100644
--- a/msvc64/addmoddel/addmoddel.vcproj
+++ b/msvc64/addmoddel/addmoddel.vcproj
@@ -24,7 +24,6 @@
OutputDirectory="Debug"
IntermediateDirectory="Debug"
ConfigurationType="1"
- InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
CharacterSet="2"
>
<Tool
@@ -112,7 +111,6 @@
OutputDirectory="Release"
IntermediateDirectory="Release"
ConfigurationType="1"
- InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
CharacterSet="2"
>
<Tool
@@ -195,7 +193,6 @@
OutputDirectory="$(ConfigurationName)"
IntermediateDirectory="$(ConfigurationName)"
ConfigurationType="1"
- InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
CharacterSet="2"
>
<Tool
@@ -285,7 +282,6 @@
OutputDirectory="$(ConfigurationName)"
IntermediateDirectory="$(ConfigurationName)"
ConfigurationType="1"
- InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
CharacterSet="2"
>
<Tool
@@ -375,7 +371,6 @@
OutputDirectory="$(PlatformName)\$(ConfigurationName)"
IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
ConfigurationType="1"
- InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
CharacterSet="2"
>
<Tool
@@ -464,7 +459,6 @@
OutputDirectory="$(PlatformName)\$(ConfigurationName)"
IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
ConfigurationType="1"
- InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
CharacterSet="2"
>
<Tool
@@ -548,7 +542,6 @@
OutputDirectory="$(PlatformName)\$(ConfigurationName)"
IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
ConfigurationType="1"
- InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
CharacterSet="2"
>
<Tool
@@ -639,7 +632,6 @@
OutputDirectory="$(PlatformName)\$(ConfigurationName)"
IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
ConfigurationType="1"
- InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
CharacterSet="2"
>
<Tool
diff --git a/msvc64/addmoddel/addmoddel.vcproj.7.10.old b/msvc64/addmoddel/addmoddel.vcproj.7.10.old
deleted file mode 100644
index 07df106..0000000
--- a/msvc64/addmoddel/addmoddel.vcproj.7.10.old
+++ /dev/null
@@ -1,399 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
- ProjectType="Visual C++"
- Version="7.10"
- Name="addmoddel"
- ProjectGUID="{271E59C4-81F9-4231-85D3-E7DDB2E2BC08}"
- RootNamespace="addmoddel"
- Keyword="Win32Proj"
- TargetFrameworkVersion="131072"
- >
- <Platforms>
- <Platform
- Name="Win32"
- />
- </Platforms>
- <ToolFiles>
- </ToolFiles>
- <Configurations>
- <Configuration
- Name="Debug|Win32"
- OutputDirectory="Debug"
- IntermediateDirectory="Debug"
- ConfigurationType="1"
- InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
- CharacterSet="2"
- >
- <Tool
- Name="VCPreBuildEventTool"
- CommandLine=""
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories="../include;../include/exiv2;../../xmpsdk/include;../../xmpsdk/src;../../../expat-2.0.1/lib;../../../zlib-1.2.3;"
- PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
- MinimalRebuild="true"
- BasicRuntimeChecks="3"
- RuntimeLibrary="1"
- BufferSecurityCheck="true"
- RuntimeTypeInfo="true"
- UsePrecompiledHeader="0"
- BrowseInformation="1"
- WarningLevel="3"
- WarnAsError="true"
- DebugInformationFormat="3"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- LinkLibraryDependencies="false"
- AdditionalOptions="/NODEFAULTLIB:MSVCRTD"
- AdditionalDependencies="..\exiv2lib\$(ConfigurationName)\exiv2sd.lib ..\..\..\expat-2.0.1\win32in\debug\libexpatMT.lib ..\xmpsdk\$(ConfigurationName)\xmpsdk.lib ..\..\..\zlib-1.2.3\projects
isualc6\Win32_LIB_Debug\zlibd.lib"
- OutputFile="$(OutDir)/addmoddel.exe"
- LinkIncremental="1"
- AdditionalLibraryDirectories=""
- GenerateDebugInformation="true"
- ProgramDatabaseFile="$(OutDir)/addmoddel.pdb"
- SubSystem="1"
- RandomizedBaseAddress="1"
- DataExecutionPrevention="0"
- TargetMachine="1"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- Description="copy target to bin"
- CommandLine="copy/y "$(TargetPath)" "$(SolutionDir)in\$(ConfigurationName)""
- />
- </Configuration>
- <Configuration
- Name="Release|Win32"
- OutputDirectory="Release"
- IntermediateDirectory="Release"
- ConfigurationType="1"
- InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
- CharacterSet="2"
- >
- <Tool
- Name="VCPreBuildEventTool"
- CommandLine=""
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories="../include;../include/exiv2;../../xmpsdk/include;../../xmpsdk/src;../../../expat-2.0.1/lib;../../../zlib-1.2.3;"
- PreprocessorDefinitions="WIN32;_NDEBUG;_CONSOLE"
- RuntimeLibrary="0"
- RuntimeTypeInfo="true"
- UsePrecompiledHeader="0"
- BrowseInformation="1"
- WarningLevel="3"
- WarnAsError="true"
- DebugInformationFormat="3"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- LinkLibraryDependencies="false"
- AdditionalOptions="/NODEFAULTLIB:MSVCRT"
- AdditionalDependencies="..\exiv2lib\$(ConfigurationName)\exiv2s.lib ..\..\..\expat-2.0.1\win32in
elease\libexpatMT.lib ..\xmpsdk\$(ConfigurationName)\xmpsdk.lib ..\..\..\zlib-1.2.3\projects
isualc6\Win32_LIB_Release\zlib.lib"
- LinkIncremental="1"
- GenerateDebugInformation="false"
- SubSystem="1"
- OptimizeReferences="2"
- EnableCOMDATFolding="2"
- RandomizedBaseAddress="1"
- DataExecutionPrevention="0"
- TargetMachine="1"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- Description="copy target to bin"
- CommandLine="copy/y "$(TargetPath)" "$(SolutionDir)in\$(ConfigurationName)""
- />
- </Configuration>
- <Configuration
- Name="DebugDLL|Win32"
- OutputDirectory="$(ConfigurationName)"
- IntermediateDirectory="$(ConfigurationName)"
- ConfigurationType="1"
- InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
- CharacterSet="2"
- >
- <Tool
- Name="VCPreBuildEventTool"
- Description="copy expat dll"
- CommandLine="copy/y ..\..\..\expat-2.0.1\win32in\debug\*.dll "$(TargetDir)""
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories="../include;../include/exiv2;../../xmpsdk/include;../../xmpsdk/src;../../../expat-2.0.1/lib;../../../zlib-1.2.3;"
- PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;EXV_HAVE_DLL"
- MinimalRebuild="true"
- BasicRuntimeChecks="3"
- RuntimeLibrary="3"
- BufferSecurityCheck="true"
- RuntimeTypeInfo="true"
- UsePrecompiledHeader="0"
- BrowseInformation="1"
- WarningLevel="3"
- WarnAsError="true"
- DebugInformationFormat="3"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- Description="copy the dlls"
- CommandLine="copy/y ..\exiv2lib\$(ConfigurationName)\*.dll "$(TargetDir)""
- />
- <Tool
- Name="VCLinkerTool"
- LinkLibraryDependencies="false"
- AdditionalOptions="/NODEFAULTLIB:LIBCMTD"
- AdditionalDependencies="..\exiv2lib\$(ConfigurationName)\exiv2d.lib ..\..\..\expat-2.0.1\win32in\debug\libexpat.lib ..\xmpsdk\$(ConfigurationName)\xmpsdk.lib ..\..\..\zlib-1.2.3\projects
isualc6\Win32_DLL_Debug\zlib1d.lib"
- OutputFile="$(OutDir)/addmoddel.exe"
- LinkIncremental="1"
- GenerateDebugInformation="true"
- ProgramDatabaseFile="$(OutDir)/addmoddel.pdb"
- SubSystem="1"
- RandomizedBaseAddress="1"
- DataExecutionPrevention="0"
- TargetMachine="1"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- Description="copy target to bin"
- CommandLine="copy/y "$(TargetPath)" "$(SolutionDir)in\$(ConfigurationName)""
- />
- </Configuration>
- <Configuration
- Name="ReleaseDLL|Win32"
- OutputDirectory="$(ConfigurationName)"
- IntermediateDirectory="$(ConfigurationName)"
- ConfigurationType="1"
- InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
- CharacterSet="2"
- >
- <Tool
- Name="VCPreBuildEventTool"
- Description="copy expat dll"
- CommandLine="copy/y ..\..\..\expat-2.0.1\win32in
elease\*.dll "$(TargetDir)""
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories="../include;../include/exiv2;../../xmpsdk/include;../../xmpsdk/src;../../../expat-2.0.1/lib;../../../zlib-1.2.3;"
- PreprocessorDefinitions="WIN32;_NDEBUG;_CONSOLE;EXV_HAVE_DLL"
- MinimalRebuild="true"
- BasicRuntimeChecks="3"
- RuntimeLibrary="2"
- BufferSecurityCheck="true"
- RuntimeTypeInfo="true"
- UsePrecompiledHeader="0"
- BrowseInformation="1"
- WarningLevel="3"
- WarnAsError="true"
- DebugInformationFormat="3"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- Description="copy the dlls"
- CommandLine="copy/y ..\exiv2lib\$(ConfigurationName)\*.dll "$(TargetDir)""
- />
- <Tool
- Name="VCLinkerTool"
- LinkLibraryDependencies="false"
- AdditionalOptions="/NODEFAULTLIB:LIBCMT"
- AdditionalDependencies="..\exiv2lib\$(ConfigurationName)\exiv2.lib ..\..\..\expat-2.0.1\win32in
elease\libexpat.lib ..\xmpsdk\$(ConfigurationName)\xmpsdk.lib ..\..\..\zlib-1.2.3\projects
isualc6\Win32_DLL_Release\zlib1.lib"
- OutputFile="$(OutDir)/addmoddel.exe"
- LinkIncremental="1"
- GenerateDebugInformation="false"
- ProgramDatabaseFile="$(OutDir)/addmoddel.pdb"
- SubSystem="1"
- RandomizedBaseAddress="1"
- DataExecutionPrevention="0"
- TargetMachine="1"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- Description="copy target to bin"
- CommandLine="copy/y "$(TargetPath)" "$(SolutionDir)in\$(ConfigurationName)""
- />
- </Configuration>
- </Configurations>
- <References>
- </References>
- <Files>
- <Filter
- Name="Source Files"
- Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
- UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
- >
- <File
- RelativePath="..\..\samplesddmoddel.cpp"
- >
- </File>
- </Filter>
- <Filter
- Name="Header Files"
- Filter="h;hpp;hxx;hm;inl;inc;xsd"
- UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
- >
- </Filter>
- <Filter
- Name="Resource Files"
- Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"
- UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
- >
- </Filter>
- </Files>
- <Globals>
- </Globals>
-</VisualStudioProject>
diff --git a/msvc64/convert-test/convert-test.vcproj b/msvc64/convert-test/convert-test.vcproj
index 525d514..4e6a595 100644
--- a/msvc64/convert-test/convert-test.vcproj
+++ b/msvc64/convert-test/convert-test.vcproj
@@ -24,7 +24,6 @@
OutputDirectory="Debug"
IntermediateDirectory="Debug"
ConfigurationType="1"
- InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
CharacterSet="2"
>
<Tool
@@ -112,7 +111,6 @@
OutputDirectory="Release"
IntermediateDirectory="Release"
ConfigurationType="1"
- InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
CharacterSet="2"
>
<Tool
@@ -195,7 +193,6 @@
OutputDirectory="$(ConfigurationName)"
IntermediateDirectory="$(ConfigurationName)"
ConfigurationType="1"
- InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
CharacterSet="2"
>
<Tool
@@ -285,7 +282,6 @@
OutputDirectory="$(ConfigurationName)"
IntermediateDirectory="$(ConfigurationName)"
ConfigurationType="1"
- InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
CharacterSet="2"
>
<Tool
@@ -375,7 +371,6 @@
OutputDirectory="$(PlatformName)\$(ConfigurationName)"
IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
ConfigurationType="1"
- InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
CharacterSet="2"
>
<Tool
@@ -464,7 +459,6 @@
OutputDirectory="$(PlatformName)\$(ConfigurationName)"
IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
ConfigurationType="1"
- InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
CharacterSet="2"
>
<Tool
@@ -548,7 +542,6 @@
OutputDirectory="$(PlatformName)\$(ConfigurationName)"
IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
ConfigurationType="1"
- InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
CharacterSet="2"
>
<Tool
@@ -639,7 +632,6 @@
OutputDirectory="$(PlatformName)\$(ConfigurationName)"
IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
ConfigurationType="1"
- InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
CharacterSet="2"
>
<Tool
diff --git a/msvc64/convert-test/convert-test.vcproj.7.10.old b/msvc64/convert-test/convert-test.vcproj.7.10.old
deleted file mode 100644
index 7bfa940..0000000
--- a/msvc64/convert-test/convert-test.vcproj.7.10.old
+++ /dev/null
@@ -1,399 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
- ProjectType="Visual C++"
- Version="7.10"
- Name="convert-test"
- ProjectGUID="{610E69BF-9FB7-4A63-AFB5-88C2BA4BE6C1}"
- RootNamespace="convert-test"
- Keyword="Win32Proj"
- TargetFrameworkVersion="131072"
- >
- <Platforms>
- <Platform
- Name="Win32"
- />
- </Platforms>
- <ToolFiles>
- </ToolFiles>
- <Configurations>
- <Configuration
- Name="Debug|Win32"
- OutputDirectory="Debug"
- IntermediateDirectory="Debug"
- ConfigurationType="1"
- InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
- CharacterSet="2"
- >
- <Tool
- Name="VCPreBuildEventTool"
- CommandLine=""
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories="../include;../include/exiv2;../../xmpsdk/include;../../xmpsdk/src;../../../expat-2.0.1/lib;../../../zlib-1.2.3;"
- PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
- MinimalRebuild="true"
- BasicRuntimeChecks="3"
- RuntimeLibrary="1"
- BufferSecurityCheck="true"
- RuntimeTypeInfo="true"
- UsePrecompiledHeader="0"
- BrowseInformation="1"
- WarningLevel="3"
- WarnAsError="true"
- DebugInformationFormat="3"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- LinkLibraryDependencies="false"
- AdditionalOptions="/NODEFAULTLIB:MSVCRTD"
- AdditionalDependencies="..\exiv2lib\$(ConfigurationName)\exiv2sd.lib ..\..\..\expat-2.0.1\win32in\debug\libexpatMT.lib ..\xmpsdk\$(ConfigurationName)\xmpsdk.lib ..\..\..\zlib-1.2.3\projects
isualc6\Win32_LIB_Debug\zlibd.lib"
- OutputFile="$(OutDir)/convert-test.exe"
- LinkIncremental="1"
- AdditionalLibraryDirectories=""
- GenerateDebugInformation="true"
- ProgramDatabaseFile="$(OutDir)/convert-test.pdb"
- SubSystem="1"
- RandomizedBaseAddress="1"
- DataExecutionPrevention="0"
- TargetMachine="1"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- Description="copy target to bin"
- CommandLine="copy/y "$(TargetPath)" "$(SolutionDir)in\$(ConfigurationName)""
- />
- </Configuration>
- <Configuration
- Name="Release|Win32"
- OutputDirectory="Release"
- IntermediateDirectory="Release"
- ConfigurationType="1"
- InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
- CharacterSet="2"
- >
- <Tool
- Name="VCPreBuildEventTool"
- CommandLine=""
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories="../include;../include/exiv2;../../xmpsdk/include;../../xmpsdk/src;../../../expat-2.0.1/lib;../../../zlib-1.2.3;"
- PreprocessorDefinitions="WIN32;_NDEBUG;_CONSOLE"
- RuntimeLibrary="0"
- RuntimeTypeInfo="true"
- UsePrecompiledHeader="0"
- BrowseInformation="1"
- WarningLevel="3"
- WarnAsError="true"
- DebugInformationFormat="3"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- LinkLibraryDependencies="false"
- AdditionalOptions="/NODEFAULTLIB:MSVCRT"
- AdditionalDependencies="..\exiv2lib\$(ConfigurationName)\exiv2s.lib ..\..\..\expat-2.0.1\win32in
elease\libexpatMT.lib ..\xmpsdk\$(ConfigurationName)\xmpsdk.lib ..\..\..\zlib-1.2.3\projects
isualc6\Win32_LIB_Release\zlib.lib"
- LinkIncremental="1"
- GenerateDebugInformation="false"
- SubSystem="1"
- OptimizeReferences="2"
- EnableCOMDATFolding="2"
- RandomizedBaseAddress="1"
- DataExecutionPrevention="0"
- TargetMachine="1"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- Description="copy target to bin"
- CommandLine="copy/y "$(TargetPath)" "$(SolutionDir)in\$(ConfigurationName)""
- />
- </Configuration>
- <Configuration
- Name="DebugDLL|Win32"
- OutputDirectory="$(ConfigurationName)"
- IntermediateDirectory="$(ConfigurationName)"
- ConfigurationType="1"
- InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
- CharacterSet="2"
- >
- <Tool
- Name="VCPreBuildEventTool"
- Description="copy expat dll"
- CommandLine="copy/y ..\..\..\expat-2.0.1\win32in\debug\*.dll "$(TargetDir)""
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories="../include;../include/exiv2;../../xmpsdk/include;../../xmpsdk/src;../../../expat-2.0.1/lib;../../../zlib-1.2.3;"
- PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;EXV_HAVE_DLL"
- MinimalRebuild="true"
- BasicRuntimeChecks="3"
- RuntimeLibrary="3"
- BufferSecurityCheck="true"
- RuntimeTypeInfo="true"
- UsePrecompiledHeader="0"
- BrowseInformation="1"
- WarningLevel="3"
- WarnAsError="true"
- DebugInformationFormat="3"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- Description="copy the dlls"
- CommandLine="copy/y ..\exiv2lib\$(ConfigurationName)\*.dll "$(TargetDir)""
- />
- <Tool
- Name="VCLinkerTool"
- LinkLibraryDependencies="false"
- AdditionalOptions="/NODEFAULTLIB:LIBCMTD"
- AdditionalDependencies="..\exiv2lib\$(ConfigurationName)\exiv2d.lib ..\..\..\expat-2.0.1\win32in\debug\libexpat.lib ..\xmpsdk\$(ConfigurationName)\xmpsdk.lib ..\..\..\zlib-1.2.3\projects
isualc6\Win32_DLL_Debug\zlib1d.lib"
- OutputFile="$(OutDir)/convert-test.exe"
- LinkIncremental="1"
- GenerateDebugInformation="true"
- ProgramDatabaseFile="$(OutDir)/convert-test.pdb"
- SubSystem="1"
- RandomizedBaseAddress="1"
- DataExecutionPrevention="0"
- TargetMachine="1"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- Description="copy target to bin"
- CommandLine="copy/y "$(TargetPath)" "$(SolutionDir)in\$(ConfigurationName)""
- />
- </Configuration>
- <Configuration
- Name="ReleaseDLL|Win32"
- OutputDirectory="$(ConfigurationName)"
- IntermediateDirectory="$(ConfigurationName)"
- ConfigurationType="1"
- InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
- CharacterSet="2"
- >
- <Tool
- Name="VCPreBuildEventTool"
- Description="copy expat dll"
- CommandLine="copy/y ..\..\..\expat-2.0.1\win32in
elease\*.dll "$(TargetDir)""
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories="../include;../include/exiv2;../../xmpsdk/include;../../xmpsdk/src;../../../expat-2.0.1/lib;../../../zlib-1.2.3;"
- PreprocessorDefinitions="WIN32;_NDEBUG;_CONSOLE;EXV_HAVE_DLL"
- MinimalRebuild="true"
- BasicRuntimeChecks="3"
- RuntimeLibrary="2"
- BufferSecurityCheck="true"
- RuntimeTypeInfo="true"
- UsePrecompiledHeader="0"
- BrowseInformation="1"
- WarningLevel="3"
- WarnAsError="true"
- DebugInformationFormat="3"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- Description="copy the dlls"
- CommandLine="copy/y ..\exiv2lib\$(ConfigurationName)\*.dll "$(TargetDir)""
- />
- <Tool
- Name="VCLinkerTool"
- LinkLibraryDependencies="false"
- AdditionalOptions="/NODEFAULTLIB:LIBCMT"
- AdditionalDependencies="..\exiv2lib\$(ConfigurationName)\exiv2.lib ..\..\..\expat-2.0.1\win32in
elease\libexpat.lib ..\xmpsdk\$(ConfigurationName)\xmpsdk.lib ..\..\..\zlib-1.2.3\projects
isualc6\Win32_DLL_Release\zlib1.lib"
- OutputFile="$(OutDir)/convert-test.exe"
- LinkIncremental="1"
- GenerateDebugInformation="false"
- ProgramDatabaseFile="$(OutDir)/convert-test.pdb"
- SubSystem="1"
- RandomizedBaseAddress="1"
- DataExecutionPrevention="0"
- TargetMachine="1"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- Description="copy target to bin"
- CommandLine="copy/y "$(TargetPath)" "$(SolutionDir)in\$(ConfigurationName)""
- />
- </Configuration>
- </Configurations>
- <References>
- </References>
- <Files>
- <Filter
- Name="Source Files"
- Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
- UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
- >
- <File
- RelativePath="..\..\samples
--
exiv2 packaging
More information about the pkg-kde-commits
mailing list