summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorandrewfish <andrewfish@6f19259b-4bc3-4df7-8a09-765794883524>2011-06-29 17:27:55 +0000
committerandrewfish <andrewfish@6f19259b-4bc3-4df7-8a09-765794883524>2011-06-29 17:27:55 +0000
commit697aa37e3b9a6edb1472a3ecc37e923da185d83a (patch)
treea6c24b44fe86089ce8bd0a107de213f96c8e7d46
parent82b2ab64f1b90a3ed70c344d410df4b4a9975013 (diff)
downloadedk2-platforms-697aa37e3b9a6edb1472a3ecc37e923da185d83a.tar.xz
EmulatorPkg: Match paths/names for Xcode with new package naming scheme.
signed-off-by:andrewfish git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@11929 6f19259b-4bc3-4df7-8a09-765794883524
-rwxr-xr-xEmulatorPkg/Unix/Xcode/xcode_project32/XcodeBuild.sh5
-rw-r--r--EmulatorPkg/Unix/Xcode/xcode_project32/xcode_project.xcodeproj/default.pbxuser4
-rwxr-xr-xEmulatorPkg/Unix/Xcode/xcode_project64/XcodeBuild.sh5
-rw-r--r--EmulatorPkg/Unix/Xcode/xcode_project64/xcode_project.xcodeproj/default.pbxuser4
4 files changed, 8 insertions, 10 deletions
diff --git a/EmulatorPkg/Unix/Xcode/xcode_project32/XcodeBuild.sh b/EmulatorPkg/Unix/Xcode/xcode_project32/XcodeBuild.sh
index 09d1a280d9..6e432dd81e 100755
--- a/EmulatorPkg/Unix/Xcode/xcode_project32/XcodeBuild.sh
+++ b/EmulatorPkg/Unix/Xcode/xcode_project32/XcodeBuild.sh
@@ -19,6 +19,5 @@ set -e
#
# Source the workspace and set up the environment variables we need
#
-cd ../..
-echo `pwd`
-./build.sh $1 $2 $3 $4 $5 $6 $8
+cd ../../..
+./build.sh -a IA32 $1 $2 $3 $4 $5 $6 $8
diff --git a/EmulatorPkg/Unix/Xcode/xcode_project32/xcode_project.xcodeproj/default.pbxuser b/EmulatorPkg/Unix/Xcode/xcode_project32/xcode_project.xcodeproj/default.pbxuser
index 026a84544d..85913859c3 100644
--- a/EmulatorPkg/Unix/Xcode/xcode_project32/xcode_project.xcodeproj/default.pbxuser
+++ b/EmulatorPkg/Unix/Xcode/xcode_project32/xcode_project.xcodeproj/default.pbxuser
@@ -152,13 +152,13 @@
showTypeColumn = 0;
sourceDirectories = (
);
- startupPath = ../../../../Build/EmuUnixIa32/DEBUG_XCLANG/IA32;
+ startupPath = ../../../../Build/Emulator32/DEBUG_XCLANG/IA32;
};
BA11A1020FB10BCE00D06FEC /* Host.dll */ = {
isa = PBXFileReference;
lastKnownFileType = "compiled.mach-o.executable";
name = Host.dll;
- path = ../../../../Build/EmuUnixIa32/DEBUG_XCLANG/IA32/Host;
+ path = ../../../../Build/Emulator32/DEBUG_XCLANG/IA32/Host;
sourceTree = SOURCE_ROOT;
};
BA11A11A0FB10E0700D06FEC /* SecGdbConfigBreak */ = {
diff --git a/EmulatorPkg/Unix/Xcode/xcode_project64/XcodeBuild.sh b/EmulatorPkg/Unix/Xcode/xcode_project64/XcodeBuild.sh
index 634b1b025c..ac26dc60c4 100755
--- a/EmulatorPkg/Unix/Xcode/xcode_project64/XcodeBuild.sh
+++ b/EmulatorPkg/Unix/Xcode/xcode_project64/XcodeBuild.sh
@@ -19,6 +19,5 @@ set -e
#
# Source the workspace and set up the environment variables we need
#
-cd ../..
-echo `pwd`
-./build64.sh $1 $2 $3 $4 $5 $6 $8
+cd ../../..
+./build.sh $1 $2 $3 $4 $5 $6 $8
diff --git a/EmulatorPkg/Unix/Xcode/xcode_project64/xcode_project.xcodeproj/default.pbxuser b/EmulatorPkg/Unix/Xcode/xcode_project64/xcode_project.xcodeproj/default.pbxuser
index 3cc5f92d36..7e7ce697af 100644
--- a/EmulatorPkg/Unix/Xcode/xcode_project64/xcode_project.xcodeproj/default.pbxuser
+++ b/EmulatorPkg/Unix/Xcode/xcode_project64/xcode_project.xcodeproj/default.pbxuser
@@ -152,13 +152,13 @@
showTypeColumn = 0;
sourceDirectories = (
);
- startupPath = ../../../../Build/EmuUnixX64/DEBUG_XCLANG/X64;
+ startupPath = ../../../../Build/Emulator/DEBUG_XCLANG/X64;
};
BA11A1020FB10BCE00D06FEC /* Host.dll */ = {
isa = PBXFileReference;
lastKnownFileType = "compiled.mach-o.executable";
name = Host.dll;
- path = ../../../../Build/EmuUnixX64/DEBUG_XCLANG/X64/Host;
+ path = ../../../../Build/Emulator/DEBUG_XCLANG/X64/Host;
sourceTree = SOURCE_ROOT;
};
BA11A11A0FB10E0700D06FEC /* SecGdbConfigBreak */ = {