From 332b065fbb0c742ec48337f48813972321a6bd2c Mon Sep 17 00:00:00 2001 From: Robin Mills Date: Wed, 23 Sep 2015 20:46:43 +0000 Subject: [PATCH] #1110. Correction to r3962 --- contrib/xcode/ReadMe.txt | 9 +++--- contrib/xcode/exiv2.xcodeproj/project.pbxproj | 30 +++++++++---------- 2 files changed, 19 insertions(+), 20 deletions(-) diff --git a/contrib/xcode/ReadMe.txt b/contrib/xcode/ReadMe.txt index 4b07bbb2..7a1789b7 100644 --- a/contrib/xcode/ReadMe.txt +++ b/contrib/xcode/ReadMe.txt @@ -6,8 +6,8 @@ exiv2.xcodeproj is a "no thrills" wrapper for the autotools: Target Command config make config -configure ./configure -exiv2 make CXXFLAGS=-ggdb +configure ./configure -prefix=/usr/local CXXFLAGS=-ggdb +exiv2 make install sudo make install samples make samples tests make tests @@ -16,10 +16,9 @@ exiv2json make exiv2json About executables: When you add an executable to the "run" command, use: +bin/.libs/exiv2 This is the exiv2(.exe) you have built, however it uses the shared library -bin/.libs/exiv2 As this uses the build library (without having to run install) - -For all sample applications, including exiv2json, you will have to run install when you make library changes. +For all sample applications you will have to run install when you make library changes. Robin Mills robin@clanmills.com diff --git a/contrib/xcode/exiv2.xcodeproj/project.pbxproj b/contrib/xcode/exiv2.xcodeproj/project.pbxproj index 1b296dde..e39b6c16 100644 --- a/contrib/xcode/exiv2.xcodeproj/project.pbxproj +++ b/contrib/xcode/exiv2.xcodeproj/project.pbxproj @@ -18,12 +18,12 @@ /* Begin PBXFileReference section */ A1467F9B1B8F1B0400A2E7CD /* ReadMe.txt */ = {isa = PBXFileReference; lastKnownFileType = text; path = ReadMe.txt; sourceTree = ""; }; - A193A3D11B91DA7200455831 /* xmpsdk */ = {isa = PBXFileReference; lastKnownFileType = folder; name = xmpsdk; path = ../xmpsdk; sourceTree = ""; }; - A193A3D21B91DBC300455831 /* bin */ = {isa = PBXFileReference; lastKnownFileType = folder; name = bin; path = ../bin; sourceTree = ""; }; - A193A3D31B91DBC300455831 /* samples */ = {isa = PBXFileReference; lastKnownFileType = folder; name = samples; path = ../samples; sourceTree = ""; }; - A193A3D41B91DBC300455831 /* src */ = {isa = PBXFileReference; lastKnownFileType = folder; name = src; path = ../src; sourceTree = ""; }; - A193A3D51B91DBC300455831 /* test */ = {isa = PBXFileReference; lastKnownFileType = folder; name = test; path = ../test; sourceTree = ""; }; - A193A3D61B91DBC300455831 /* include */ = {isa = PBXFileReference; lastKnownFileType = folder; name = include; path = ../include; sourceTree = ""; }; + A193A3D11B91DA7200455831 /* xmpsdk */ = {isa = PBXFileReference; lastKnownFileType = folder; name = xmpsdk; path = ../../xmpsdk; sourceTree = ""; }; + A193A3D21B91DBC300455831 /* bin */ = {isa = PBXFileReference; lastKnownFileType = folder; name = bin; path = ../../bin; sourceTree = ""; }; + A193A3D31B91DBC300455831 /* samples */ = {isa = PBXFileReference; lastKnownFileType = folder; name = samples; path = ../../samples; sourceTree = ""; }; + A193A3D41B91DBC300455831 /* src */ = {isa = PBXFileReference; lastKnownFileType = folder; name = src; path = ../../src; sourceTree = ""; }; + A193A3D51B91DBC300455831 /* test */ = {isa = PBXFileReference; lastKnownFileType = folder; name = test; path = ../../test; sourceTree = ""; }; + A193A3D61B91DBC300455831 /* include */ = {isa = PBXFileReference; lastKnownFileType = folder; name = include; path = ../../include; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXGroup section */ @@ -50,7 +50,7 @@ buildPhases = ( ); buildToolPath = /usr/bin/env; - buildWorkingDirectory = "$(PROJECT_DIR)/.."; + buildWorkingDirectory = "$(PROJECT_DIR)/../.."; dependencies = ( ); name = exiv2; @@ -59,12 +59,12 @@ }; A13633F91B8EF5AD0046FC3F /* samples */ = { isa = PBXLegacyTarget; - buildArgumentsString = "$(TARGET_NAME)"; + buildArgumentsString = ""; buildConfigurationList = A13633FC1B8EF5AD0046FC3F /* Build configuration list for PBXLegacyTarget "samples" */; buildPhases = ( ); buildToolPath = /usr/bin/make; - buildWorkingDirectory = "$(PROJECT_DIR)/.."; + buildWorkingDirectory = "$(PROJECT_DIR)/../../samples"; dependencies = ( ); name = samples; @@ -78,7 +78,7 @@ buildPhases = ( ); buildToolPath = /usr/bin/env; - buildWorkingDirectory = "$(PROJECT_DIR)/.."; + buildWorkingDirectory = "$(PROJECT_DIR)/../.."; dependencies = ( ); name = config; @@ -87,12 +87,12 @@ }; A14E159C1B8F0755006F2E61 /* configure */ = { isa = PBXLegacyTarget; - buildArgumentsString = "./configure CXXFLAGS=-ggdb"; + buildArgumentsString = "./configure --prefix=/usr/local CXXFLAGS=-ggdb"; buildConfigurationList = A14E159D1B8F0755006F2E61 /* Build configuration list for PBXLegacyTarget "configure" */; buildPhases = ( ); buildToolPath = /usr/bin/env; - buildWorkingDirectory = "$(PROJECT_DIR)/.."; + buildWorkingDirectory = "$(PROJECT_DIR)/../.."; dependencies = ( ); name = configure; @@ -106,7 +106,7 @@ buildPhases = ( ); buildToolPath = /usr/bin/make; - buildWorkingDirectory = "$(PROJECT_DIR)/.."; + buildWorkingDirectory = "$(PROJECT_DIR)/../.."; dependencies = ( ); name = tests; @@ -120,7 +120,7 @@ buildPhases = ( ); buildToolPath = /usr/bin/env; - buildWorkingDirectory = "$(PROJECT_DIR)/.."; + buildWorkingDirectory = "$(PROJECT_DIR)/../.."; dependencies = ( A1CF5C841B8E3EB400B0D341 /* PBXTargetDependency */, ); @@ -135,7 +135,7 @@ buildPhases = ( ); buildToolPath = /usr/bin/sudo; - buildWorkingDirectory = "$(PROJECT_DIR)/.."; + buildWorkingDirectory = "$(PROJECT_DIR)/../.."; dependencies = ( ); name = install;