Ginger88895
/
warzone2100
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Normalise the warnings for the mac builds.

master
dak180 2010-12-21 15:37:52 -05:00
parent 760d19f776
commit 01e55ddf07
3 changed files with 26 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
macosx/configs/Warzone-All.xcconfig
View File

@ -14,10 +14,14 @@ FRAMEWORK_SEARCH_PATHS = $(FRAMEWORK_SEARCH_PATHS_QUOTED_1) $(FRAMEWORK_SEARCH_P
HEADER_SEARCH_PATHS = .. $(inherited)
LIBRARY_SEARCH_PATHS = $(inherited) $(LIBRARY_SEARCH_PATHS_QUOTED_1) $(LIBRARY_SEARCH_PATHS_QUOTED_3)
GCC_MODEL_TUNING = G5
OTHER_CFLAGS = $(FlagsForCandCpp) -Wno-pointer-to-int-cast -Wmissing-declarations -Wstrict-prototypes -Wdeclaration-after-statement $(inherited) // Warning flags that c++ does not like
OTHER_CFLAGS = $(FlagsForCandCpp) $(WarnForC) $(inherited)
OTHER_CFLAGS[arch=i386] = $(inherited) // intel 32 bit only
OTHER_CPLUSPLUSFLAGS = $(FlagsForCandCpp) -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS
OTHER_CFLAGS[arch=x86_64] = $(inherited) // intel 64 bit only
OTHER_CPLUSPLUSFLAGS = -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS $(FlagsForCandCpp) $(WarnForCpp)
OTHER_CPLUSPLUSFLAGS[arch=i386] = $(inherited) // intel 32 bit only
OTHER_CPLUSPLUSFLAGS[arch=x86_64] = $(inherited) // intel 64 bit only
// Warnings
@ -26,8 +30,6 @@ GCC_WARN_INITIALIZER_NOT_FULLY_BRACKETED = YES // -Wmissing-braces
GCC_WARN_ABOUT_RETURN_TYPE = YES // -Wreturn-type
GCC_WARN_MISSING_PARENTHESES = YES // -Wparentheses
GCC_WARN_ABOUT_MISSING_FIELD_INITIALIZERS = YES // -Wmissing-field-initializers
WARNING_CFLAGS = -Wall -Wno-unused-label -Wno-format-security -Wno-strict-aliasing -Wmissing-field-initializers -Wcast-align -Wwrite-strings -Wpointer-arith // Wno-missing-declarations is set on GLee.c; otherwise we would have +3000 warnings
GCC_WARN_SIGN_COMPARE = NO // FIXME: -Wsign-compare there are a lot of these and they should be fixed
GCC_WARN_TYPECHECK_CALLS_TO_PRINTF = NO // FIXME: -Wno-format Hides some "format not a string literal and no format arguments" warnings; these should be fixed at some point
GCC_WARN_UNDECLARED_SELECTOR = YES // -Wundeclared-selector
GCC_WARN_UNUSED_FUNCTION = YES // -Wunused-function
@ -35,6 +37,11 @@ GCC_WARN_UNUSED_LABEL = YES // -Wunused-label
GCC_WARN_UNUSED_VALUE = YES // -Wunused-value
GCC_WARN_UNUSED_VARIABLE = YES // -Wunused-variable
// Build setting dependent warnings
WarnForCandCpp = -Wall -Wextra -Wcast-align -Wwrite-strings -Wpointer-arith $(WarnForCandCppDep) // Wno-missing-declarations is set on GLee.c; otherwise we would have +3000 warnings
WarnForC = -Wstrict-prototypes -Wdeclaration-after-statement $(WarnForCDep)
WarnForCpp = $(WarnForCppDep)
// Additional build flags for both c and c++ files
FlagsForCandCpp = $(BuildDependentFlagsForCandCpp)
FlagsForCandCpp[arch=i386] = $(inherited) // Flags for intel 32 bit only
FlagsForCandCpp = $(BuildDependentFlagsForCandCpp) $(WarnForCandCpp)
FlagsForCandCpp[arch=i386] = $(inherited) // Flags for intel 32 bit only

9
macosx/configs/Warzone-Debug.xcconfig
View File

@ -7,6 +7,11 @@ GCC_ENABLE_FIX_AND_CONTINUE = YES
GCC_DYNAMIC_NO_PIC = NO
GCC_OPTIMIZATION_LEVEL = 0
GCC_PREPROCESSOR_DEFINITIONS = DEBUG $(inherited)
GCC_TREAT_WARNINGS_AS_ERRORS = YES
BuildDependentFlagsForCandCpp = -fstack-protector-all
// Additional build flags for both c and c++ files
BuildDependentFlagsForCandCpp = -Werror // -fstack-protector // Needs 10.6 min for build before being used
// Build setting dependent warnings
WarnForCandCppDep = -Wno-error=unused-parameter -Wno-error=format-security -Wno-sign-compare // -Wno-error=sign-compare // FIXME: For some reason these will be errors anyway, so off for now
WarnForCDep = -Wc++-compat -Wno-error=c++-compat
WarnForCppDep = // -Wno-error=enum-compare // not currently supported by compiler

7
macosx/configs/Warzone-Release.xcconfig
View File

@ -6,4 +6,9 @@
GCC_OPTIMIZATION_LEVEL = 2
GCC_PREPROCESSOR_DEFINITIONS = $(inherited)
// BuildDependentFlagsForCandCpp = -fstack-protector // Needs 10.5 min before being used
BuildDependentFlagsForCandCpp = // -fstack-protector // Needs 10.6 min for build before being used
// Build setting dependent warnings
WarnForCandCppDep = -Wno-unused-parameter -Wno-format-security -Wno-sign-compare
WarnForCDep =
WarnForCppDep = // -Wno-enum-compare // not currently supported by compiler