Permalink
Browse files

Merge branch 'refs/heads/qt' into todo/master_20110320qt

  • Loading branch information...
2 parents d35d911 + cc55135 commit 151f5881e79358964269242a164e92b5f3fcc322 @dak180 dak180 committed Mar 21, 2011

Large diffs are not rendered by default.

Oops, something went wrong.
@@ -33,13 +33,13 @@ elif [ -d "prebuilt/${DirectorY}" ]; then
elif [[ -d "external/${OutDir}" ]] && [[ ! -f "prebuilt/${FileName}" ]]; then
# Clean up when updating versions
echo "error: Cached file is outdated or incomplete, removing" >&2
- rm -fR "prebuilt/${DirectorY}" "external/${OutDir}"
+ rm -fR "prebuilt/${DirectorY}" "external/${OutDir}" "${BUILT_PRODUCTS_DIR}/${FULL_PRODUCT_NAME}" "${DWARF_DSYM_FOLDER_PATH}/${DWARF_DSYM_FILE_NAME}" "${TARGET_TEMP_DIR}"
elif [[ -d "external/${OutDir}" ]] && [[ -f "prebuilt/${FileName}" ]]; then
# Check to make sure we have the right file
MD5SumLoc=`md5 -q "prebuilt/${FileName}"`
if [ "${MD5SumLoc}" != "${MD5Sum}" ]; then
echo "error: Cached file is outdated or incorrect, removing" >&2
- rm -fR "prebuilt/${FileName}" "prebuilt/${DirectorY}" "external/${OutDir}"
+ rm -fR "prebuilt/${FileName}" "prebuilt/${DirectorY}" "external/${OutDir}" "${BUILT_PRODUCTS_DIR}/${FULL_PRODUCT_NAME}" "${DWARF_DSYM_FOLDER_PATH}/${DWARF_DSYM_FILE_NAME}" "${TARGET_TEMP_DIR}"
else
# Do not do more work then we have to
echo "${OutDir} already exists, skipping"
@@ -33,13 +33,13 @@ elif [ -d "${DirectorY}" ]; then
elif [[ -d "${OutDir}" ]] && [[ ! -f "${FileName}" ]]; then
# Clean up when updating versions
echo "error: Cached file is outdated or incomplete, removing" >&2
- rm -fR "${DirectorY}" "${OutDir}"
+ rm -fR "${DirectorY}" "${OutDir}" "${BUILT_PRODUCTS_DIR}/${FULL_PRODUCT_NAME}" "${DWARF_DSYM_FOLDER_PATH}/${DWARF_DSYM_FILE_NAME}" "${TARGET_TEMP_DIR}"
elif [[ -d "${OutDir}" ]] && [[ -f "${FileName}" ]]; then
# Check to make sure we have the right file
MD5SumLoc=`md5 -q "${FileName}"`
if [ "${MD5SumLoc}" != "${MD5Sum}" ]; then
echo "error: Cached file is outdated or incorrect, removing" >&2
- rm -fR "${FileName}" "${DirectorY}" "${OutDir}"
+ rm -fR "${FileName}" "${DirectorY}" "${OutDir}" "${BUILT_PRODUCTS_DIR}/${FULL_PRODUCT_NAME}" "${DWARF_DSYM_FOLDER_PATH}/${DWARF_DSYM_FILE_NAME}" "${TARGET_TEMP_DIR}"
else
# Do not do more work then we have to
echo "${OutDir} already exists, skipping"
@@ -1,6 +1,6 @@
// Gettext settings for Debug configuration
-#include "gettext-all.xcconfig"
+#include "Gettext-All.xcconfig"
GCC_ENABLE_FIX_AND_CONTINUE = YES
@@ -1,6 +1,6 @@
// Gettext settings for Release configuration
-#include "gettext-all.xcconfig"
+#include "Gettext-All.xcconfig"
GCC_ENABLE_FIX_AND_CONTINUE = NO
@@ -3,8 +3,11 @@
ARCHS = $(ARCHS_STANDARD_32_BIT)
SDKROOT = macosx10.5
-GCC_VERSION = com.apple.compilers.llvm.clang.1_0
+SDKROOT[arch=x86_64] = macosx10.6
+DEBUG_INFORMATION_FORMAT = dwarf-with-dsym
+GCC_VERSION = com.apple.compilers.llvmgcc42
MACOSX_DEPLOYMENT_TARGET = 10.4
+MACOSX_DEPLOYMENT_TARGET[sdk=macosx10.6] = 10.6
COPY_PHASE_STRIP = NO
DEAD_CODE_STRIPPING = YES
GCC_AUTO_VECTORIZATION = YES
@@ -13,13 +13,14 @@ WRAPPER_EXTENSION = app
FRAMEWORK_SEARCH_PATHS = $(FRAMEWORK_SEARCH_PATHS_QUOTED_1) $(FRAMEWORK_SEARCH_PATHS_QUOTED_2) $(FRAMEWORK_SEARCH_PATHS_QUOTED_3) $(inherited)
HEADER_SEARCH_PATHS = .. $(inherited)
LIBRARY_SEARCH_PATHS = $(inherited) $(LIBRARY_SEARCH_PATHS_QUOTED_1) $(LIBRARY_SEARCH_PATHS_QUOTED_3)
+GCC_ENABLE_SSE3_EXTENSIONS = YES // -msse3
GCC_MODEL_TUNING = G5
OTHER_CFLAGS = $(FlagsForCandCpp) $(WarnForC) $(inherited)
OTHER_CFLAGS[arch=i386] = $(inherited) // intel 32 bit only
OTHER_CFLAGS[arch=x86_64] = $(inherited) // intel 64 bit only
-OTHER_CPLUSPLUSFLAGS = -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS $(FlagsForCandCpp) $(WarnForCpp)
+OTHER_CPLUSPLUSFLAGS = $(FlagsForCandCpp) $(WarnForCpp)
OTHER_CPLUSPLUSFLAGS[arch=i386] = $(inherited) // intel 32 bit only
OTHER_CPLUSPLUSFLAGS[arch=x86_64] = $(inherited) // intel 64 bit only
@@ -1,6 +1,6 @@
// Zlib settings for Debug configuration
-#include "Zlib-all.xcconfig"
+#include "Zlib-All.xcconfig"
GCC_ENABLE_FIX_AND_CONTINUE = YES
@@ -1,6 +1,6 @@
// Zlib settings for Release configuration
-#include "Zlib-all.xcconfig"
+#include "Zlib-All.xcconfig"
GCC_ENABLE_FIX_AND_CONTINUE = NO

0 comments on commit 151f588

Please sign in to comment.