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

Minor adjustments to better match up with newnet. 

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@11101 4a71c877-e1ca-e34f-864e-861f7616d084
master
dak180 2010-07-06 00:12:46 +00:00 committed by Git SVN Gateway
parent 9314399f0c
commit 559a02e7f7
6 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -471,6 +471,7 @@
4355E13310D6028C00A19EE4 /* theoraenc.h in Headers */ = {isa = PBXBuildFile; fileRef = 4355E12F10D6028C00A19EE4 /* theoraenc.h */; settings = {ATTRIBUTES = (Public, ); }; };
4371B5A611D93BA3005A67AB /* pngpriv.h in Headers */ = {isa = PBXBuildFile; fileRef = 4371B5A411D93BA3005A67AB /* pngpriv.h */; };
438BDDF31129DC9A00998660 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 438BDDD71129DC9A00998660 /* InfoPlist.strings */; };
4396141511E2447100878481 /* barkmel.c in Sources */ = {isa = PBXBuildFile; fileRef = 43C3B9C0118BEBE0000BBE59 /* barkmel.c */; };
43A8417811028EDD00733CCB /* pointtree.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 43A8417611028EDD00733CCB /* pointtree.cpp */; };
43BE73ED11121A47007DF934 /* config.h in Headers */ = {isa = PBXBuildFile; fileRef = 971177E70F87A926000C8A96 /* config.h */; };
43BE75EA11124BB5007DF934 /* wavecast.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 43BE75E811124BB4007DF934 /* wavecast.cpp */; };
@ -499,7 +500,6 @@
43C3B9BB118BEAE7000BBE59 /* res_books_uncoupled.h in Headers */ = {isa = PBXBuildFile; fileRef = 43C3B9BA118BEAE7000BBE59 /* res_books_uncoupled.h */; };
43C3B9BE118BEB63000BBE59 /* residue_44p51.h in Headers */ = {isa = PBXBuildFile; fileRef = 43C3B9BC118BEB63000BBE59 /* residue_44p51.h */; };
43C3B9BF118BEB63000BBE59 /* setup_44p51.h in Headers */ = {isa = PBXBuildFile; fileRef = 43C3B9BD118BEB63000BBE59 /* setup_44p51.h */; };
43C3B9C5118BEBE0000BBE59 /* tone.c in Sources */ = {isa = PBXBuildFile; fileRef = 43C3B9C2118BEBE0000BBE59 /* tone.c */; };
43C3B9E0118BEC40000BBE59 /* res_books_51.h in Headers */ = {isa = PBXBuildFile; fileRef = 43C3B9B4118BEA9D000BBE59 /* res_books_51.h */; };
43E1890411440D8C000870EB /* eval-plural.h in Headers */ = {isa = PBXBuildFile; fileRef = 022B2F850BD55B4F002E64E3 /* eval-plural.h */; };
43E1890511440D8D000870EB /* gettextP.h in Headers */ = {isa = PBXBuildFile; fileRef = 022B2F860BD55B4F002E64E3 /* gettextP.h */; };
@ -4467,7 +4467,7 @@
02DDA8410BD3C1420049AB60 /* window.c in Sources */,
02DDA8590BD3C18B0049AB60 /* vorbisenc.c in Sources */,
02DDA85A0BD3C18B0049AB60 /* vorbisfile.c in Sources */,
43C3B9C5118BEBE0000BBE59 /* tone.c in Sources */,
4396141511E2447100878481 /* barkmel.c in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};

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

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

@ -15,7 +15,9 @@ HEADER_SEARCH_PATHS = .. $(inherited) $(HEADER_SEARCH_PATHS_QUOTED_1)
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)
OTHER_CPLUSPLUSFLAGS[arch=i386] = $(inherited) // intel 32 bit only
// Warnings
@ -35,5 +37,5 @@ 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 = $(BuildDependentFlagsForCandCpp) // -mno-fused-madd
// FlagsForCandCpp[arch=i386] = -mfpmath=sse $(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 // Needs 10.5 min before being used

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