openboe/oboe
2
0
Fork 0
Code Issues 146 Pull Requests 4 Actions Packages Projects Releases Wiki Activity

Fix not bundling Boost.Thread in XCode build

Browse Source
This commit is contained in:
Celtic Minstrel
2015-06-24 14:44:18 -04:00
parent 2951e0228c
commit 4934bb220a
2 changed files with 18 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/BoE.xcodeproj/project.pbxproj
View File

@@ -90,6 +90,9 @@
9153C79E1A994A0D00D7F8A7 /* SFML.framework in Copy Libraries and Frameworks */ = {isa = PBXBuildFile; fileRef = 91F6F8E218F87F3700E3EA15 /* SFML.framework */; };
9153C79F1A994A1300D7F8A7 /* SFML.framework in Copy Libraries and Frameworks */ = {isa = PBXBuildFile; fileRef = 91F6F8E218F87F3700E3EA15 /* SFML.framework */; };
9153C7A01A994A1700D7F8A7 /* SFML.framework in Copy Libraries and Frameworks */ = {isa = PBXBuildFile; fileRef = 91F6F8E218F87F3700E3EA15 /* SFML.framework */; };
9169C3211B3B23530041002B /* libboost_thread.dylib in Copy Libraries and Frameworks */ = {isa = PBXBuildFile; fileRef = 910D9CA31B36439100414B17 /* libboost_thread.dylib */; };
9169C3231B3B235A0041002B /* libboost_thread.dylib in Copy Libraries and Frameworks */ = {isa = PBXBuildFile; fileRef = 910D9CA31B36439100414B17 /* libboost_thread.dylib */; };
9169C3241B3B23610041002B /* libboost_thread.dylib in Copy Libraries and Frameworks */ = {isa = PBXBuildFile; fileRef = 910D9CA31B36439100414B17 /* libboost_thread.dylib */; };
9178235D1B2EA0C5007F3444 /* vorbisenc.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9178235C1B2EA0C5007F3444 /* vorbisenc.framework */; };
9178235E1B2EA0C5007F3444 /* vorbisenc.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9178235C1B2EA0C5007F3444 /* vorbisenc.framework */; };
9178235F1B2EA0C5007F3444 /* vorbisenc.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9178235C1B2EA0C5007F3444 /* vorbisenc.framework */; };
@@ -435,6 +438,7 @@
917823801B2F33EB007F3444 /* FLAC.framework in Copy Libraries and Frameworks */,
919DDC0019006CF9003E7FED /* libboost_filesystem.dylib in Copy Libraries and Frameworks */,
919DDC0119006CF9003E7FED /* libboost_system.dylib in Copy Libraries and Frameworks */,
9169C3241B3B23610041002B /* libboost_thread.dylib in Copy Libraries and Frameworks */,
);
name = "Copy Libraries and Frameworks";
runOnlyForDeploymentPostprocessing = 0;
@@ -458,6 +462,7 @@
917823811B2F33F1007F3444 /* FLAC.framework in Copy Libraries and Frameworks */,
919DDBFE19006CF6003E7FED /* libboost_filesystem.dylib in Copy Libraries and Frameworks */,
919DDBFF19006CF6003E7FED /* libboost_system.dylib in Copy Libraries and Frameworks */,
9169C3231B3B235A0041002B /* libboost_thread.dylib in Copy Libraries and Frameworks */,
);
name = "Copy Libraries and Frameworks";
runOnlyForDeploymentPostprocessing = 0;
@@ -481,6 +486,7 @@
917823821B2F33F5007F3444 /* FLAC.framework in Copy Libraries and Frameworks */,
919DDBFC19006CF2003E7FED /* libboost_filesystem.dylib in Copy Libraries and Frameworks */,
919DDBFD19006CF2003E7FED /* libboost_system.dylib in Copy Libraries and Frameworks */,
9169C3211B3B23530041002B /* libboost_thread.dylib in Copy Libraries and Frameworks */,
);
name = "Copy Libraries and Frameworks";
runOnlyForDeploymentPostprocessing = 0;
@@ -604,9 +610,9 @@
91597A6E1A3BEDC700BE7BF9 /* spell.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = spell.cpp; sourceTree = "<group>"; };
915E09071A316D6A008BDF00 /* map_parse.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; path = map_parse.hpp; sourceTree = "<group>"; };
915E09081A316D89008BDF00 /* map_parse.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = map_parse.cpp; sourceTree = "<group>"; };
9169C30F1B37A1300041002B /* Blades of Exile.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "Blades of Exile.app"; sourceTree = BUILT_PRODUCTS_DIR; };
9169C3111B37A1470041002B /* Blades of Exile Character Editor.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "Blades of Exile Character Editor.app"; sourceTree = BUILT_PRODUCTS_DIR; };
9169C3131B37A1530041002B /* BoE Scenario Editor.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "BoE Scenario Editor.app"; sourceTree = BUILT_PRODUCTS_DIR; };
9169C31B1B37A5D50041002B /* Blades of Exile.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "Blades of Exile.app"; sourceTree = BUILT_PRODUCTS_DIR; };
9169C31D1B37A5D50041002B /* Blades of Exile Character Editor.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "Blades of Exile Character Editor.app"; sourceTree = BUILT_PRODUCTS_DIR; };
9169C31F1B37A5D50041002B /* BoE Scenario Editor.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "BoE Scenario Editor.app"; sourceTree = BUILT_PRODUCTS_DIR; };
9178235C1B2EA0C5007F3444 /* vorbisenc.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = vorbisenc.framework; path = ../../../../../../Library/Frameworks/vorbisenc.framework; sourceTree = "<group>"; };
917823671B2F32DD007F3444 /* vorbisfile.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = vorbisfile.framework; path = ../../../../../../Library/Frameworks/vorbisfile.framework; sourceTree = "<group>"; };
9178236E1B2F331D007F3444 /* vorbis.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = vorbis.framework; path = ../../../../../../Library/Frameworks/vorbis.framework; sourceTree = "<group>"; };
@@ -821,6 +827,9 @@
91B3EECD0F969B7000BF5B67 /* ScenEd */,
91B3EF220F969CA300BF5B67 /* rsrc */,
914B2AA018E7E4A3007B6799 /* Linked Frameworks */,
9169C31B1B37A5D50041002B /* Blades of Exile.app */,
9169C31D1B37A5D50041002B /* Blades of Exile Character Editor.app */,
9169C31F1B37A5D50041002B /* BoE Scenario Editor.app */,
);
sourceTree = "<group>";
};
@@ -1320,7 +1329,7 @@
);
name = "Blades of Exile";
productName = "Blades of Exile";
productReference = 9169C30F1B37A1300041002B /* Blades of Exile.app */;
productReference = 9169C31B1B37A5D50041002B /* Blades of Exile.app */;
productType = "com.apple.product-type.application";
};
919CC22C1B37721400273FDA /* Common-Party */ = {
@@ -1337,7 +1346,6 @@
);
name = "Common-Party";
productName = "Common-Party";
productReference = 9169C30A1B379F520041002B /* libCommon-Party.a */;
productType = "com.apple.product-type.library.static";
};
919CC23A1B3772B700273FDA /* Common */ = {
@@ -1354,7 +1362,6 @@
);
name = Common;
productName = Common;
productReference = 919CC23B1B3772B700273FDA /* libCommon.a */;
productType = "com.apple.product-type.library.static";
};
91B3EF170F969C2200BF5B67 /* Blades of Exile Character Editor */ = {
@@ -1376,7 +1383,7 @@
);
name = "Blades of Exile Character Editor";
productName = "Blades of Exile Character Editor";
productReference = 9169C3111B37A1470041002B /* Blades of Exile Character Editor.app */;
productReference = 9169C31D1B37A5D50041002B /* Blades of Exile Character Editor.app */;
productType = "com.apple.product-type.application";
};
91B3EF3E0F969F0000BF5B67 /* BoE Scenario Editor */ = {
@@ -1397,7 +1404,7 @@
);
name = "BoE Scenario Editor";
productName = "BoE Scenario Editor";
productReference = 9169C3131B37A1530041002B /* BoE Scenario Editor.app */;
productReference = 9169C31F1B37A5D50041002B /* BoE Scenario Editor.app */;
productType = "com.apple.product-type.application";
};
/* End PBXNativeTarget section */

3
src/fix_dylibs.sh
View File

@@ -11,11 +11,14 @@ echo Fixing boost dylib install names...
EXEPATH=@executable_path/../Frameworks
BOEPATH="$BUILT_PRODUCTS_DIR/$EXECUTABLE_PATH"
BFSPATH="$BUILT_PRODUCTS_DIR/$FRAMEWORKS_FOLDER_PATH/libboost_filesystem.dylib"
BTHPATH="$BUILT_PRODUCTS_DIR/$FRAMEWORKS_FOLDER_PATH/libboost_thread.dylib"
# Update references in the executable file
install_name_tool -change libboost_system.dylib "$EXEPATH/libboost_system.dylib" "$BOEPATH"
install_name_tool -change libboost_filesystem.dylib "$EXEPATH/libboost_filesystem.dylib" "$BOEPATH"
install_name_tool -change libboost_thread.dylib "$EXEPATH/libboost_thread.dylib" "$BOEPATH"
# Update references within Boost
install_name_tool -change libboost_system.dylib "$EXEPATH/libboost_system.dylib" "$BFSPATH"
install_name_tool -change libboost_system.dylib "$EXEPATH/libboost_system.dylib" "$BTHPATH"