From 15e46e7113f81176c4e6aee64646043a9614e652 Mon Sep 17 00:00:00 2001 From: Charlie Fenton Date: Fri, 3 Aug 2012 08:58:50 +0000 Subject: [PATCH] Sample Graphics app: Switch from *.txf fonts to TrueType fonts svn path=/trunk/boinc/; revision=25968 --- mac_build/boinc.xcodeproj/project.pbxproj | 16 ++++ samples/example_app/MakeMacExample.sh | 12 +-- samples/example_app/Makefile_mac | 27 ++++++- samples/example_app/Makefile_mac2 | 46 ++++++++---- samples/example_app/uc2_graphics.cpp | 32 +++++--- .../UpperCase2.xcodeproj/project.pbxproj | 74 ++++++++++++++++++- 6 files changed, 167 insertions(+), 40 deletions(-) diff --git a/mac_build/boinc.xcodeproj/project.pbxproj b/mac_build/boinc.xcodeproj/project.pbxproj index 20b96d12a3..c75a1afb4b 100755 --- a/mac_build/boinc.xcodeproj/project.pbxproj +++ b/mac_build/boinc.xcodeproj/project.pbxproj @@ -3802,6 +3802,14 @@ "-lbz2", ); PRODUCT_NAME = boincscr; + WARNING_LDFLAGS = ( + "-lresolv", + "-ljpeg", + "../../freetype-2.4.10/objs/.libs/libfreetype.a", + "../../ftgl-2.1.3~rc5/src/.libs/libftgl.a", + "-lz", + "-lbz2", + ); }; name = Development; }; @@ -3827,6 +3835,14 @@ "-lbz2", ); PRODUCT_NAME = boincscr; + WARNING_LDFLAGS = ( + "-lresolv", + "-ljpeg", + "../../freetype-2.4.10/objs/.libs/libfreetype.a", + "../../ftgl-2.1.3~rc5/src/.libs/libftgl.a", + "-lz", + "-lbz2", + ); }; name = Deployment; }; diff --git a/samples/example_app/MakeMacExample.sh b/samples/example_app/MakeMacExample.sh index 6a10c4bacd..ab23360b6a 100644 --- a/samples/example_app/MakeMacExample.sh +++ b/samples/example_app/MakeMacExample.sh @@ -23,6 +23,7 @@ # by Charlie Fenton 2/16/10 # Updated 10/11/10 for XCode 3.2 and OS 10.6 # Updated 7/12/12 for Xcode 4.3 and later which are not at a fixed address +# Updated 8/3/12 for TrueType fonts # ## This script requires OS 10.6 or later # @@ -84,10 +85,7 @@ export VARIANTFLAGS="-isysroot ${SDKPATH} -arch i386 -DMAC_OS_X_VERSION_MAX_ALLO export SDKROOT="${SDKPATH}" export MACOSX_DEPLOYMENT_TARGET=10.4 -rm -f uc2.o -rm -f uc2_graphics.o -rm -f uc2 -rm -f uc2_graphics +make -f Makefile_mac clean make -f Makefile_mac all if [ $? -ne 0 ]; then exit 1; fi @@ -108,10 +106,7 @@ export VARIANTFLAGS="-isysroot ${SDKPATH} -arch x86_64 -DMAC_OS_X_VERSION_MAX_AL export SDKROOT="${SDKPATH}" export MACOSX_DEPLOYMENT_TARGET=10.5 -rm -f uc2.o -rm -f uc2_graphics.o -rm -f uc2 -rm -f uc2_graphics +make -f Makefile_mac clean make -f Makefile_mac all if [ $? -ne 0 ]; then exit 1; fi @@ -121,6 +116,7 @@ mv uc2 x86_64/ mv uc2_graphics x86_64/ rm -f uc2.o +rm -f ttfont.o rm -f uc2_graphics.o echo diff --git a/samples/example_app/Makefile_mac b/samples/example_app/Makefile_mac index 074cf9f7be..d24f6ec873 100644 --- a/samples/example_app/Makefile_mac +++ b/samples/example_app/Makefile_mac @@ -2,12 +2,15 @@ # This is invoked from MakeMacExample.sh shell script. # It should not be used by itself without the script. # Updated 7/10/12 for OS 10.7 and XCode 4.3 and later +# Updated 8/3/12 for TrueType fonts BOINC_DIR = ../.. BOINC_API_DIR = $(BOINC_DIR)/api BOINC_LIB_DIR = $(BOINC_DIR)/lib BOINC_BUILD_DIR = $(BOINC_DIR)/mac_build/build/Deployment -BOINC_CONFIG_DIR = $(BOINC_DIR)/clientgui/mac +BOINC_CONFIG_DIR = $(BOINC_DIR)/clientgui/mac +FREETYPE_DIR = $(BOINC_DIR)/../freetype-2.4.10 +FTGL_DIR = $(BOINC_DIR)/../ftgl-2.1.3~rc5 FRAMEWORKS_DIR = /System/Library/Frameworks CXXFLAGS = $(VARIANTFLAGS) \ @@ -17,11 +20,16 @@ CXXFLAGS = $(VARIANTFLAGS) \ -I$(BOINC_DIR) \ -I$(BOINC_LIB_DIR) \ -I$(BOINC_API_DIR) \ + -I$(FREETYPE_DIR)/include \ + -I$(FTGL_DIR)/src \ -L$(BOINC_BUILD_DIR) \ + -L$(FREETYPE_DIR)//objs/.libs \ + -L$(FTGL_DIR)/src/.libs \ -L. OBJ = \ uc2.o \ + ttfont.o \ uc2_graphics.o PROGS = uc2 uc2_graphics @@ -30,12 +38,23 @@ all: $(PROGS) clean: /bin/rm -f $(PROGS) $(OBJ) + +uc2.o: uc2.cpp + $(CXX) $(CXXFLAGS) -c uc2.cpp + +ttfont.o: $(BOINC_API_DIR)/ttfont.cpp + $(CXX) $(CXXFLAGS) -c $(BOINC_API_DIR)/ttfont.cpp + +uc2_graphics.o: uc2_graphics.cpp + $(CXX) $(CXXFLAGS) -c uc2_graphics.cpp uc2: uc2.o $(BOINC_BUILD_DIR)/libboinc_api.a $(BOINC_BUILD_DIR)/libboinc.a $(CXX) $(LDFLAGS) $(CXXFLAGS) -o uc2 uc2.o -lboinc_api -lboinc -uc2_graphics: uc2_graphics.o $(BOINC_BUILD_DIR)/libboinc.a $(BOINC_BUILD_DIR)/libboinc_graphics2.a - $(CXX) $(CXXFLAGS) $(LDFLAGS) -o uc2_graphics uc2_graphics.o\ - -lboinc_graphics2 -lboinc_api -lboinc -ljpeg\ +uc2_graphics: uc2_graphics.o ttfont.o $(BOINC_BUILD_DIR)/libboinc.a\ + $(BOINC_BUILD_DIR)/libboinc_graphics2.a\ + $(FREETYPE_DIR/objs/.libs/libfreetype.a $(FTGL_DIR)/src/.libs/libftgl.a + $(CXX) $(CXXFLAGS) $(LDFLAGS) -o uc2_graphics uc2_graphics.o ttfont.o\ + -lboinc_graphics2 -lboinc_api -lboinc -ljpeg -lfreetype -lftgl -lz -lbz2\ -framework AppKit -framework GLUT -framework OpenGL \ No newline at end of file diff --git a/samples/example_app/Makefile_mac2 b/samples/example_app/Makefile_mac2 index 88c6860b09..5b402d5c9b 100644 --- a/samples/example_app/Makefile_mac2 +++ b/samples/example_app/Makefile_mac2 @@ -1,5 +1,6 @@ # stand-alone makefile for uc2 BOINC example application on Macintosh. # Updated 7/11/12 for OS 10.7 and XCode 4.3 +# Updated 8/3/12 for TrueType fonts # BOINC_DIR = ../.. @@ -7,6 +8,8 @@ BOINC_API_DIR = $(BOINC_DIR)/api BOINC_LIB_DIR = $(BOINC_DIR)/lib BOINC_BUILD_DIR = $(BOINC_DIR)/mac_build/build/Deployment BOINC_CONFIG_DIR = $(BOINC_DIR)/clientgui/mac +FREETYPE_DIR = $(BOINC_DIR)/../freetype-2.4.10 +FTGL_DIR = $(BOINC_DIR)/../ftgl-2.1.3~rc5 FRAMEWORKS_DIR = /System/Library/Frameworks CXXFLAGS_ALL = \ @@ -16,23 +19,31 @@ CXXFLAGS_ALL = \ -I$(BOINC_DIR) \ -I$(BOINC_LIB_DIR) \ -I$(BOINC_API_DIR) \ - -L$(BOINC_BUILD_DIR) \ - -L/usr/lib \ - -L. + -I$(FREETYPE_DIR)/include \ + -I$(FTGL_DIR)/src + +LDFLAGS_ALL = \ + -Wl,-L$(BOINC_BUILD_DIR) \ + -Wl,-L$(FREETYPE_DIR)/objs/.libs \ + -Wl,-L$(FTGL_DIR)/src/.libs \ + -Wl,-L/usr/lib \ + -Wl,-L. CXXFLAGS_i386 = -arch i386 -DMAC_OS_X_VERSION_MAX_ALLOWED=1040 -DMAC_OS_X_VERSION_MIN_REQUIRED=1040 \ $(CXXFLAGS_ALL) -fvisibility=hidden -fvisibility-inlines-hidden -LDFLAGS_i386 = -Wl,-arch,i386 +LDFLAGS_i386 = -Wl,-arch,i386 $(LDFLAGS_ALL) CXXFLAGS_x86_64 = -arch x86_64 -DMAC_OS_X_VERSION_MAX_ALLOWED=1050 -DMAC_OS_X_VERSION_MIN_REQUIRED=1050 \ $(CXXFLAGS_ALL) -fvisibility=hidden -fvisibility-inlines-hidden -LDFLAGS_x86_64 = -Wl,-arch,x86_64 +LDFLAGS_x86_64 = -Wl,-arch,x86_64 $(LDFLAGS_ALL) OBJ = \ uc2_i386.o \ + ttfont_i386.o \ uc2_graphics_i386.o \ uc2_x86_64.o \ + ttfont_x86_64.o \ uc2_graphics_x86_64.o \ PROGS = uc2_i386 uc2_graphics_i386 uc2_x86_64 uc2_graphics_x86_64 @@ -51,6 +62,9 @@ target uc2_i386.0: MACOSX_DEPLOYMENT_TARGET=10.4 uc2_i386.o: uc2.cpp $(CXX) -c $(CXXFLAGS_i386) uc2.cpp -o uc2_i386.o +ttfont_i386.o: $(BOINC_API_DIR)/ttfont.cpp + $(CXX) -c $(CXXFLAGS_i386) $(BOINC_API_DIR)/ttfont.cpp -o ttfont_i386.o + uc2_graphics_i386.o: uc2_graphics.cpp $(CXX) -c $(CXXFLAGS_i386) uc2_graphics.cpp -o uc2_graphics_i386.o @@ -58,22 +72,28 @@ target uc2_x86_64: MACOSX_DEPLOYMENT_TARGET=10.5 uc2_x86_64.o: uc2.cpp $(CXX) -c $(CXXFLAGS_x86_64) uc2.cpp -o uc2_x86_64.o +ttfont_x86_64.o: $(BOINC_API_DIR)/ttfont.cpp + $(CXX) -c $(CXXFLAGS_x86_64) $(BOINC_API_DIR)/ttfont.cpp -o ttfont_x86_64.o + uc2_graphics_x86_64.o: uc2_graphics.cpp $(CXX) -c $(CXXFLAGS_x86_64) uc2_graphics.cpp -o uc2_graphics_x86_64.o uc2_i386: uc2_i386.o $(BOINC_BUILD_DIR)/libboinc_api.a $(BOINC_BUILD_DIR)/libboinc.a $(CXX) $(CXXFLAGS_i386) $(LDFLAGS_i386) -o uc2_i386 uc2_i386.o -lboinc_api -lboinc -uc2_graphics_i386: uc2_graphics_i386.o $(BOINC_BUILD_DIR)/libboinc.a $(BOINC_BUILD_DIR)/libboinc_graphics2.a +uc2_graphics_i386: uc2_graphics_i386.o ttfont_i386.o $(BOINC_BUILD_DIR)/libboinc.a\ + $(BOINC_BUILD_DIR)/libboinc_graphics2.a $(FREETYPE_DIR/objs/.libs/libfreetype.a\ + $(FTGL_DIR)/src/.libs/libftgl.a $(CXX) $(CXXFLAGS_i386) $(LDFLAGS_i386) -o uc2_graphics_i386 uc2_graphics_i386.o\ - -lboinc_graphics2 -lboinc_api -lboinc -ljpeg \ - -framework AppKit -framework GLUT -framework OpenGL + ttfont_i386.o -lboinc_graphics2 -lboinc_api -lboinc -ljpeg -lfreetype -lftgl -lz\ + -lbz2 -framework AppKit -framework GLUT -framework OpenGL uc2_x86_64: uc2_x86_64.o $(BOINC_BUILD_DIR)/libboinc_api.a $(BOINC_BUILD_DIR)/libboinc.a $(CXX) $(CXXFLAGS_x86_64) $(LDFLAGS_x86_64) -o uc2_x86_64 uc2_x86_64.o -lboinc_api -lboinc -uc2_graphics_x86_64: uc2_graphics_x86_64.o $(BOINC_BUILD_DIR)/libboinc.a $(BOINC_BUILD_DIR)/libboinc_graphics2.a - $(CXX) $(CXXFLAGS_x86_64) $(LDFLAGS_x86_64) -o uc2_graphics_x86_64 uc2_graphics_x86_64.o\ - -lboinc_graphics2 -lboinc_api -lboinc -ljpeg \ - -framework AppKit -framework GLUT -framework OpenGL - +uc2_graphics_x86_64: uc2_graphics_x86_64.o ttfont_x86_64.o $(BOINC_BUILD_DIR)/libboinc.a\ + $(BOINC_BUILD_DIR)/libboinc_graphics2.a $(FREETYPE_DIR/objs/.libs/libfreetype.a\ + $(FTGL_DIR)/src/.libs/libftgl.a + $(CXX) $(CXXFLAGS_x86_64) $(LDFLAGS_x86_64) -o uc2_graphics_x86_64\ + uc2_graphics_x86_64.o ttfont_x86_64.o -lboinc_graphics2 -lboinc_api -lboinc -ljpeg\ + -lfreetype -lftgl -lz -lbz2 -framework AppKit -framework GLUT -framework OpenGL diff --git a/samples/example_app/uc2_graphics.cpp b/samples/example_app/uc2_graphics.cpp index 85ffca5285..a5b18c24c6 100644 --- a/samples/example_app/uc2_graphics.cpp +++ b/samples/example_app/uc2_graphics.cpp @@ -1,6 +1,6 @@ // This file is part of BOINC. // http://boinc.berkeley.edu -// Copyright (C) 2008 University of California +// Copyright (C) 2012 University of California // // BOINC is free software; you can redistribute it and/or modify it // under the terms of the GNU Lesser General Public License @@ -22,6 +22,13 @@ // (in this case, select colors) // - handle mouse input (in this case, to zoom and rotate) // - draw text and 3D objects using OpenGL +// +// - Expects TrueType font 0 (by default, LiberationSans-Regular.ttf) +// to be in the current directory. +// - Must be linked with api/ttfont.cpp, libfreetype.a and libftgl.a. +// (libfreetype.a may also require linking with -lz and -lbz2.) +// See comments at top of api/ttfont.cpp for more information. +// #ifdef _WIN32 #include "boinc_win.h" @@ -36,7 +43,7 @@ #include "app_ipc.h" #include "boinc_api.h" #include "graphics2.h" -#include "txf_util.h" +#include "ttfont.h" #include "uc2.h" #include "diagnostics.h" @@ -44,6 +51,9 @@ #include "mac/app_icon.h" #endif +using TTFont::ttf_render_string; +using TTFont::ttf_load_fonts; + float white[4] = {1., 1., 1., 1.}; TEXTURE_DESC logo; int width, height; // window dimensions @@ -82,31 +92,31 @@ static void draw_text() { x += dx; y += dy; if (x < 0 || x > .5) dx *= -1; - if (y < 0 || y > .5) dy *= -1; + if (y < 0 || y > .4) dy *= -1; double fd = 0, cpu=0, dt; if (shmem) { fd = shmem->fraction_done; cpu = shmem->cpu_time; } sprintf(buf, "User: %s", uc_aid.user_name); - txf_render_string(.1, x, y, 0, 500, white, 0, buf); + ttf_render_string(x, y, 0, 500, white, buf); sprintf(buf, "Team: %s", uc_aid.team_name); - txf_render_string(.1, x, y+.1, 0, 500, white, 0, buf); + ttf_render_string(x, y+.1, 0, 500, white, buf); sprintf(buf, "%% Done: %f", 100*fd); - txf_render_string(.1, x, y+.2, 0, 500, white, 0, buf); + ttf_render_string(x, y+.2, 0, 500, white, buf); sprintf(buf, "CPU time: %f", cpu); - txf_render_string(.1, x, y+.3, 0, 500, white, 0, buf); + ttf_render_string(x, y+.3, 0, 500, white, buf); if (shmem) { dt = dtime() - shmem->update_time; if (dt > 10) { boinc_close_window_and_quit("shmem not updated"); } else if (dt > 5) { - txf_render_string(.1, 0, 0, 0, 500, white, 0, (char*)"App not running - exiting in 5 seconds"); + ttf_render_string(0, 0, 0, 500, white, (char*)"App not running - exiting in 5 seconds"); } else if (shmem->status.suspended) { - txf_render_string(.1, 0, 0, 0, 500, white, 0, (char*)"App suspended"); + ttf_render_string(0, 0, 0, 500, white, (char*)"App suspended"); } } else { - txf_render_string(.1, 0, 0, 0, 500, white, 0, (char*)"No shared mem"); + ttf_render_string(0, 0, 0, 500, white, (char*)"No shared mem"); } } @@ -236,7 +246,7 @@ void app_graphics_init() { glClearColor(0.0f, 0.0f, 0.0f, 0.0f); - txf_load_fonts((char*)"."); + ttf_load_fonts("."); boinc_resolve_filename((char*)"logo.jpg", path, sizeof(path)); logo.load_image_file(path); diff --git a/samples/mac_build/UpperCase2.xcodeproj/project.pbxproj b/samples/mac_build/UpperCase2.xcodeproj/project.pbxproj index 4cc86fc969..f6eb14e806 100644 --- a/samples/mac_build/UpperCase2.xcodeproj/project.pbxproj +++ b/samples/mac_build/UpperCase2.xcodeproj/project.pbxproj @@ -146,6 +146,8 @@ DDC479B015AC56EB0022401F /* AppKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DD760E65094E56DB002CACC4 /* AppKit.framework */; }; DDC479B115AC56EB0022401F /* GLUT.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DD760E66094E56DB002CACC4 /* GLUT.framework */; }; DDC479B215AC56EB0022401F /* OpenGL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DD760E67094E56DB002CACC4 /* OpenGL.framework */; }; + DDF8050515CB9C75005473CC /* ttfont.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DDF8050315CB9C75005473CC /* ttfont.cpp */; }; + DDF8050615CB9C75005473CC /* ttfont.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DDF8050315CB9C75005473CC /* ttfont.cpp */; }; /* End PBXBuildFile section */ /* Begin PBXBuildRule section */ @@ -356,6 +358,8 @@ DD84C6F90C856C0E000EBEC4 /* uc2.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = uc2.h; path = ../example_app/uc2.h; sourceTree = SOURCE_ROOT; }; DDC4797515AC56CA0022401F /* UC2_x86_64-apple-darwin */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = "UC2_x86_64-apple-darwin"; sourceTree = BUILT_PRODUCTS_DIR; }; DDC479BB15AC56EB0022401F /* UC2_graphics_x86_64-apple-darwin */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = "UC2_graphics_x86_64-apple-darwin"; sourceTree = BUILT_PRODUCTS_DIR; }; + DDF8050315CB9C75005473CC /* ttfont.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = ttfont.cpp; path = ../../api/ttfont.cpp; sourceTree = ""; }; + DDF8050415CB9C75005473CC /* ttfont.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ttfont.h; path = ../../api/ttfont.h; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -420,6 +424,7 @@ DD1194B10F42CB5400C2BC25 /* uc2.cpp */, DD84C6F90C856C0E000EBEC4 /* uc2.h */, DD00F66509EBA9320024857D /* jpeg */, + DDF8050715CB9C88005473CC /* api */, ); name = Source; sourceTree = ""; @@ -526,6 +531,15 @@ name = "External Frameworks and Libraries"; sourceTree = ""; }; + DDF8050715CB9C88005473CC /* api */ = { + isa = PBXGroup; + children = ( + DDF8050415CB9C75005473CC /* ttfont.h */, + DDF8050315CB9C75005473CC /* ttfont.cpp */, + ); + name = api; + sourceTree = ""; + }; /* End PBXGroup section */ /* Begin PBXNativeTarget section */ @@ -763,6 +777,7 @@ DD84C6DC0C856B36000EBEC4 /* rdswitch.c in Sources */, DD84C6DD0C856B36000EBEC4 /* rdtarga.c in Sources */, DD1194B00F42CB4900C2BC25 /* uc2_graphics.cpp in Sources */, + DDF8050515CB9C75005473CC /* ttfont.cpp in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -832,6 +847,7 @@ DDC479AC15AC56EB0022401F /* rdswitch.c in Sources */, DDC479AD15AC56EB0022401F /* rdtarga.c in Sources */, DDC479AE15AC56EB0022401F /* uc2_graphics.cpp in Sources */, + DDF8050615CB9C75005473CC /* ttfont.cpp in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -952,7 +968,11 @@ GCC_SYMBOLS_PRIVATE_EXTERN = YES; GCC_WARN_ABOUT_RETURN_TYPE = YES; GCC_WARN_UNUSED_VARIABLE = YES; - HEADER_SEARCH_PATHS = "../../**"; + HEADER_SEARCH_PATHS = ( + "../../../freetype-2.4.10/include", + "../../../ftgl-2.1.3~rc5/src", + "../../**", + ); INSTALL_PATH = "$(HOME)/bin"; LIBRARY_SEARCH_PATHS = ../../mac_build/build/Development/; OTHER_CFLAGS = ( @@ -964,9 +984,22 @@ "-lboinc_api", "-lboinc_graphics2", "-lboinc", + "../../../freetype-2.4.10/objs/.libs/libfreetype.a", + "../../../ftgl-2.1.3~rc5/src/.libs/libftgl.a", + "-lz", + "-lbz2", ); PREBINDING = NO; PRODUCT_NAME = "uc2_graphics_i686-apple-darwin"; + WARNING_LDFLAGS = ( + "-lboinc_api", + "-lboinc_graphics2", + "-lboinc", + "../../../freetype-2.4.10/objs/.libs/libfreetype.a", + "../../../ftgl-2.1.3~rc5/src/.libs/libftgl.a", + "-lz", + "-lbz2", + ); ZERO_LINK = NO; }; name = Debug; @@ -980,7 +1013,11 @@ GCC_SYMBOLS_PRIVATE_EXTERN = YES; GCC_WARN_ABOUT_RETURN_TYPE = YES; GCC_WARN_UNUSED_VARIABLE = YES; - HEADER_SEARCH_PATHS = "../../**"; + HEADER_SEARCH_PATHS = ( + "../../../freetype-2.4.10/include", + "../../../ftgl-2.1.3~rc5/src", + "../../**", + ); INSTALL_PATH = "$(HOME)/bin"; LIBRARY_SEARCH_PATHS = ../../mac_build/build/Deployment/; OTHER_CFLAGS = ( @@ -992,9 +1029,22 @@ "-lboinc_api", "-lboinc_graphics2", "-lboinc", + "../../../freetype-2.4.10/objs/.libs/libfreetype.a", + "../../../ftgl-2.1.3~rc5/src/.libs/libftgl.a", + "-lz", + "-lbz2", ); PREBINDING = NO; PRODUCT_NAME = "uc2_graphics_i686-apple-darwin"; + WARNING_LDFLAGS = ( + "-lboinc_api", + "-lboinc_graphics2", + "-lboinc", + "../../../freetype-2.4.10/objs/.libs/libfreetype.a", + "../../../ftgl-2.1.3~rc5/src/.libs/libftgl.a", + "-lz", + "-lbz2", + ); ZERO_LINK = NO; }; name = Release; @@ -1070,7 +1120,11 @@ GCC_SYMBOLS_PRIVATE_EXTERN = YES; GCC_WARN_ABOUT_RETURN_TYPE = YES; GCC_WARN_UNUSED_VARIABLE = YES; - HEADER_SEARCH_PATHS = "../../**"; + HEADER_SEARCH_PATHS = ( + "../../../freetype-2.4.10/include", + "../../../ftgl-2.1.3~rc5/src", + "../../**", + ); INSTALL_PATH = "$(HOME)/bin"; LIBRARY_SEARCH_PATHS = ../../mac_build/build/Development/; OTHER_CFLAGS = ( @@ -1082,6 +1136,10 @@ "-lboinc_api", "-lboinc_graphics2", "-lboinc", + "../../../freetype-2.4.10/objs/.libs/libfreetype.a", + "../../../ftgl-2.1.3~rc5/src/.libs/libftgl.a", + "-lz", + "-lbz2", ); PREBINDING = NO; PRODUCT_NAME = "UC2_graphics_x86_64-apple-darwin"; @@ -1100,7 +1158,11 @@ GCC_SYMBOLS_PRIVATE_EXTERN = YES; GCC_WARN_ABOUT_RETURN_TYPE = YES; GCC_WARN_UNUSED_VARIABLE = YES; - HEADER_SEARCH_PATHS = "../../**"; + HEADER_SEARCH_PATHS = ( + "../../../freetype-2.4.10/include", + "../../../ftgl-2.1.3~rc5/src", + "../../**", + ); INSTALL_PATH = "$(HOME)/bin"; LIBRARY_SEARCH_PATHS = ../../mac_build/build/Deployment/; OTHER_CFLAGS = ( @@ -1112,6 +1174,10 @@ "-lboinc_api", "-lboinc_graphics2", "-lboinc", + "../../../freetype-2.4.10/objs/.libs/libfreetype.a", + "../../../ftgl-2.1.3~rc5/src/.libs/libftgl.a", + "-lz", + "-lbz2", ); PREBINDING = NO; PRODUCT_NAME = "UC2_graphics_x86_64-apple-darwin";