From facd3c4bb50110cb82cae308d7812a1745ec6fb3 Mon Sep 17 00:00:00 2001
From: Charlie Fenton <charlief@example.com>
Date: Fri, 20 May 2005 08:05:01 +0000
Subject: [PATCH] *** empty log message ***

svn path=/trunk/boinc/; revision=6199
---
 checkin_notes                          |  8 +++++++
 mac_build/boinc.pbproj/project.pbxproj | 32 ++------------------------
 2 files changed, 10 insertions(+), 30 deletions(-)

diff --git a/checkin_notes b/checkin_notes
index d1b2fed52e..439ca99b03 100755
--- a/checkin_notes
+++ b/checkin_notes
@@ -6776,3 +6776,11 @@ David  19 May 2005
         app_control.C
         cs_scheduler.C
         gui_rpc_server.C
+
+Charlie    20 May 2005
+	Mac: Change how wxWidgets libraries are linked so the static 
+        versions are used even if the dynamic libraries are present.
+
+    mac_build/
+        boinc.pbproj/
+            project.pbxproj
diff --git a/mac_build/boinc.pbproj/project.pbxproj b/mac_build/boinc.pbproj/project.pbxproj
index 11282a2448..fe17b36d59 100755
--- a/mac_build/boinc.pbproj/project.pbxproj
+++ b/mac_build/boinc.pbproj/project.pbxproj
@@ -339,10 +339,6 @@
 			buildActionMask = 2147483647;
 			files = (
 				DD40D05107F03A030096C645,
-				DD130C1F0820C1ED001A0291,
-				DD130C220820C21F001A0291,
-				DD130C240820C234001A0291,
-				DD130C260820C26B001A0291,
 			);
 			isa = PBXFrameworksBuildPhase;
 			runOnlyForDeploymentPostprocessing = 0;
@@ -366,11 +362,11 @@
 				HEADER_SEARCH_PATHS = "../wx_lib/wx/include/mac-ansi-release-static-2.6 ../wxinclude";
 				INFOPLIST_FILE = Info.plist;
 				INSTALL_PATH = "$(USER_APPS_DIR)";
-				LIBRARY_SEARCH_PATHS = "../wx_lib ../lib /usr/lib/gcc/darwin/3.3 /Volumes/Moon/BOINC_Mac/wxMac-2.6.0/osx-build/lib";
+				LIBRARY_SEARCH_PATHS = "../wx_lib ../lib /usr/lib/gcc/darwin/3.3";
 				MACOSX_DEPLOYMENT_TARGET = 10.3;
 				OTHER_CFLAGS = "-DMAC_OS_X_VERSION_MAX_ALLOWED=1030 -DHAVE_CONFIG_H -D_FILE_OFFSET_BITS=64 -D_LARGE_FILES -DNO_GCC_PRAGMA -DNOCLIPBOARD -D_THREAD_SAFE -D__WXMAC__ -DHAVE_STRCASECMP_IN_STRING_H";
 				OTHER_CPLUSPLUSFLAGS = "-DMAC_OS_X_VERSION_MAX_ALLOWED=1030 -DHAVE_CONFIG_H -D_FILE_OFFSET_BITS=64 -D_LARGE_FILES -DNO_GCC_PRAGMA -DNOCLIPBOARD -D_THREAD_SAFE -D__WXMAC__ -DHAVE_STRCASECMP_IN_STRING_H";
-				OTHER_LDFLAGS = "-D_THREAD_SAFE -lz -lpthread -liconv -lz -lm";
+				OTHER_LDFLAGS = "-D_THREAD_SAFE ../wx_lib/libwx_base_carbon_net-2.6.a ../wx_lib/libwx_base_carbon-2.6.a ../wx_lib/libwx_mac_adv-2.6.a ../wx_lib/libwx_mac_core-2.6.a -lz -lpthread -liconv -lz -lm";
 				OTHER_REZFLAGS = "";
 				PRODUCT_NAME = BOINCManager;
 				SECTORDER_FLAGS = "";
@@ -845,30 +841,6 @@
 			refType = 2;
 			sourceTree = SOURCE_ROOT;
 		};
-		DD130C1F0820C1ED001A0291 = {
-			fileRef = DD6F71B2081E509200F5B280;
-			isa = PBXBuildFile;
-			settings = {
-			};
-		};
-		DD130C220820C21F001A0291 = {
-			fileRef = DD6F71BB081E509200F5B280;
-			isa = PBXBuildFile;
-			settings = {
-			};
-		};
-		DD130C240820C234001A0291 = {
-			fileRef = DD6F71B9081E509200F5B280;
-			isa = PBXBuildFile;
-			settings = {
-			};
-		};
-		DD130C260820C26B001A0291 = {
-			fileRef = DD6F71B7081E509200F5B280;
-			isa = PBXBuildFile;
-			settings = {
-			};
-		};
 		DD130E740820C422001A0291 = {
 			fileRef = DD7C5E7508110AE3002FCE1E;
 			isa = PBXBuildFile;