1 files changed, 40 insertions, 54 deletions
diff --git a/samples/build/GenerateSamples_mac.sh b/samples/build/GenerateSamples_mac.sh
index 0274a5a..473274f 100755
--- a/samples/build/GenerateSamples_mac.sh
+++ b/samples/build/GenerateSamples_mac.sh
@@ -21,90 +21,87 @@ fi
 clean()
 {
 echo "Cleaning..."
-if [ -e cmake/CustomSchema/build ]
-then
-rm -rf cmake/CustomSchema/build
-fi
+
 if [ -e cmake/CustomSchema/build_x64 ]
 then
 rm -rf cmake/CustomSchema/build_x64
 fi
-if [ -e cmake/DumpFile/build ]
+
+if [ -e cmake/CustomSchemaNewDOM/build_x64 ]
 then
-rm -rf cmake/DumpFile/build
+rm -rf cmake/CustomSchemaNewDOM/build_x64
 fi
+
 if [ -e cmake/DumpFile/build_x64 ]
 then
 rm -rf cmake/DumpFile/build_x64
 fi
-if [ -e cmake/DumpMainXMP/build ]
-then
-rm -rf cmake/DumpMainXMP/build
-fi
+
 if [ -e cmake/DumpMainXMP/build_x64 ]
 then
 rm -rf cmake/DumpMainXMP/build_x64
 fi
-if [ -e cmake/DumpScannedXMP/build ]
-then
-rm -rf cmake/DumpScannedXMP/build
-fi
+
 if [ -e cmake/DumpScannedXMP/build_x64 ]
 then
 rm -rf cmake/DumpScannedXMP/build_x64
 fi
-if [ -e cmake/ModifyingXMP/build ]
-then
-rm -rf cmake/ModifyingXMP/build
-fi
+
 if [ -e cmake/ModifyingXMP/build_x64 ]
 then
 rm -rf cmake/ModifyingXMP/build_x64
 fi
-if [ -e cmake/ReadingXMP/build ]
+
+if [ -e cmake/ModifyingXMPNewDOM/build_x64 ]
 then
-rm -rf cmake/ReadingXMP/build
+rm -rf cmake/ModifyingXMPNewDOM/build_x64
 fi
+
 if [ -e cmake/ReadingXMP/build_x64 ]
 then
 rm -rf cmake/ReadingXMP/build_x64
 fi
-if [ -e cmake/XMPCommand/build ]
+
+if [ -e cmake/ReadingXMPNewDOM/build_x64 ]
 then
-rm -rf cmake/XMPCommand/build
+rm -rf cmake/ReadingXMPNewDOM/build_x64
 fi
+
 if [ -e cmake/XMPCommand/build_x64 ]
 then
-rm -rf cmake/XMPCommand/build
-fi
-if [ cmake/XMPCoreCoverage/build_x64 ]
-then
 rm -rf cmake/XMPCommand/build_x64
 fi
-if [ -e cmake/XMPCoreCoverage/build ]
+
+if [ cmake/XMPCoreCoverage/build_x64 ]
 then
-rm -rf cmake/XMPCoreCoverage/build
+rm -rf cmake/XMPCoreCoverage/build_x64
 fi
+
 if [ -e cmake/XMPFilesCoverage/build_x64 ]
 then
-rm -rf cmake/XMPCoreCoverage/build_x64
+rm -rf cmake/XMPFilesCoverage/build_x64
 fi
-if [ -e cmake/XMPFilesCoverage/build ]
+
+if [ -e cmake/XMPIterations/build_x64 ]
 then
-rm -rf cmake/XMPFilesCoverage/build
+rm -rf cmake/XMPIterations/build_x64
 fi
-if [ -e cmake/XMPIterations/build_x64 ]
+
+if [ -e cmake/UnicodeCorrectness/build_x64 ]
 then
-rm -rf cmake/XMPFilesCoverage/build_x64
+rm -rf cmake/UnicodeCorrectness/build_x64
 fi
-if [ -e cmake/XMPIterations/build ]
+
+if [ -e cmake/UnicodeParseSerialize/build_x64 ]
 then
-rm -rf cmake/XMPIterations/build
+rm -rf cmake/UnicodeParseSerialize/build_x64
 fi
-if [ -e cmake/XMPIterations/build_x64 ]
+
+if [ -e cmake/UnicodePerformance/build_x64 ]
 then
-rm -rf cmake/XMPIterations/build_x64
+rm -rf cmake/UnicodePerformance/build_x64
 fi
+
 if [ -e xcode ]
 then
 rm -rf xcode
@@ -116,13 +113,7 @@ fi
 echo "Done"
 exit 0;
 }
-Xcode32()
-{
-#create 32bit Xcode Project
-DIR="xcode/intel"
-TOOLCHAIN="$scriptdir/../../build/shared/ToolchainLLVM.cmake"
-bit64="0"
-}
+
 Xcode64()
 {
 #create 64bit Xcode Project
@@ -150,7 +141,7 @@ fi
 
 #generate the make file
 echo "PWD is $PWD, CMAKE LOCATION IS $CMAKE, dir is $DIR"
-if ! ("$CMAKE" -D CMAKE_CL_64=$bit64  -G "Xcode" -DCMAKE_TOOLCHAIN_FILE="$TOOLCHAIN"  ../../cmake)
+if ! ("$CMAKE" -DCMAKE_CL_64=$bit64 -DSTATIC=$static -G "Xcode" -DCMAKE_TOOLCHAIN_FILE="$TOOLCHAIN"  ../../cmake)
 then
 echo "ERROR: CMAKE tool failed"
 exit 1
@@ -161,19 +152,14 @@ fi
 
 echo "Enter your choice:"
 echo "1. Clean"
-echo "2. 32 Bit Xcode Project"
-echo "3. 64 Bit Xcode Project"
-echo "4. Build All"
-
+echo "2. 64 Bit Xcode Project (Static)"
+echo "3. 64 Bit Xcode Project (Dynamic)"
 
 read choice
 
 case $choice in
   1) clean; break;;
-  2) Xcode32; createProject;;
-  3) Xcode64; createProject;;
-  4) Xcode32; createProject; cd -; Xcode64; createProject;;
+  2) static="1"; Xcode64; createProject;;
+  3) static="0"; Xcode64; createProject;;
   *) echo "ERROR: Invalid Choice, Exiting"; exit 1;;
 esac
-
-