[SCM] exiv2 packaging branch, master, updated. debian/0.25-3.1-3734-gdcbc29a

Maximiliano Curia maxy at moszumanska.debian.org
Thu Jul 13 17:43:05 UTC 2017


Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/exiv2.git;a=commitdiff;h=0f5dd89

The following commit has been merged in the master branch:
commit 0f5dd89dabbf06c2ab0a3970cad77aad7dbdbd6e
Author: Robin Mills <robin at clanmills.com>
Date:   Tue May 1 03:33:24 2012 +0000

    Adding msvc64ddmoddel project
    Updated exiv2.sln to build targets in addmoddel
---
 .../exiv2.vcproj => addmoddel/addmoddel.vcproj}    | 44 +++++++++-------------
 msvc64/exiv2.sln                                   | 18 +++++++++
 2 files changed, 36 insertions(+), 26 deletions(-)

diff --git a/msvc64/exiv2/exiv2.vcproj b/msvc64/addmoddel/addmoddel.vcproj
similarity index 93%
copy from msvc64/exiv2/exiv2.vcproj
copy to msvc64/addmoddel/addmoddel.vcproj
index 5ff8542..11a0120 100644
--- a/msvc64/exiv2/exiv2.vcproj
+++ b/msvc64/addmoddel/addmoddel.vcproj
@@ -2,9 +2,9 @@
 <VisualStudioProject
 	ProjectType="Visual C++"
 	Version="8.00"
-	Name="exiv2"
-	ProjectGUID="{07293CAC-00DA-493E-90C9-5D010C2B1B53}"
-	RootNamespace="exiv2"
+	Name="addmoddel"
+	ProjectGUID="{83914D93-57B3-4718-8A50-662C17C4AE8F}"
+	RootNamespace="addmoddel"
 	Keyword="Win32Proj"
 	>
 	<Platforms>
@@ -70,11 +70,11 @@
 				LinkLibraryDependencies="false"
 				AdditionalOptions="/NODEFAULTLIB:MSVCRTD"
 				AdditionalDependencies="..\exiv2lib\$(PlatformName)\$(ConfigurationName)\exiv2sd.lib ..\expat\$(PlatformName)\$(ConfigurationName)\libexpat.lib ..\xmpsdk\$(PlatformName)\$(ConfigurationName)\xmpsdk.lib ..\zlib\$(PlatformName)\$(ConfigurationName)\zlib1d.lib"
-				OutputFile="$(OutDir)/exiv2.exe"
+				OutputFile="$(OutDir)/$(ProjectName).exe"
 				LinkIncremental="1"
 				IgnoreDefaultLibraryNames=""
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(OutDir)/exiv2.pdb"
+				ProgramDatabaseFile="$(OutDir)/$(ProjectName).pdb"
 				SubSystem="1"
 				TargetMachine="1"
 			/>
@@ -158,11 +158,11 @@
 				LinkLibraryDependencies="false"
 				AdditionalOptions="/NODEFAULTLIB:MSVCRTD"
 				AdditionalDependencies="..\exiv2lib\$(PlatformName)\$(ConfigurationName)\exiv2sd.lib ..\expat\$(PlatformName)\$(ConfigurationName)\libexpat.lib ..\xmpsdk\$(PlatformName)\$(ConfigurationName)\xmpsdk.lib ..\zlib\$(PlatformName)\$(ConfigurationName)\zlib1d.lib"
-				OutputFile="$(OutDir)/exiv2.exe"
+				OutputFile="$(OutDir)/$(ProjectName).exe"
 				LinkIncremental="1"
 				IgnoreDefaultLibraryNames=""
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(OutDir)/exiv2.pdb"
+				ProgramDatabaseFile="$(OutDir)/$(ProjectName).pdb"
 				SubSystem="1"
 				TargetMachine="17"
 			/>
@@ -241,7 +241,7 @@
 				LinkLibraryDependencies="false"
 				AdditionalOptions="/NODEFAULTLIB:MSVCRT"
 				AdditionalDependencies="..\exiv2lib\$(PlatformName)\$(ConfigurationName)\exiv2s.lib ..\expat\$(PlatformName)\$(ConfigurationName)\libexpat.lib ..\xmpsdk\$(PlatformName)\$(ConfigurationName)\xmpsdk.lib ..\zlib\$(PlatformName)\$(ConfigurationName)\zlib1.lib"
-				OutputFile="$(OutDir)/exiv2.exe"
+				OutputFile="$(OutDir)/$(ProjectName).exe"
 				LinkIncremental="1"
 				IgnoreDefaultLibraryNames=""
 				GenerateDebugInformation="false"
@@ -326,7 +326,7 @@
 				LinkLibraryDependencies="false"
 				AdditionalOptions="/NODEFAULTLIB:MSVCRT"
 				AdditionalDependencies="..\exiv2lib\$(PlatformName)\$(ConfigurationName)\exiv2s.lib ..\expat\$(PlatformName)\$(ConfigurationName)\libexpat.lib ..\xmpsdk\$(PlatformName)\$(ConfigurationName)\xmpsdk.lib ..\zlib\$(PlatformName)\$(ConfigurationName)\zlib1.lib"
-				OutputFile="$(OutDir)/exiv2.exe"
+				OutputFile="$(OutDir)/$(ProjectName).exe"
 				LinkIncremental="1"
 				IgnoreDefaultLibraryNames=""
 				GenerateDebugInformation="false"
@@ -417,10 +417,10 @@
 				LinkLibraryDependencies="false"
 				AdditionalOptions="/NODEFAULTLIB:LIBCMTD"
 				AdditionalDependencies="..\exiv2lib\$(PlatformName)\$(ConfigurationName)\exiv2d.lib ..\expat\$(PlatformName)\$(ConfigurationName)\libexpat.lib ..\xmpsdk\$(PlatformName)\$(ConfigurationName)\xmpsdk.lib ..\zlib\$(PlatformName)\$(ConfigurationName)\zlib1d.lib"
-				OutputFile="$(OutDir)/exiv2.exe"
+				OutputFile="$(OutDir)/$(ProjectName).exe"
 				LinkIncremental="1"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(OutDir)/exiv2.pdb"
+				ProgramDatabaseFile="$(OutDir)/$(ProjectName).pdb"
 				SubSystem="1"
 				TargetMachine="1"
 			/>
@@ -508,10 +508,10 @@
 				LinkLibraryDependencies="false"
 				AdditionalOptions="/NODEFAULTLIB:LIBCMTD"
 				AdditionalDependencies="..\exiv2lib\$(PlatformName)\$(ConfigurationName)\exiv2d.lib ..\expat\$(PlatformName)\$(ConfigurationName)\libexpat.lib ..\xmpsdk\$(PlatformName)\$(ConfigurationName)\xmpsdk.lib ..\zlib\$(PlatformName)\$(ConfigurationName)\zlib1d.lib"
-				OutputFile="$(OutDir)/exiv2.exe"
+				OutputFile="$(OutDir)/$(ProjectName).exe"
 				LinkIncremental="1"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(OutDir)/exiv2.pdb"
+				ProgramDatabaseFile="$(OutDir)/$(ProjectName).pdb"
 				SubSystem="1"
 				TargetMachine="17"
 			/>
@@ -597,10 +597,10 @@
 				LinkLibraryDependencies="false"
 				AdditionalOptions="/NODEFAULTLIB:LIBCMTD"
 				AdditionalDependencies="..\exiv2lib\$(PlatformName)\$(ConfigurationName)\exiv2.lib ..\expat\$(PlatformName)\$(ConfigurationName)\libexpat.lib ..\xmpsdk\$(PlatformName)\$(ConfigurationName)\xmpsdk.lib ..\zlib\$(PlatformName)\$(ConfigurationName)\zlib1.lib"
-				OutputFile="$(OutDir)/exiv2.exe"
+				OutputFile="$(OutDir)/$(ProjectName).exe"
 				LinkIncremental="1"
 				GenerateDebugInformation="false"
-				ProgramDatabaseFile="$(OutDir)/exiv2.pdb"
+				ProgramDatabaseFile="$(OutDir)/$(ProjectName).pdb"
 				SubSystem="1"
 				TargetMachine="1"
 			/>
@@ -687,10 +687,10 @@
 				LinkLibraryDependencies="false"
 				AdditionalOptions="/NODEFAULTLIB:LIBCMTD"
 				AdditionalDependencies="..\exiv2lib\$(PlatformName)\$(ConfigurationName)\exiv2.lib ..\expat\$(PlatformName)\$(ConfigurationName)\libexpat.lib ..\xmpsdk\$(PlatformName)\$(ConfigurationName)\xmpsdk.lib ..\zlib\$(PlatformName)\$(ConfigurationName)\zlib1.lib"
-				OutputFile="$(OutDir)/exiv2.exe"
+				OutputFile="$(OutDir)/$(ProjectName).exe"
 				LinkIncremental="1"
 				GenerateDebugInformation="false"
-				ProgramDatabaseFile="$(OutDir)/exiv2.pdb"
+				ProgramDatabaseFile="$(OutDir)/$(ProjectName).pdb"
 				SubSystem="1"
 				TargetMachine="17"
 			/>
@@ -731,11 +731,7 @@
 			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
 			>
 			<File
-				RelativePath="..\..\srcctions.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\exiv2.cpp"
+				RelativePath="..\..\samplesddmoddel.cpp"
 				>
 			</File>
 			<File
@@ -761,10 +757,6 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\exiv2.hpp"
-				>
-			</File>
-			<File
 				RelativePath="..\..\src\getopt_win32.h"
 				>
 			</File>
diff --git a/msvc64/exiv2.sln b/msvc64/exiv2.sln
index 7d4de9f..8a36ef5 100644
--- a/msvc64/exiv2.sln
+++ b/msvc64/exiv2.sln
@@ -22,6 +22,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "expat", "expat\expat.vcproj
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zlib1", "zlib\zlib.vcproj", "{8308C68D-E12B-4C71-96F4-7137F6BEB654}"
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "addmoddel", "addmoddelddmoddel.vcproj", "{83914D93-57B3-4718-8A50-662C17C4AE8F}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Win32 = Debug|Win32
@@ -114,6 +116,22 @@ Global
 		{8308C68D-E12B-4C71-96F4-7137F6BEB654}.ReleaseDLL|Win32.Build.0 = ReleaseDLL|Win32
 		{8308C68D-E12B-4C71-96F4-7137F6BEB654}.ReleaseDLL|x64.ActiveCfg = ReleaseDLL|x64
 		{8308C68D-E12B-4C71-96F4-7137F6BEB654}.ReleaseDLL|x64.Build.0 = ReleaseDLL|x64
+		{83914D93-57B3-4718-8A50-662C17C4AE8F}.Debug|Win32.ActiveCfg = Debug|Win32
+		{83914D93-57B3-4718-8A50-662C17C4AE8F}.Debug|Win32.Build.0 = Debug|Win32
+		{83914D93-57B3-4718-8A50-662C17C4AE8F}.Debug|x64.ActiveCfg = Debug|x64
+		{83914D93-57B3-4718-8A50-662C17C4AE8F}.Debug|x64.Build.0 = Debug|x64
+		{83914D93-57B3-4718-8A50-662C17C4AE8F}.DebugDLL|Win32.ActiveCfg = DebugDLL|Win32
+		{83914D93-57B3-4718-8A50-662C17C4AE8F}.DebugDLL|Win32.Build.0 = DebugDLL|Win32
+		{83914D93-57B3-4718-8A50-662C17C4AE8F}.DebugDLL|x64.ActiveCfg = DebugDLL|x64
+		{83914D93-57B3-4718-8A50-662C17C4AE8F}.DebugDLL|x64.Build.0 = DebugDLL|x64
+		{83914D93-57B3-4718-8A50-662C17C4AE8F}.Release|Win32.ActiveCfg = Release|Win32
+		{83914D93-57B3-4718-8A50-662C17C4AE8F}.Release|Win32.Build.0 = Release|Win32
+		{83914D93-57B3-4718-8A50-662C17C4AE8F}.Release|x64.ActiveCfg = Release|x64
+		{83914D93-57B3-4718-8A50-662C17C4AE8F}.Release|x64.Build.0 = Release|x64
+		{83914D93-57B3-4718-8A50-662C17C4AE8F}.ReleaseDLL|Win32.ActiveCfg = ReleaseDLL|Win32
+		{83914D93-57B3-4718-8A50-662C17C4AE8F}.ReleaseDLL|Win32.Build.0 = ReleaseDLL|Win32
+		{83914D93-57B3-4718-8A50-662C17C4AE8F}.ReleaseDLL|x64.ActiveCfg = ReleaseDLL|x64
+		{83914D93-57B3-4718-8A50-662C17C4AE8F}.ReleaseDLL|x64.Build.0 = ReleaseDLL|x64
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

-- 
exiv2 packaging



More information about the pkg-kde-commits mailing list