diff --git a/checkin_notes b/checkin_notes index 6838bd1164..24c11d0f97 100755 --- a/checkin_notes +++ b/checkin_notes @@ -915,7 +915,15 @@ Walt 19 Jan 2007 BOINCBaseFrame.cpp 2019 Jan 2007 MGR: wxPieCtrl changes from Frank Wieler. + MAC: Set up XCode project so Development builds can optionally use wxMac-2.8.8 + Debug build. Add "#define USE_DEBUG_WXMAC 0" to precompiled header file. + See comments at top of MacGUI.pch for instructions to enable or disable this. clientgui/ common/ wxPieCtrl.cpp + mac/ + MacGUI.pch + mac_build/ + boinc.xcodeproj/ + project.pbxproj diff --git a/clientgui/mac/MacGUI.pch b/clientgui/mac/MacGUI.pch index 4023801962..e3181c024a 100644 --- a/clientgui/mac/MacGUI.pch +++ b/clientgui/mac/MacGUI.pch @@ -27,14 +27,33 @@ * MacGUI.pch * BOINCManager precompiled headers file for Mac */ + +// To use the Development (Debug) build of wxMac (allows stepping into wxMac +// source code, enables debug, trace, Asserts, etc.): +// (1) Set USE_DEBUG_WXMAC to 0 +// (2) Select Development build configuration +// (3) Select mgr_boinc target +// (4) In Xcode's View menu, set "Groups & Files Column > Target Membership" on +// (5) In the XCode project's Groups and Files column: +// uncheck "External Frameworks and Libraries/libwx_mac_static.a" +// (6) In the XCode project's Groups and Files column: +// check "External Frameworks and Libraries/wxMac-BOINC.xcodeproj/libwx_mac_static.a" +// +// This will have no effect on the BOINC Manager Deployment build, which will still +// use the wxMac Deployment build. +// +// To use the wxMac Deployment build even in BOINC Manager Development builds, reverse +// the above steps (setting USE_DEBUG_WXMAC to 0, etc.) + +#define USE_DEBUG_WXMAC 0 #define WX_PRECOMP #define HAVE_SSIZE_T -#ifdef _DEBUG +#if (defined(_DEBUG) && (! USE_DEBUG_WXMAC)) -#undef _DEBUG // so we don't have to link wih debug Wx libs +#undef _DEBUG // so we can link with Deployment Wx libs #undef __WXDEBUG__ #include "stdwx.h" @@ -42,11 +61,11 @@ #define _DEBUG // Redefine _DEBUG for the rest of the code #define __WXDEBUG__ -#else // _DEBUG +#else // ! (defined(_DEBUG) && (! USE_DEBUG_WXMAC)) #include "stdwx.h" -#endif // ! _DEBUG +#endif // ! (defined(_DEBUG) && (! USE_DEBUG_WXMAC)) #include "config.h" diff --git a/mac_build/boinc.xcodeproj/project.pbxproj b/mac_build/boinc.xcodeproj/project.pbxproj index e801d495d6..48b95d11d0 100755 --- a/mac_build/boinc.xcodeproj/project.pbxproj +++ b/mac_build/boinc.xcodeproj/project.pbxproj @@ -211,7 +211,7 @@ DDA12A6D0A36974600FBDD12 /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DD1929D80918A2F100C31BCF /* Security.framework */; }; DDA12AA20A369B5500FBDD12 /* SetupSecurity.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DD7748B40A356D6C0025D05E /* SetupSecurity.cpp */; }; DDA12AAE0A369C5800FBDD12 /* SecurityUtility.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DDA12AAD0A369C5800FBDD12 /* SecurityUtility.cpp */; }; - DDA8F6F20B5E3D61004800EF /* libwx_mac_static.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DDA8F6F10B5E3D61004800EF /* libwx_mac_static.a */; }; + DDA90F540B646C91008F2E87 /* libwx_mac_static.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DDA90F260B64673D008F2E87 /* libwx_mac_static.a */; }; DDAEC9FF07FA5A5C00A7BC36 /* SetVersion.C in Sources */ = {isa = PBXBuildFile; fileRef = DDAEC9E707FA58A000A7BC36 /* SetVersion.C */; }; DDB693500ABFE9C600689FD8 /* procinfo_mac.C in Sources */ = {isa = PBXBuildFile; fileRef = DDB6934F0ABFE9C600689FD8 /* procinfo_mac.C */; }; DDCDCDF40B532433009BB03C /* ViewMessagesGrid.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DDCDCDF00B532433009BB03C /* ViewMessagesGrid.cpp */; }; @@ -704,6 +704,20 @@ remoteGlobalIDString = DD7748970A356C880025D05E; remoteInfo = SetUpSecurity; }; + DDA90E980B646172008F2E87 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = DDA90E8F0B646172008F2E87 /* wxMac-BOINC.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 4086C8CB063AB30000D4CD53; + remoteInfo = static; + }; + DDA90E9A0B646172008F2E87 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = DDA90E8F0B646172008F2E87 /* wxMac-BOINC.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 4086CBE1063AB30000D4CD53; + remoteInfo = dynamic; + }; DDAD19CC09090824004E7DD0 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 20286C28FDCF999611CA2CEA /* Project object */; @@ -1029,7 +1043,8 @@ DD9C94A30A5A3A4100AB0D10 /* BOINCBaseFrame.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = BOINCBaseFrame.h; path = ../clientgui/BOINCBaseFrame.h; sourceTree = SOURCE_ROOT; }; DDA12A910A369AB500FBDD12 /* SetupSecurity.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SetupSecurity.h; path = ../clientgui/mac/SetupSecurity.h; sourceTree = SOURCE_ROOT; }; DDA12AAD0A369C5800FBDD12 /* SecurityUtility.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = SecurityUtility.cpp; path = ../clientgui/mac/SecurityUtility.cpp; sourceTree = SOURCE_ROOT; }; - DDA8F6F10B5E3D61004800EF /* libwx_mac_static.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libwx_mac_static.a; path = "../../wxMac-2.8.0/src/build/Deployment/libwx_mac_static.a"; sourceTree = SOURCE_ROOT; }; + DDA90E8F0B646172008F2E87 /* wxMac-BOINC.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = "wxMac-BOINC.xcodeproj"; path = "../../wxMac-2.8.0/src/wxMac-BOINC.xcodeproj"; sourceTree = SOURCE_ROOT; }; + DDA90F260B64673D008F2E87 /* libwx_mac_static.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libwx_mac_static.a; path = "../../wxMac-2.8.0/src/build/Deployment/libwx_mac_static.a"; sourceTree = SOURCE_ROOT; }; DDA9D3BB09189A8C0060E7A7 /* Mac_GUI.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = Mac_GUI.cpp; path = ../clientgui/mac/Mac_GUI.cpp; sourceTree = SOURCE_ROOT; }; DDAEC9E107FA583B00A7BC36 /* SetVersion */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = SetVersion; sourceTree = BUILT_PRODUCTS_DIR; }; DDAEC9E707FA58A000A7BC36 /* SetVersion.C */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = SetVersion.C; path = ../clientgui/mac/SetVersion.C; sourceTree = SOURCE_ROOT; }; @@ -1163,8 +1178,8 @@ DD3E15310A774397007E0084 /* Carbon.framework in Frameworks */, DD3E15320A774397007E0084 /* IOKit.framework in Frameworks */, DD3E15330A774397007E0084 /* Security.framework in Frameworks */, - DDA8F6F20B5E3D61004800EF /* libwx_mac_static.a in Frameworks */, DDFE854B0B60CFD0009B43D9 /* AppKit.framework in Frameworks */, + DDA90F540B646C91008F2E87 /* libwx_mac_static.a in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -1327,7 +1342,8 @@ 20286C33FDCF999611CA2CEA /* Carbon.framework */, DD7C5E7508110AE3002FCE1E /* ScreenSaver.framework */, DD1929D80918A2F100C31BCF /* Security.framework */, - DDA8F6F10B5E3D61004800EF /* libwx_mac_static.a */, + DDA90F260B64673D008F2E87 /* libwx_mac_static.a */, + DDA90E8F0B646172008F2E87 /* wxMac-BOINC.xcodeproj */, ); name = "External Frameworks and Libraries"; sourceTree = SOURCE_ROOT; @@ -1507,6 +1523,15 @@ path = ../clientgui; sourceTree = SOURCE_ROOT; }; + DDA90E900B646172008F2E87 /* Products */ = { + isa = PBXGroup; + children = ( + DDA90E990B646172008F2E87 /* libwx_mac_static.a */, + DDA90E9B0B646172008F2E87 /* libwx_mac.dylib */, + ); + name = Products; + sourceTree = ""; + }; DDCE78220A70BD29008218B6 /* common */ = { isa = PBXGroup; children = ( @@ -2057,6 +2082,12 @@ hasScannedForEncodings = 1; mainGroup = 20286C29FDCF999611CA2CEA /* «PROJECTNAME» */; projectDirPath = ""; + projectReferences = ( + { + ProductGroup = DDA90E900B646172008F2E87 /* Products */; + ProjectRef = DDA90E8F0B646172008F2E87 /* wxMac-BOINC.xcodeproj */; + }, + ); targets = ( DDBD680D07FA82BB0082C20D /* Build_All */, DDD74D8607CF482E0065AC9D /* BOINC_Client */, @@ -2079,6 +2110,23 @@ }; /* End PBXProject section */ +/* Begin PBXReferenceProxy section */ + DDA90E990B646172008F2E87 /* libwx_mac_static.a */ = { + isa = PBXReferenceProxy; + fileType = archive.ar; + path = libwx_mac_static.a; + remoteRef = DDA90E980B646172008F2E87 /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + DDA90E9B0B646172008F2E87 /* libwx_mac.dylib */ = { + isa = PBXReferenceProxy; + fileType = "compiled.mach-o.dylib"; + path = libwx_mac.dylib; + remoteRef = DDA90E9A0B646172008F2E87 /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; +/* End PBXReferenceProxy section */ + /* Begin PBXResourcesBuildPhase section */ DD1277AF081F3D67007B5DE1 /* Resources */ = { isa = PBXResourcesBuildPhase; @@ -2950,8 +2998,10 @@ "../../wxMac-2.8.0/src/build/Deployment/", ../lib, "$(LIBRARY_SEARCH_PATHS_QUOTED_1)", + "$(LIBRARY_SEARCH_PATHS_QUOTED_2)", ); LIBRARY_SEARCH_PATHS_QUOTED_1 = "\"$(SRCROOT)/../../wxMac-2.8.0/src/build/Deployment\""; + LIBRARY_SEARCH_PATHS_QUOTED_2 = "\"$(SRCROOT)/../../wxMac-2.8.0/src/build/Deployment\""; MACOSX_DEPLOYMENT_TARGET = ""; OPTIMIZATION_CFLAGS = "-O0"; OTHER_CFLAGS = ( @@ -3012,8 +3062,10 @@ "../../wxMac-2.8.0/src/build/Deployment/", ../lib, "$(LIBRARY_SEARCH_PATHS_QUOTED_1)", + "$(LIBRARY_SEARCH_PATHS_QUOTED_2)", ); LIBRARY_SEARCH_PATHS_QUOTED_1 = "\"$(SRCROOT)/../../wxMac-2.8.0/src/build/Deployment\""; + LIBRARY_SEARCH_PATHS_QUOTED_2 = "\"$(SRCROOT)/../../wxMac-2.8.0/src/build/Deployment\""; MACOSX_DEPLOYMENT_TARGET = 10.3; OTHER_CFLAGS = ( "-DMAC_OS_X_VERSION_MAX_ALLOWED=1030", @@ -3072,8 +3124,10 @@ "../../wxMac-2.8.0/src/build/Deployment/", ../lib, "$(LIBRARY_SEARCH_PATHS_QUOTED_1)", + "$(LIBRARY_SEARCH_PATHS_QUOTED_2)", ); LIBRARY_SEARCH_PATHS_QUOTED_1 = "\"$(SRCROOT)/../../wxMac-2.8.0/src/build/Deployment\""; + LIBRARY_SEARCH_PATHS_QUOTED_2 = "\"$(SRCROOT)/../../wxMac-2.8.0/src/build/Deployment\""; MACOSX_DEPLOYMENT_TARGET = 10.4; OTHER_CFLAGS = ( "-DMAC_OS_X_VERSION_MAX_ALLOWED=1040", @@ -3132,8 +3186,10 @@ "../../wxMac-2.8.0/src/build/Deployment/", ../lib, "$(LIBRARY_SEARCH_PATHS_QUOTED_1)", + "$(LIBRARY_SEARCH_PATHS_QUOTED_2)", ); LIBRARY_SEARCH_PATHS_QUOTED_1 = "\"$(SRCROOT)/../../wxMac-2.8.0/src/build/Deployment\""; + LIBRARY_SEARCH_PATHS_QUOTED_2 = "\"$(SRCROOT)/../../wxMac-2.8.0/src/build/Deployment\""; MACOSX_DEPLOYMENT_TARGET = 10.4; OTHER_CFLAGS = ( "-DHAVE_CONFIG_H", @@ -4085,8 +4141,10 @@ "../../wxMac-2.8.0/src/build/Deployment/", ../lib, "$(LIBRARY_SEARCH_PATHS_QUOTED_1)", + "$(LIBRARY_SEARCH_PATHS_QUOTED_2)", ); LIBRARY_SEARCH_PATHS_QUOTED_1 = "\"$(SRCROOT)/../../wxMac-2.8.0/src/build/Deployment\""; + LIBRARY_SEARCH_PATHS_QUOTED_2 = "\"$(SRCROOT)/../../wxMac-2.8.0/src/build/Deployment\""; MACOSX_DEPLOYMENT_TARGET = ""; OPTIMIZATION_CFLAGS = "-O0"; OTHER_CFLAGS = ( @@ -4146,8 +4204,10 @@ "../../wxMac-2.8.0/src/build/Deployment/", ../lib, "$(LIBRARY_SEARCH_PATHS_QUOTED_1)", + "$(LIBRARY_SEARCH_PATHS_QUOTED_2)", ); LIBRARY_SEARCH_PATHS_QUOTED_1 = "\"$(SRCROOT)/../../wxMac-2.8.0/src/build/Deployment\""; + LIBRARY_SEARCH_PATHS_QUOTED_2 = "\"$(SRCROOT)/../../wxMac-2.8.0/src/build/Deployment\""; MACOSX_DEPLOYMENT_TARGET = 10.4; OTHER_CFLAGS = ( "-DHAVE_CONFIG_H",