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

Bring qt-trunk in line with trunk. 

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/branches/qt-trunk@11142 4a71c877-e1ca-e34f-864e-861f7616d084
master
dak180 2010-07-10 23:38:13 +00:00 committed by Git SVN Gateway
parent c135a3fd1a
commit c37f93680a
14 changed files with 27 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
macosx/Warzone.xcodeproj/project.pbxproj
View File

@ -3375,6 +3375,7 @@
isa = PBXProject;
attributes = {
BuildIndependentTargetsInParallel = YES;
ORGANIZATIONNAME = net.wz2100.;
};
buildConfigurationList = 02356D670BD3BB2600E9A019 /* Build configuration list for PBXProject "Warzone" */;
compatibilityVersion = "Xcode 3.1";

2
macosx/configs/FetchPrebuilt.sh
View File

@ -70,7 +70,7 @@ elif [ "${MD5SumLoc}" != "${MD5Sum}" ]; then
fi
# Unpack
if ! tar -zxf "${FileName}"; then
if ! tar -xzf "${FileName}"; then
echo "error: Unpacking $FileName failed" >&2
exit 1
fi

2
macosx/configs/Gettext-All.xcconfig
View File

@ -21,8 +21,6 @@ PRODUCT_NAME = Gettext
FRAMEWORK_SEARCH_PATHS = $(inherited) $(FRAMEWORK_SEARCH_PATHS_QUOTED_1)
LIBRARY_SEARCH_PATHS = $(inherited) $(LIBRARY_SEARCH_PATHS_QUOTED_1)
GCC_MODEL_TUNING = G5
GCC_PRECOMPILE_PREFIX_HEADER = YES
GCC_PREFIX_HEADER = $(SYSTEM_LIBRARY_DIR)/Frameworks/Carbon.framework/Headers/Carbon.h
GCC_PREPROCESSOR_DEFINITIONS = HAVE_LOCALE_NULL $(GCC_PREPROCESSOR_DEFINITIONS_QUOTED_1) $(GCC_PREPROCESSOR_DEFINITIONS_QUOTED_2) $(GCC_PREPROCESSOR_DEFINITIONS_QUOTED_3) BUILDING_LIBINTL IN_LIBINTL HAVE_CONFIG_H $(inherited)
GCC_WARN_INHIBIT_ALL_WARNINGS = YES // gettext redifines things way too much, so shut it up

5
macosx/configs/Project-All.xcconfig
View File

@ -2,8 +2,9 @@
ARCHS = $(ARCHS_STANDARD_32_BIT)
SDKROOT = macosx10.4
GCC_VERSION = 4.0
SDKROOT = macosx10.5
GCC_VERSION = com.apple.compilers.llvm.clang.1_0
MACOSX_DEPLOYMENT_TARGET = 10.4
COPY_PHASE_STRIP = NO
DEAD_CODE_STRIPPING = YES
GCC_AUTO_VECTORIZATION = YES

3
macosx/configs/QuesoGLC-All.xcconfig
View File

@ -12,9 +12,8 @@ FRAMEWORK_SEARCH_PATHS = $(inherited) $(FRAMEWORK_SEARCH_PATHS_QUOTED_1)
HEADER_SEARCH_PATHS = external/quesoglc/src external/quesoglc/include $(HEADER_SEARCH_PATHS_QUOTED_1) $(HEADER_SEARCH_PATHS_QUOTED_2) $(inherited)
LIBRARY_SEARCH_PATHS = $(inherited) $(LIBRARY_SEARCH_PATHS_QUOTED_1)
GCC_MODEL_TUNING = G5
GCC_PRECOMPILE_PREFIX_HEADER = YES
GCC_PREFIX_HEADER = $(SYSTEM_LIBRARY_DIR)/Frameworks/Carbon.framework/Headers/Carbon.h // mark
GCC_PREPROCESSOR_DEFINITIONS = SIZEOF_INT=4 SIZEOF_SHORT=2 $(GCC_PREPROCESSOR_DEFINITIONS_QUOTED_1) GLEW_DISABLE_VBOS GLEW_MX $(inherited)
GCC_WARN_INHIBIT_ALL_WARNINGS = YES // uses deprecated stuff
GCC_PREPROCESSOR_DEFINITIONS_QUOTED_1 = QUESOGLC_VERSION="\"0.6.5\""

2
macosx/configs/QuesoGLC-Debug.xcconfig
View File

@ -3,9 +3,7 @@
#include "QuesoGLC-All.xcconfig"
OTHER_LDFLAGS = -lfontconfig
GCC_ENABLE_FIX_AND_CONTINUE = YES
GCC_DYNAMIC_NO_PIC = NO
GCC_OPTIMIZATION_LEVEL = 0
GCC_PREFIX_HEADER =
ZERO_LINK = YES

1
macosx/configs/QuesoGLC-Release.xcconfig
View File

@ -3,6 +3,5 @@
#include "QuesoGLC-All.xcconfig"
OTHER_LDFLAGS = -framework Carbon
GCC_ENABLE_FIX_AND_CONTINUE = NO
ZERO_LINK = NO

3
macosx/configs/Theora-All.xcconfig
View File

@ -9,4 +9,5 @@ FRAMEWORK_VERSION = A
INFOPLIST_FILE = Resources/theora/Info.plist
PRODUCT_NAME = Theora
HEADER_SEARCH_PATHS = external/libtheora/lib external/libtheora/include/** $(inherited)
GCC_MODEL_TUNING = G5
GCC_MODEL_TUNING = G5
WARNING_CFLAGS = -Wno-parentheses // Silence warnings that are not ours

1
macosx/configs/Vorbis-All.xcconfig
View File

@ -1,6 +1,7 @@
// Vorbis settings for all configurations
GCC_VERSION = 4.2
INSTALL_PATH = @executable_path/../Frameworks
DYLIB_COMPATIBILITY_VERSION = 1
DYLIB_CURRENT_VERSION = 1

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

@ -2,7 +2,6 @@
INSTALL_PATH = $(HOME)/Applications
OTHER_LDFLAGS[arch=ppc] = -w // This turns off 2 warnings that are actually in apple's sdk.
PREBINDING = NO
APPLY_RULES_IN_COPY_FILES = YES
INFOPLIST_FILE = Resources/Warzone-Info.plist
@ -16,19 +15,26 @@ 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[arch=i386] = $(inherited) // intel 32 bit only
OTHER_CPLUSPLUSFLAGS = $(FlagsForCandCpp) -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS
OTHER_CPLUSPLUSFLAGS[arch=i386] = $(inherited) // intel 32 bit only
// Warnings
GCC_WARN_CHECK_SWITCH_STATEMENTS = YES // -Wswitch
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
GCC_WARN_UNUSED_LABEL = YES // -Wunused-label
GCC_WARN_UNUSED_VALUE = YES // -Wunused-value
GCC_WARN_UNUSED_VARIABLE = YES // -Wunused-variable
// Additional build flags for both c and c++ files
// Cyp: when merging with newnet delete this line and uncomment the lines below
// FlagsForCandCpp = $(BuildDependentFlagsForCandCpp) -mno-fused-madd
// FlagsForCandCpp[arch=i386] = -mfpmath=sse $(inherited) // Flags for intel 32 bit only
FlagsForCandCpp = $(BuildDependentFlagsForCandCpp)
FlagsForCandCpp[arch=i386] = $(inherited) // Flags for intel 32 bit only

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

@ -1,6 +1,6 @@
// Warzone settings for Debug configuration
#include "warzone-all.xcconfig"
#include "Warzone-All.xcconfig"
GCC_ENABLE_FIX_AND_CONTINUE = YES
@ -9,4 +9,4 @@ GCC_OPTIMIZATION_LEVEL = 0
GCC_PREPROCESSOR_DEFINITIONS = VORBIS_NEEDS_HACK DEBUG $(inherited) // FIXME: VORBIS_NEEDS_HACK is a unnessary hack; there is a better way and it will be done eventually
GCC_TREAT_WARNINGS_AS_ERRORS = YES
// BuildDependentFlagsForCandCpp = -fstack-protector-all // Needs 10.5 min before being used
BuildDependentFlagsForCandCpp = -fstack-protector-all

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

@ -1,6 +1,6 @@
// Warzone settings for Release configuration
#include "warzone-all.xcconfig"
#include "Warzone-All.xcconfig"
GCC_OPTIMIZATION_LEVEL = 2

5
macosx/configs/Warzone-StaticAnalyzer.xcconfig
View File

@ -1,6 +1,7 @@
// Warzone settings for StaticAnalyzer configuration
#include "warzone-release.xcconfig"
#include "Warzone-Debug.xcconfig"
RUN_CLANG_STATIC_ANALYZER = YES
RUN_CLANG_STATIC_ANALYZER = YES
GCC_OPTIMIZATION_LEVEL = 2

3
macosx/configs/Zlib-All.xcconfig
View File

@ -11,4 +11,5 @@ PRODUCT_NAME = Zlib
GCC_MODEL_TUNING = G5
GCC_PRECOMPILE_PREFIX_HEADER = YES
GCC_PREFIX_HEADER =
GCC_PREPROCESSOR_DEFINITIONS = HAVE_UNISTD_H $(inherited)
GCC_PREPROCESSOR_DEFINITIONS = HAVE_UNISTD_H $(inherited)
WARNING_CFLAGS = -Wno-unused-value // Silence warnings that are not ours