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

Use AT&T's binaries of fontconfig and freetype for QuesoGLC. 

This eliminates the dependency on X11 for the mac builds.
master
dak180 2011-09-12 01:42:15 -04:00
parent 1c8d7e4e04
commit d890e63f46
4 changed files with 74 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -58,6 +58,8 @@
4345290E1130F84E002AD731 /* msgfmt */,
433360B311A079F700380F5E /* Moc */,
43B8FF2D127CD57D006F5A13 /* Fonts */,
43CEADC3141D6E810001637B /* fontconfig */,
43CEADC6141D6EEE0001637B /* freetype */,
);
dependencies = (
);
@ -505,10 +507,8 @@
4366721D13D1FFB900FE85BA /* transform.c in Sources */ = {isa = PBXBuildFile; fileRef = 436671F513D1FFB900FE85BA /* transform.c */; };
4366721E13D1FFB900FE85BA /* unicode.c in Sources */ = {isa = PBXBuildFile; fileRef = 436671F613D1FFB900FE85BA /* unicode.c */; };
4366722A13D20B5700FE85BA /* OpenGL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 43B8FD34127CB13F006F5A13 /* OpenGL.framework */; };
4366724513D20E7500FE85BA /* libfreetype.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 4366724413D20E7500FE85BA /* libfreetype.dylib */; };
4366727413D211AE00FE85BA /* QuesoGLC.framework in Copy frameworks */ = {isa = PBXBuildFile; fileRef = 4366718213D1FD5600FE85BA /* QuesoGLC.framework */; };
4366729613D2122700FE85BA /* QuesoGLC.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4366718213D1FD5600FE85BA /* QuesoGLC.framework */; };
436673A213D23A1E00FE85BA /* libfontconfig.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 436673A113D23A1E00FE85BA /* libfontconfig.dylib */; };
4371B60F11D93FD1005A67AB /* pngpriv.h in Headers */ = {isa = PBXBuildFile; fileRef = 4371B60D11D93FD0005A67AB /* pngpriv.h */; };
437FB24D13CE5CA900E7EF5B /* swapinterval.mm in Sources */ = {isa = PBXBuildFile; fileRef = 437FB24B13CE5CA900E7EF5B /* swapinterval.mm */; };
438BDDF31129DC9A00998660 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 438BDDD71129DC9A00998660 /* InfoPlist.strings */; };
@ -553,6 +553,11 @@
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 */; };
43CEAE22141D71560001637B /* libfontconfig.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 43CEAE20141D71560001637B /* libfontconfig.a */; };
43CEAE23141D71570001637B /* libfreetype.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 43CEAE21141D71560001637B /* libfreetype.a */; };
43CEAE27141D71DA0001637B /* Zlib.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 02356D830BD3BB4100E9A019 /* Zlib.framework */; };
43CEAE34141D72840001637B /* libiconv.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 43B9DE3813846038004C7351 /* libiconv.dylib */; };
43CEAE36141D72850001637B /* libxml2.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 43CEAE35141D72850001637B /* libxml2.dylib */; };
43D180B01336B99C001906EB /* physfs_casefolding.h in Headers */ = {isa = PBXBuildFile; fileRef = 43D180AF1336B99C001906EB /* physfs_casefolding.h */; };
43D338581364F5A8005F6725 /* connecthostport.c in Sources */ = {isa = PBXBuildFile; fileRef = 43D338561364F5A8005F6725 /* connecthostport.c */; };
43D338591364F5A8005F6725 /* connecthostport.h in Headers */ = {isa = PBXBuildFile; fileRef = 43D338571364F5A8005F6725 /* connecthostport.h */; };
@ -978,6 +983,13 @@
remoteGlobalIDString = 02356D740BD3BB3400E9A019;
remoteInfo = Warzone;
};
43CEAE25141D71D10001637B /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 02356D660BD3BB2600E9A019 /* Project object */;
proxyType = 1;
remoteGlobalIDString = 02356D820BD3BB4100E9A019 /* Zlib */;
remoteInfo = Zlib;
};
43D1808A1336B74E001906EB /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 02356D660BD3BB2600E9A019 /* Project object */;
@ -1783,8 +1795,6 @@
436671F413D1FFB900FE85BA /* texture.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = texture.h; path = external/quesoglc/src/texture.h; sourceTree = "<group>"; };
436671F513D1FFB900FE85BA /* transform.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = transform.c; path = external/quesoglc/src/transform.c; sourceTree = "<group>"; };
436671F613D1FFB900FE85BA /* unicode.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = unicode.c; path = external/quesoglc/src/unicode.c; sourceTree = "<group>"; };
4366724413D20E7500FE85BA /* libfreetype.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libfreetype.dylib; path = usr/local/lib/libfreetype.dylib; sourceTree = SDKROOT; };
436673A113D23A1E00FE85BA /* libfontconfig.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libfontconfig.dylib; path = usr/X11/lib/libfontconfig.dylib; sourceTree = SDKROOT; };
4371B60D11D93FD0005A67AB /* pngpriv.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = pngpriv.h; path = external/libpng/pngpriv.h; sourceTree = "<group>"; };
437FB24913CE5CA900E7EF5B /* swapinterval.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = swapinterval.cpp; path = ../lib/qtgame/swapinterval.cpp; sourceTree = SOURCE_ROOT; };
437FB24A13CE5CA900E7EF5B /* swapinterval.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = swapinterval.h; path = ../lib/qtgame/swapinterval.h; sourceTree = SOURCE_ROOT; };
@ -1885,6 +1895,9 @@
43C3B9C0118BEBE0000BBE59 /* barkmel.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = barkmel.c; path = external/libvorbis/lib/barkmel.c; sourceTree = "<group>"; };
43C3B9C1118BEBE0000BBE59 /* psytune.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = psytune.c; path = external/libvorbis/lib/psytune.c; sourceTree = "<group>"; };
43C3B9C2118BEBE0000BBE59 /* tone.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = tone.c; path = external/libvorbis/lib/tone.c; sourceTree = "<group>"; };
43CEAE20141D71560001637B /* libfontconfig.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libfontconfig.a; path = "external/usr-fontconfig/local/lib/libfontconfig.a"; sourceTree = "<group>"; };
43CEAE21141D71560001637B /* libfreetype.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libfreetype.a; path = "external/usr-freetype/local/lib/libfreetype.a"; sourceTree = "<group>"; };
43CEAE35141D72850001637B /* libxml2.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libxml2.dylib; path = usr/lib/libxml2.dylib; sourceTree = SDKROOT; };
43D180611336B536001906EB /* wzfs.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = wzfs.h; path = ../lib/framework/wzfs.h; sourceTree = SOURCE_ROOT; };
43D180AF1336B99C001906EB /* physfs_casefolding.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = physfs_casefolding.h; path = external/physfs/physfs_casefolding.h; sourceTree = "<group>"; };
43D338561364F5A8005F6725 /* connecthostport.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = connecthostport.c; sourceTree = "<group>"; };
@ -2132,8 +2145,11 @@
buildActionMask = 2147483647;
files = (
4366722A13D20B5700FE85BA /* OpenGL.framework in Frameworks */,
4366724513D20E7500FE85BA /* libfreetype.dylib in Frameworks */,
436673A213D23A1E00FE85BA /* libfontconfig.dylib in Frameworks */,
43CEAE27141D71DA0001637B /* Zlib.framework in Frameworks */,
43CEAE34141D72840001637B /* libiconv.dylib in Frameworks */,
43CEAE36141D72850001637B /* libxml2.dylib in Frameworks */,
43CEAE23141D71570001637B /* libfreetype.a in Frameworks */,
43CEAE22141D71560001637B /* libfontconfig.a in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@ -2875,8 +2891,7 @@
43B8FD32127CB13F006F5A13 /* OpenAL.framework */,
43B8FD34127CB13F006F5A13 /* OpenGL.framework */,
43B9DE3813846038004C7351 /* libiconv.dylib */,
4366724413D20E7500FE85BA /* libfreetype.dylib */,
436673A113D23A1E00FE85BA /* libfontconfig.dylib */,
43CEAE35141D72850001637B /* libxml2.dylib */,
);
name = "System frameworks";
sourceTree = "<group>";
@ -2992,6 +3007,8 @@
isa = PBXGroup;
children = (
4333611D11A07FB900380F5E /* QT */,
43CEAE20141D71560001637B /* libfontconfig.a */,
43CEAE21141D71560001637B /* libfreetype.a */,
);
name = "External frameworks";
sourceTree = "<group>";
@ -4056,6 +4073,7 @@
);
dependencies = (
4366718913D1FD6100FE85BA /* PBXTargetDependency */,
43CEAE26141D71D10001637B /* PBXTargetDependency */,
);
name = QuesoGLC;
productName = QuesoGLC;
@ -4542,6 +4560,34 @@
shellPath = /bin/sh;
shellScript = "DirectorY=\"fonts_\"\nOutDir=\"fonts\"\nFileName=\"fonts.tar.gz\"\nBuiltDLP=\"http://downloads.sourceforge.net/project/warzone2100/build-tools/mac/fonts.tar.gz\"\nMD5Sum=\"1b8805b36f6f1ba71026d6b5ece1ed52\"\n\nconfigs/FetchPrebuilt.sh \"${DirectorY}\" \"${OutDir}\" \"${FileName}\" \"${BuiltDLP}\" \"${MD5Sum}\"\nexit ${?}\n\n# tar -czf fonts.tar.gz --exclude '.DS_Store' fonts_";
};
43CEADC3141D6E810001637B /* fontconfig */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputPaths = (
);
name = fontconfig;
outputPaths = (
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "DirectorY=\"usr\"\nOutDir=\"usr-fontconfig\"\nFileName=\"fontconfig-2.8.0-darwin9-bin3.tar.gz\"\nBuiltDLP=\"http://r.research.att.com/libs/fontconfig-2.8.0-darwin9-bin3.tar.gz\"\nMD5Sum=\"5d53bd02deb019ac972481afef05562c\"\n\nconfigs/FetchPrebuilt.sh \"${DirectorY}\" \"${OutDir}\" \"${FileName}\" \"${BuiltDLP}\" \"${MD5Sum}\"\nexit ${?}\n";
};
43CEADC6141D6EEE0001637B /* freetype */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputPaths = (
);
name = freetype;
outputPaths = (
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "DirectorY=\"usr\"\nOutDir=\"usr-freetype\"\nFileName=\"freetype-2.4.4-darwin9-bin4.tar.gz\"\nBuiltDLP=\"http://r.research.att.com/libs/freetype-2.4.4-darwin9-bin4.tar.gz\"\nMD5Sum=\"1c782dbe8176d987666cdc0e73194862\"\n\nconfigs/FetchPrebuilt.sh \"${DirectorY}\" \"${OutDir}\" \"${FileName}\" \"${BuiltDLP}\" \"${MD5Sum}\"\nexit ${?}\n";
};
43D180761336B6BF001906EB /* Run autorevision */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
@ -5274,6 +5320,11 @@
target = 02356D740BD3BB3400E9A019 /* Warzone */;
targetProxy = 43AE78FC10F0F4F500FED5D3 /* PBXContainerItemProxy */;
};
43CEAE26141D71D10001637B /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
target = 02356D820BD3BB4100E9A019 /* Zlib */;
targetProxy = 43CEAE25141D71D10001637B /* PBXContainerItemProxy */;
};
43D1808B1336B74E001906EB /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
target = 43D180771336B6BF001906EB /* Autorevision */;

1
macosx/configs/Base-Framework.xcconfig
View File

@ -9,3 +9,4 @@ LD_RUNPATH_SEARCH_PATHS = @loader_path @loader_path/.
PREBINDING = NO
FRAMEWORK_VERSION = A
INFOPLIST_FILE = Resources/GenericFramework-Info.plist
ALWAYS_SEARCH_USER_PATHS = NO

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

@ -4,7 +4,8 @@
PRODUCT_NAME = MiniUPnPc
USER_HEADER_SEARCH_PATHS = "$(SRCROOT)/../3rdparty/miniupnpc" "$(SRCROOT)/.."
HEADER_SEARCH_PATHS = $(inherited) "$(SRCROOT)/.."
USER_HEADER_SEARCH_PATHS = $(inherited) "$(SRCROOT)/../3rdparty/miniupnpc"
GCC_STRICT_ALIASING = NO
GCC_PREPROCESSOR_DEFINITIONS = $(inherited) _DARWIN_C_SOURCE

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

@ -4,10 +4,14 @@
PRODUCT_NAME = QuesoGLC
ALWAYS_SEARCH_USER_PATHS = YES
FRAMEWORK_SEARCH_PATHS = $(inherited) $(FRAMEWORK_SEARCH_PATHS_QUOTED_1) $(FRAMEWORK_SEARCH_PATHS_QUOTED_2)
HEADER_SEARCH_PATHS = $(inherited) $(HEADER_SEARCH_PATHS_QUOTED_2) $(HEADER_SEARCH_PATHS_QUOTED_3) $(HEADER_SEARCH_PATHS_QUOTED_4)
LIBRARY_SEARCH_PATHS = $(inherited) $(LIBRARY_SEARCH_PATHS_QUOTED_4) $(LIBRARY_SEARCH_PATHS_QUOTED_5)
FRAMEWORK_SEARCH_PATHS = $(inherited) $(FRAMEWORK_SEARCH_PATHS_QUOTED_1)
HEADER_SEARCH_PATHS = $(inherited) $(HEADER_SEARCH_PATHS_QUOTED_3) $(HEADER_SEARCH_PATHS_QUOTED_4)
LIBRARY_SEARCH_PATHS = $(inherited) $(LIBRARY_SEARCH_PATHS_QUOTED_4)
USER_HEADER_SEARCH_PATHS = "$(SRCROOT)/external/quesoglc/src" "$(SRCROOT)/external/quesoglc/include"
GCC_PREPROCESSOR_DEFINITIONS = $(inherited) $(GCC_PREPROCESSOR_DEFINITIONS_QUOTED_1) SIZEOF_INT=4 SIZEOF_SHORT=2 GLEW_DISABLE_VBOS GLEW_MX
@ -16,7 +20,9 @@ GCC_WARN_INHIBIT_ALL_WARNINGS = YES // uses deprecated stuff
GCC_PREPROCESSOR_DEFINITIONS_QUOTED_1 = QUESOGLC_VERSION="\"0.7.3\""
LIBRARY_SEARCH_PATHS_QUOTED_4 = "$(SDK_DIR)/usr/X11R6/lib"
LIBRARY_SEARCH_PATHS_QUOTED_4 = "$(SRCROOT)/external/usr-fontconfig/local/lib"
LIBRARY_SEARCH_PATHS_QUOTED_5 = "$(SRCROOT)/external/usr-freetype/local/lib"
HEADER_SEARCH_PATHS_QUOTED_3 = "$(SDK_DIR)/usr/X11R6/include/freetype2"
HEADER_SEARCH_PATHS_QUOTED_4 = "$(SDK_DIR)/usr/X11R6/include"
HEADER_SEARCH_PATHS_QUOTED_2 = "$(SRCROOT)/external/usr-fontconfig/local/include"
HEADER_SEARCH_PATHS_QUOTED_3 = "$(SRCROOT)/external/usr-freetype/local/include"
HEADER_SEARCH_PATHS_QUOTED_4 = "$(SRCROOT)/external/usr-freetype/local/include/freetype2"