Bundle frameworks and fix dynamic library paths to allow distribution
- Also updated readme and removed unused sfml-network dependency - Remove redundant inclusion of /opt/local library search paths, as my Boost is in /usr/local and trying to compile against the MacPorts version doesn't work for some reason - Use absolute paths instead of relative paths for linked frameworks and libraries in the project structure - Don't try to link SFML.framework as it only contains headers, not libraries - Add freetype to the project (was always a dependency, just more explicit now)
This commit is contained in:
11
README.md
11
README.md
@@ -14,17 +14,12 @@ or one of the other people on the owners list. This is an open project, with no
|
||||
for getting commit access. With that in mind, please be careful of what you check into the repository.
|
||||
Please do not commit any binaries, junk files, or anything that doesn't compile.
|
||||
|
||||
The current task at hand is to merge the Mac and Windows code into the unified wxWidgets code base.
|
||||
|
||||
Linux
|
||||
-----
|
||||
|
||||
At last, there is a potential Linux version available in the downloads (though so far only the
|
||||
Character Editor is available). This should be treated as an alpha/beta release, so use with caution.
|
||||
The current task at hand is to merge the Windows code into the current Mac codebase, which no longer uses platform-specific APIs for most things (a few files would need to be rewritten for Windows).
|
||||
|
||||
Helpful Links
|
||||
-------------
|
||||
* [Jenkins Server](http://cd.calref.net:8080/) - Runs a build after every push
|
||||
* [BoE Forum at Spiderweb Software](http://spiderwebforums.ipbhost.com/index.php?/forum/12-blades-of-exile/)
|
||||
* [Original Game Source](http://www.spiderwebsoftware.com/blades/opensource.html) - Where it all began. Warning: Terrifying code.
|
||||
* [Ormus's Code](http://info.wsisiz.edu.pl/~kowalsg0/) - The basis for most, if not all, of the Win32 work.
|
||||
* [Ormus's Code](http://info.wsisiz.edu.pl/~kowalsg0/) - The basis for most, if not all, of the Win32 work.
|
||||
* [Experimental Builds](http://celmin.pwcsite.com/oboe/) - will be put up whenever Celtic Minstrel feels like it.
|
||||
|
||||
@@ -421,6 +421,18 @@
|
||||
9192C14B18F32E8D0088A580 /* spell-times.txt in Copy Strings */ = {isa = PBXBuildFile; fileRef = 9192C13218F327230088A580 /* spell-times.txt */; };
|
||||
9192C14C18F32E8D0088A580 /* magic-names.txt in Copy Strings */ = {isa = PBXBuildFile; fileRef = 9192C13318F327230088A580 /* magic-names.txt */; };
|
||||
9192C15118F32E8D0088A580 /* traits.txt in Copy Strings */ = {isa = PBXBuildFile; fileRef = 9192C13818F327230088A580 /* traits.txt */; };
|
||||
919DDBFC19006CF2003E7FED /* libboost_filesystem.dylib in Copy Libraries and Frameworks */ = {isa = PBXBuildFile; fileRef = 919DDBFA19006CC9003E7FED /* libboost_filesystem.dylib */; };
|
||||
919DDBFD19006CF2003E7FED /* libboost_system.dylib in Copy Libraries and Frameworks */ = {isa = PBXBuildFile; fileRef = 919DDBFB19006CC9003E7FED /* libboost_system.dylib */; };
|
||||
919DDBFE19006CF6003E7FED /* libboost_filesystem.dylib in Copy Libraries and Frameworks */ = {isa = PBXBuildFile; fileRef = 919DDBFA19006CC9003E7FED /* libboost_filesystem.dylib */; };
|
||||
919DDBFF19006CF6003E7FED /* libboost_system.dylib in Copy Libraries and Frameworks */ = {isa = PBXBuildFile; fileRef = 919DDBFB19006CC9003E7FED /* libboost_system.dylib */; };
|
||||
919DDC0019006CF9003E7FED /* libboost_filesystem.dylib in Copy Libraries and Frameworks */ = {isa = PBXBuildFile; fileRef = 919DDBFA19006CC9003E7FED /* libboost_filesystem.dylib */; };
|
||||
919DDC0119006CF9003E7FED /* libboost_system.dylib in Copy Libraries and Frameworks */ = {isa = PBXBuildFile; fileRef = 919DDBFB19006CC9003E7FED /* libboost_system.dylib */; };
|
||||
919DDC0A1900750D003E7FED /* freetype.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 919DDC091900750D003E7FED /* freetype.framework */; };
|
||||
919DDC0B1900750D003E7FED /* freetype.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 919DDC091900750D003E7FED /* freetype.framework */; };
|
||||
919DDC0C1900750D003E7FED /* freetype.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 919DDC091900750D003E7FED /* freetype.framework */; };
|
||||
919DDC0D19007517003E7FED /* freetype.framework in Copy Libraries and Frameworks */ = {isa = PBXBuildFile; fileRef = 919DDC091900750D003E7FED /* freetype.framework */; };
|
||||
919DDC0E1900751C003E7FED /* freetype.framework in Copy Libraries and Frameworks */ = {isa = PBXBuildFile; fileRef = 919DDC091900750D003E7FED /* freetype.framework */; };
|
||||
919DDC0F1900751F003E7FED /* freetype.framework in Copy Libraries and Frameworks */ = {isa = PBXBuildFile; fileRef = 919DDC091900750D003E7FED /* freetype.framework */; };
|
||||
91A32B770FDB5F6800C4E957 /* arena-names.txt in Copy String Lists */ = {isa = PBXBuildFile; fileRef = 91A32B720FDB5F6800C4E957 /* arena-names.txt */; };
|
||||
91A32B780FDB5F6800C4E957 /* ter-flag1.txt in Copy String Lists */ = {isa = PBXBuildFile; fileRef = 91A32B730FDB5F6800C4E957 /* ter-flag1.txt */; };
|
||||
91A32B790FDB5F6800C4E957 /* ter-flag2.txt in Copy String Lists */ = {isa = PBXBuildFile; fileRef = 91A32B740FDB5F6800C4E957 /* ter-flag2.txt */; };
|
||||
@@ -455,6 +467,21 @@
|
||||
91AC65AD0FA34AC600EEAE67 /* universe.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 91AC61C50FA2729900EEAE67 /* universe.cpp */; };
|
||||
91ACCE6418FFB61A00FAEF8B /* bladbase.exs in Copy Base Scenarios */ = {isa = PBXBuildFile; fileRef = 91B3EF250F969CE300BF5B67 /* bladbase.exs */; };
|
||||
91ACCE66190004F000FAEF8B /* dlogscroll.png in Copy Mac Graphics */ = {isa = PBXBuildFile; fileRef = 91ACCE65190004D300FAEF8B /* dlogscroll.png */; };
|
||||
91ACCE7619002E5F00FAEF8B /* sfml-audio.framework in Copy Libraries and Frameworks */ = {isa = PBXBuildFile; fileRef = 91F6F8DD18F87F3700E3EA15 /* sfml-audio.framework */; };
|
||||
91ACCE7719002E5F00FAEF8B /* sfml-graphics.framework in Copy Libraries and Frameworks */ = {isa = PBXBuildFile; fileRef = 91F6F8DE18F87F3700E3EA15 /* sfml-graphics.framework */; };
|
||||
91ACCE7919002E5F00FAEF8B /* sfml-system.framework in Copy Libraries and Frameworks */ = {isa = PBXBuildFile; fileRef = 91F6F8E018F87F3700E3EA15 /* sfml-system.framework */; };
|
||||
91ACCE7A19002E5F00FAEF8B /* sfml-window.framework in Copy Libraries and Frameworks */ = {isa = PBXBuildFile; fileRef = 91F6F8E118F87F3700E3EA15 /* sfml-window.framework */; };
|
||||
91ACCE7B19002E5F00FAEF8B /* sndfile.framework in Copy Libraries and Frameworks */ = {isa = PBXBuildFile; fileRef = 914B2AAE18E7E529007B6799 /* sndfile.framework */; };
|
||||
91ACCE881900344B00FAEF8B /* sfml-audio.framework in Copy Libraries and Frameworks */ = {isa = PBXBuildFile; fileRef = 91F6F8DD18F87F3700E3EA15 /* sfml-audio.framework */; };
|
||||
91ACCE891900344B00FAEF8B /* sfml-graphics.framework in Copy Libraries and Frameworks */ = {isa = PBXBuildFile; fileRef = 91F6F8DE18F87F3700E3EA15 /* sfml-graphics.framework */; };
|
||||
91ACCE8B1900344B00FAEF8B /* sfml-system.framework in Copy Libraries and Frameworks */ = {isa = PBXBuildFile; fileRef = 91F6F8E018F87F3700E3EA15 /* sfml-system.framework */; };
|
||||
91ACCE8C1900344B00FAEF8B /* sfml-window.framework in Copy Libraries and Frameworks */ = {isa = PBXBuildFile; fileRef = 91F6F8E118F87F3700E3EA15 /* sfml-window.framework */; };
|
||||
91ACCE8D1900344B00FAEF8B /* sndfile.framework in Copy Libraries and Frameworks */ = {isa = PBXBuildFile; fileRef = 914B2AAE18E7E529007B6799 /* sndfile.framework */; };
|
||||
91ACCE931900346C00FAEF8B /* sfml-audio.framework in Copy Libraries and Frameworks */ = {isa = PBXBuildFile; fileRef = 91F6F8DD18F87F3700E3EA15 /* sfml-audio.framework */; };
|
||||
91ACCE941900346C00FAEF8B /* sfml-graphics.framework in Copy Libraries and Frameworks */ = {isa = PBXBuildFile; fileRef = 91F6F8DE18F87F3700E3EA15 /* sfml-graphics.framework */; };
|
||||
91ACCE961900346C00FAEF8B /* sfml-system.framework in Copy Libraries and Frameworks */ = {isa = PBXBuildFile; fileRef = 91F6F8E018F87F3700E3EA15 /* sfml-system.framework */; };
|
||||
91ACCE971900346C00FAEF8B /* sfml-window.framework in Copy Libraries and Frameworks */ = {isa = PBXBuildFile; fileRef = 91F6F8E118F87F3700E3EA15 /* sfml-window.framework */; };
|
||||
91ACCE981900346C00FAEF8B /* sndfile.framework in Copy Libraries and Frameworks */ = {isa = PBXBuildFile; fileRef = 914B2AAE18E7E529007B6799 /* sndfile.framework */; };
|
||||
91B3EF1F0F969C9C00BF5B67 /* BoECharEd.icns in Resources */ = {isa = PBXBuildFile; fileRef = 91B3EF110F969BD300BF5B67 /* BoECharEd.icns */; };
|
||||
91B3EF450F969F1700BF5B67 /* BoE Scenario Editor-Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = 91B3EED90F969BA700BF5B67 /* BoE Scenario Editor-Info.plist */; };
|
||||
91B3EF470F969F1700BF5B67 /* BoE Scenario Editor.icns in Resources */ = {isa = PBXBuildFile; fileRef = 91B3EEDB0F969BA700BF5B67 /* BoE Scenario Editor.icns */; };
|
||||
@@ -511,18 +538,12 @@
|
||||
91F6F8E618F87F3700E3EA15 /* sfml-graphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 91F6F8DE18F87F3700E3EA15 /* sfml-graphics.framework */; };
|
||||
91F6F8E718F87F3700E3EA15 /* sfml-graphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 91F6F8DE18F87F3700E3EA15 /* sfml-graphics.framework */; };
|
||||
91F6F8E818F87F3700E3EA15 /* sfml-graphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 91F6F8DE18F87F3700E3EA15 /* sfml-graphics.framework */; };
|
||||
91F6F8E918F87F3700E3EA15 /* sfml-network.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 91F6F8DF18F87F3700E3EA15 /* sfml-network.framework */; };
|
||||
91F6F8EA18F87F3700E3EA15 /* sfml-network.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 91F6F8DF18F87F3700E3EA15 /* sfml-network.framework */; };
|
||||
91F6F8EB18F87F3700E3EA15 /* sfml-network.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 91F6F8DF18F87F3700E3EA15 /* sfml-network.framework */; };
|
||||
91F6F8EC18F87F3700E3EA15 /* sfml-system.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 91F6F8E018F87F3700E3EA15 /* sfml-system.framework */; };
|
||||
91F6F8ED18F87F3700E3EA15 /* sfml-system.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 91F6F8E018F87F3700E3EA15 /* sfml-system.framework */; };
|
||||
91F6F8EE18F87F3700E3EA15 /* sfml-system.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 91F6F8E018F87F3700E3EA15 /* sfml-system.framework */; };
|
||||
91F6F8EF18F87F3700E3EA15 /* sfml-window.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 91F6F8E118F87F3700E3EA15 /* sfml-window.framework */; };
|
||||
91F6F8F018F87F3700E3EA15 /* sfml-window.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 91F6F8E118F87F3700E3EA15 /* sfml-window.framework */; };
|
||||
91F6F8F118F87F3700E3EA15 /* sfml-window.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 91F6F8E118F87F3700E3EA15 /* sfml-window.framework */; };
|
||||
91F6F8F218F87F3700E3EA15 /* SFML.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 91F6F8E218F87F3700E3EA15 /* SFML.framework */; };
|
||||
91F6F8F318F87F3700E3EA15 /* SFML.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 91F6F8E218F87F3700E3EA15 /* SFML.framework */; };
|
||||
91F6F8F418F87F3700E3EA15 /* SFML.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 91F6F8E218F87F3700E3EA15 /* SFML.framework */; };
|
||||
91F6F8F618F8DE6300E3EA15 /* qdpict.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 91F6F8F518F8DE6300E3EA15 /* qdpict.cpp */; };
|
||||
91F6F8F718F8DE6300E3EA15 /* qdpict.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 91F6F8F518F8DE6300E3EA15 /* qdpict.cpp */; };
|
||||
91F6F8F818F8DE6300E3EA15 /* qdpict.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 91F6F8F518F8DE6300E3EA15 /* qdpict.cpp */; };
|
||||
@@ -1030,6 +1051,60 @@
|
||||
name = "Copy Base Scenarios";
|
||||
runOnlyForDeploymentPostprocessing = 0;
|
||||
};
|
||||
91ACCE7319002E4700FAEF8B /* Copy Libraries and Frameworks */ = {
|
||||
isa = PBXCopyFilesBuildPhase;
|
||||
buildActionMask = 2147483647;
|
||||
dstPath = "";
|
||||
dstSubfolderSpec = 10;
|
||||
files = (
|
||||
91ACCE7619002E5F00FAEF8B /* sfml-audio.framework in Copy Libraries and Frameworks */,
|
||||
91ACCE7719002E5F00FAEF8B /* sfml-graphics.framework in Copy Libraries and Frameworks */,
|
||||
91ACCE7919002E5F00FAEF8B /* sfml-system.framework in Copy Libraries and Frameworks */,
|
||||
91ACCE7A19002E5F00FAEF8B /* sfml-window.framework in Copy Libraries and Frameworks */,
|
||||
91ACCE7B19002E5F00FAEF8B /* sndfile.framework in Copy Libraries and Frameworks */,
|
||||
919DDC0D19007517003E7FED /* freetype.framework in Copy Libraries and Frameworks */,
|
||||
919DDC0019006CF9003E7FED /* libboost_filesystem.dylib in Copy Libraries and Frameworks */,
|
||||
919DDC0119006CF9003E7FED /* libboost_system.dylib in Copy Libraries and Frameworks */,
|
||||
);
|
||||
name = "Copy Libraries and Frameworks";
|
||||
runOnlyForDeploymentPostprocessing = 0;
|
||||
};
|
||||
91ACCE851900342C00FAEF8B /* Copy Libraries and Frameworks */ = {
|
||||
isa = PBXCopyFilesBuildPhase;
|
||||
buildActionMask = 2147483647;
|
||||
dstPath = "";
|
||||
dstSubfolderSpec = 10;
|
||||
files = (
|
||||
91ACCE881900344B00FAEF8B /* sfml-audio.framework in Copy Libraries and Frameworks */,
|
||||
91ACCE891900344B00FAEF8B /* sfml-graphics.framework in Copy Libraries and Frameworks */,
|
||||
91ACCE8B1900344B00FAEF8B /* sfml-system.framework in Copy Libraries and Frameworks */,
|
||||
91ACCE8C1900344B00FAEF8B /* sfml-window.framework in Copy Libraries and Frameworks */,
|
||||
91ACCE8D1900344B00FAEF8B /* sndfile.framework in Copy Libraries and Frameworks */,
|
||||
919DDC0E1900751C003E7FED /* freetype.framework in Copy Libraries and Frameworks */,
|
||||
919DDBFE19006CF6003E7FED /* libboost_filesystem.dylib in Copy Libraries and Frameworks */,
|
||||
919DDBFF19006CF6003E7FED /* libboost_system.dylib in Copy Libraries and Frameworks */,
|
||||
);
|
||||
name = "Copy Libraries and Frameworks";
|
||||
runOnlyForDeploymentPostprocessing = 0;
|
||||
};
|
||||
91ACCE901900345200FAEF8B /* Copy Libraries and Frameworks */ = {
|
||||
isa = PBXCopyFilesBuildPhase;
|
||||
buildActionMask = 2147483647;
|
||||
dstPath = "";
|
||||
dstSubfolderSpec = 10;
|
||||
files = (
|
||||
91ACCE931900346C00FAEF8B /* sfml-audio.framework in Copy Libraries and Frameworks */,
|
||||
91ACCE941900346C00FAEF8B /* sfml-graphics.framework in Copy Libraries and Frameworks */,
|
||||
91ACCE961900346C00FAEF8B /* sfml-system.framework in Copy Libraries and Frameworks */,
|
||||
91ACCE971900346C00FAEF8B /* sfml-window.framework in Copy Libraries and Frameworks */,
|
||||
91ACCE981900346C00FAEF8B /* sndfile.framework in Copy Libraries and Frameworks */,
|
||||
919DDC0F1900751F003E7FED /* freetype.framework in Copy Libraries and Frameworks */,
|
||||
919DDBFC19006CF2003E7FED /* libboost_filesystem.dylib in Copy Libraries and Frameworks */,
|
||||
919DDBFD19006CF2003E7FED /* libboost_system.dylib in Copy Libraries and Frameworks */,
|
||||
);
|
||||
name = "Copy Libraries and Frameworks";
|
||||
runOnlyForDeploymentPostprocessing = 0;
|
||||
};
|
||||
91B3EF320F969D9900BF5B67 /* CopyFiles */ = {
|
||||
isa = PBXCopyFilesBuildPhase;
|
||||
buildActionMask = 2147483647;
|
||||
@@ -1323,9 +1398,9 @@
|
||||
914701A418F629D4008A6DC9 /* dungeon.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; path = dungeon.ttf; sourceTree = "<group>"; };
|
||||
914701A518F629D4008A6DC9 /* maidenword.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; path = maidenword.ttf; sourceTree = "<group>"; };
|
||||
914701A918F64A85008A6DC9 /* dialog.xsd */ = {isa = PBXFileReference; lastKnownFileType = text.xml; name = dialog.xsd; path = dialogs/dialog.xsd; sourceTree = "<group>"; };
|
||||
914B2AA118E7E500007B6799 /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = ../../../../../../System/Library/Frameworks/Cocoa.framework; sourceTree = "<group>"; };
|
||||
914B2AA218E7E500007B6799 /* OpenGL.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = OpenGL.framework; path = ../../../../../../System/Library/Frameworks/OpenGL.framework; sourceTree = "<group>"; };
|
||||
914B2AAE18E7E529007B6799 /* sndfile.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = sndfile.framework; path = ../../../../../../Library/Frameworks/sndfile.framework; sourceTree = "<group>"; };
|
||||
914B2AA118E7E500007B6799 /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = /System/Library/Frameworks/Cocoa.framework; sourceTree = "<absolute>"; };
|
||||
914B2AA218E7E500007B6799 /* OpenGL.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = OpenGL.framework; path = /System/Library/Frameworks/OpenGL.framework; sourceTree = "<absolute>"; };
|
||||
914B2AAE18E7E529007B6799 /* sndfile.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = sndfile.framework; path = /Library/Frameworks/sndfile.framework; sourceTree = "<absolute>"; };
|
||||
914B2ACC18E7FFEF007B6799 /* SND1.WAV */ = {isa = PBXFileReference; lastKnownFileType = audio.wav; path = SND1.WAV; sourceTree = "<group>"; };
|
||||
914B2ACD18E7FFEF007B6799 /* SND10.WAV */ = {isa = PBXFileReference; lastKnownFileType = audio.wav; path = SND10.WAV; sourceTree = "<group>"; };
|
||||
914B2ACE18E7FFEF007B6799 /* SND11.WAV */ = {isa = PBXFileReference; lastKnownFileType = audio.wav; path = SND11.WAV; sourceTree = "<group>"; };
|
||||
@@ -1447,6 +1522,9 @@
|
||||
9192C13218F327230088A580 /* spell-times.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = "spell-times.txt"; path = "strings/spell-times.txt"; sourceTree = "<group>"; };
|
||||
9192C13318F327230088A580 /* magic-names.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = "magic-names.txt"; path = "strings/magic-names.txt"; sourceTree = "<group>"; };
|
||||
9192C13818F327230088A580 /* traits.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = traits.txt; path = strings/traits.txt; sourceTree = "<group>"; };
|
||||
919DDBFA19006CC9003E7FED /* libboost_filesystem.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libboost_filesystem.dylib; path = /usr/local/lib/libboost_filesystem.dylib; sourceTree = "<absolute>"; };
|
||||
919DDBFB19006CC9003E7FED /* libboost_system.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libboost_system.dylib; path = /usr/local/lib/libboost_system.dylib; sourceTree = "<absolute>"; };
|
||||
919DDC091900750D003E7FED /* freetype.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = freetype.framework; path = ../../../../../../Library/Frameworks/freetype.framework; sourceTree = "<group>"; };
|
||||
91A32B720FDB5F6800C4E957 /* arena-names.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = "arena-names.txt"; sourceTree = "<group>"; };
|
||||
91A32B730FDB5F6800C4E957 /* ter-flag1.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = "ter-flag1.txt"; sourceTree = "<group>"; };
|
||||
91A32B740FDB5F6800C4E957 /* ter-flag2.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = "ter-flag2.txt"; sourceTree = "<group>"; };
|
||||
@@ -1464,6 +1542,7 @@
|
||||
91AC62090FA2853700EEAE67 /* creatlist.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = creatlist.h; sourceTree = "<group>"; };
|
||||
91AC620A0FA2853700EEAE67 /* creatlist.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = creatlist.cpp; sourceTree = "<group>"; };
|
||||
91ACCE65190004D300FAEF8B /* dlogscroll.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = dlogscroll.png; sourceTree = "<group>"; };
|
||||
91ACCE82190032E000FAEF8B /* fix_dylibs.sh */ = {isa = PBXFileReference; lastKnownFileType = text.script.sh; path = fix_dylibs.sh; sourceTree = "<group>"; };
|
||||
91B3E8A50F938FFE00BF5B67 /* boe.consts.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = boe.consts.h; sourceTree = "<group>"; };
|
||||
91B3EED90F969BA700BF5B67 /* BoE Scenario Editor-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "BoE Scenario Editor-Info.plist"; sourceTree = "<group>"; };
|
||||
91B3EEDA0F969BA700BF5B67 /* BOEScen.rsrc */ = {isa = PBXFileReference; lastKnownFileType = archive.rsrc; path = BOEScen.rsrc; sourceTree = "<group>"; };
|
||||
@@ -1528,12 +1607,11 @@
|
||||
91E5C7B70F9F619D00C21460 /* talking.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = talking.cpp; sourceTree = "<group>"; };
|
||||
91EC480E18FBAA8700BB1E86 /* prefs.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; path = prefs.hpp; sourceTree = "<group>"; };
|
||||
91EC481018FBABB100BB1E86 /* prefs.mac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = prefs.mac.mm; sourceTree = "<group>"; };
|
||||
91F6F8DD18F87F3700E3EA15 /* sfml-audio.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = "sfml-audio.framework"; path = "../../../../../../Library/Frameworks/sfml-audio.framework"; sourceTree = "<group>"; };
|
||||
91F6F8DE18F87F3700E3EA15 /* sfml-graphics.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = "sfml-graphics.framework"; path = "../../../../../../Library/Frameworks/sfml-graphics.framework"; sourceTree = "<group>"; };
|
||||
91F6F8DF18F87F3700E3EA15 /* sfml-network.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = "sfml-network.framework"; path = "../../../../../../Library/Frameworks/sfml-network.framework"; sourceTree = "<group>"; };
|
||||
91F6F8E018F87F3700E3EA15 /* sfml-system.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = "sfml-system.framework"; path = "../../../../../../Library/Frameworks/sfml-system.framework"; sourceTree = "<group>"; };
|
||||
91F6F8E118F87F3700E3EA15 /* sfml-window.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = "sfml-window.framework"; path = "../../../../../../Library/Frameworks/sfml-window.framework"; sourceTree = "<group>"; };
|
||||
91F6F8E218F87F3700E3EA15 /* SFML.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SFML.framework; path = ../../../../../../Library/Frameworks/SFML.framework; sourceTree = "<group>"; };
|
||||
91F6F8DD18F87F3700E3EA15 /* sfml-audio.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = "sfml-audio.framework"; path = "/Library/Frameworks/sfml-audio.framework"; sourceTree = "<absolute>"; };
|
||||
91F6F8DE18F87F3700E3EA15 /* sfml-graphics.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = "sfml-graphics.framework"; path = "/Library/Frameworks/sfml-graphics.framework"; sourceTree = "<absolute>"; };
|
||||
91F6F8E018F87F3700E3EA15 /* sfml-system.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = "sfml-system.framework"; path = "/Library/Frameworks/sfml-system.framework"; sourceTree = "<absolute>"; };
|
||||
91F6F8E118F87F3700E3EA15 /* sfml-window.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = "sfml-window.framework"; path = "/Library/Frameworks/sfml-window.framework"; sourceTree = "<absolute>"; };
|
||||
91F6F8E218F87F3700E3EA15 /* SFML.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SFML.framework; path = /Library/Frameworks/SFML.framework; sourceTree = "<absolute>"; };
|
||||
91F6F8F518F8DE6300E3EA15 /* qdpict.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = qdpict.cpp; sourceTree = "<group>"; };
|
||||
91FCC8D718FE28CC007026CE /* pc.menu.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = pc.menu.xib; sourceTree = "<group>"; };
|
||||
91FCC8DA18FE2CCA007026CE /* pc.menus.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = pc.menus.h; sourceTree = "<group>"; };
|
||||
@@ -1562,10 +1640,9 @@
|
||||
914B2ABF18E7E543007B6799 /* sndfile.framework in Frameworks */,
|
||||
91F6F8E318F87F3700E3EA15 /* sfml-audio.framework in Frameworks */,
|
||||
91F6F8E618F87F3700E3EA15 /* sfml-graphics.framework in Frameworks */,
|
||||
91F6F8E918F87F3700E3EA15 /* sfml-network.framework in Frameworks */,
|
||||
91F6F8EC18F87F3700E3EA15 /* sfml-system.framework in Frameworks */,
|
||||
91F6F8EF18F87F3700E3EA15 /* sfml-window.framework in Frameworks */,
|
||||
91F6F8F218F87F3700E3EA15 /* SFML.framework in Frameworks */,
|
||||
919DDC0A1900750D003E7FED /* freetype.framework in Frameworks */,
|
||||
);
|
||||
runOnlyForDeploymentPostprocessing = 0;
|
||||
};
|
||||
@@ -1578,10 +1655,9 @@
|
||||
914B2AC018E7E544007B6799 /* sndfile.framework in Frameworks */,
|
||||
91F6F8E418F87F3700E3EA15 /* sfml-audio.framework in Frameworks */,
|
||||
91F6F8E718F87F3700E3EA15 /* sfml-graphics.framework in Frameworks */,
|
||||
91F6F8EA18F87F3700E3EA15 /* sfml-network.framework in Frameworks */,
|
||||
91F6F8ED18F87F3700E3EA15 /* sfml-system.framework in Frameworks */,
|
||||
91F6F8F018F87F3700E3EA15 /* sfml-window.framework in Frameworks */,
|
||||
91F6F8F318F87F3700E3EA15 /* SFML.framework in Frameworks */,
|
||||
919DDC0B1900750D003E7FED /* freetype.framework in Frameworks */,
|
||||
);
|
||||
runOnlyForDeploymentPostprocessing = 0;
|
||||
};
|
||||
@@ -1594,10 +1670,9 @@
|
||||
914B2AC118E7E544007B6799 /* sndfile.framework in Frameworks */,
|
||||
91F6F8E518F87F3700E3EA15 /* sfml-audio.framework in Frameworks */,
|
||||
91F6F8E818F87F3700E3EA15 /* sfml-graphics.framework in Frameworks */,
|
||||
91F6F8EB18F87F3700E3EA15 /* sfml-network.framework in Frameworks */,
|
||||
91F6F8EE18F87F3700E3EA15 /* sfml-system.framework in Frameworks */,
|
||||
91F6F8F118F87F3700E3EA15 /* sfml-window.framework in Frameworks */,
|
||||
91F6F8F418F87F3700E3EA15 /* SFML.framework in Frameworks */,
|
||||
919DDC0C1900750D003E7FED /* freetype.framework in Frameworks */,
|
||||
);
|
||||
runOnlyForDeploymentPostprocessing = 0;
|
||||
};
|
||||
@@ -2042,10 +2117,13 @@
|
||||
91F6F8E218F87F3700E3EA15 /* SFML.framework */,
|
||||
91F6F8DD18F87F3700E3EA15 /* sfml-audio.framework */,
|
||||
91F6F8DE18F87F3700E3EA15 /* sfml-graphics.framework */,
|
||||
91F6F8DF18F87F3700E3EA15 /* sfml-network.framework */,
|
||||
91F6F8E018F87F3700E3EA15 /* sfml-system.framework */,
|
||||
91F6F8E118F87F3700E3EA15 /* sfml-window.framework */,
|
||||
914B2AAE18E7E529007B6799 /* sndfile.framework */,
|
||||
919DDC091900750D003E7FED /* freetype.framework */,
|
||||
919DDBFA19006CC9003E7FED /* libboost_filesystem.dylib */,
|
||||
919DDBFB19006CC9003E7FED /* libboost_system.dylib */,
|
||||
91ACCE82190032E000FAEF8B /* fix_dylibs.sh */,
|
||||
);
|
||||
name = "Linked Frameworks";
|
||||
sourceTree = "<group>";
|
||||
@@ -2452,6 +2530,8 @@
|
||||
912CF37B0FE44A660063B614 /* Copy String Lists */,
|
||||
912CF37C0FE44A660063B614 /* Copy Dialogs */,
|
||||
2BF04ABF0BF518D4006C0831 /* Frameworks */,
|
||||
91ACCE7319002E4700FAEF8B /* Copy Libraries and Frameworks */,
|
||||
91ACCE801900302D00FAEF8B /* Fix dylib install names */,
|
||||
);
|
||||
buildRules = (
|
||||
);
|
||||
@@ -2473,6 +2553,8 @@
|
||||
912CF3550FE448680063B614 /* Copy Dialogs */,
|
||||
91B3EF150F969C2200BF5B67 /* Sources */,
|
||||
91B3EF160F969C2200BF5B67 /* Frameworks */,
|
||||
91ACCE851900342C00FAEF8B /* Copy Libraries and Frameworks */,
|
||||
91ACCE861900342E00FAEF8B /* Fix dylib install names */,
|
||||
);
|
||||
buildRules = (
|
||||
);
|
||||
@@ -2494,6 +2576,8 @@
|
||||
91C687050FD5F277000F6D01 /* CopyFiles */,
|
||||
91B3EF3C0F969F0000BF5B67 /* Sources */,
|
||||
91B3EF3D0F969F0000BF5B67 /* Frameworks */,
|
||||
91ACCE901900345200FAEF8B /* Copy Libraries and Frameworks */,
|
||||
91ACCE911900345400FAEF8B /* Fix dylib install names */,
|
||||
);
|
||||
buildRules = (
|
||||
);
|
||||
@@ -2591,6 +2675,49 @@
|
||||
shellScript = "\nfunction filter() {\n\tgrep -v 'validates' -\n\treturn 0\n}\n\ncd ../rsrc/dialogs/\nset -o pipefail\nxmllint --nonet --noout --schema \"$SOURCE_ROOT/../rsrc/dialogs/dialog.xsd\" \"$SOURCE_ROOT/../rsrc/dialogs/\"*.xml 2>&1 | sed 's/%20/ /g' | filter\n";
|
||||
showEnvVarsInLog = 0;
|
||||
};
|
||||
91ACCE801900302D00FAEF8B /* Fix dylib install names */ = {
|
||||
isa = PBXShellScriptBuildPhase;
|
||||
buildActionMask = 2147483647;
|
||||
files = (
|
||||
);
|
||||
inputPaths = (
|
||||
);
|
||||
name = "Fix dylib install names";
|
||||
outputPaths = (
|
||||
);
|
||||
runOnlyForDeploymentPostprocessing = 0;
|
||||
shellPath = /bin/sh;
|
||||
shellScript = ./fix_dylibs.sh;
|
||||
showEnvVarsInLog = 0;
|
||||
};
|
||||
91ACCE861900342E00FAEF8B /* Fix dylib install names */ = {
|
||||
isa = PBXShellScriptBuildPhase;
|
||||
buildActionMask = 2147483647;
|
||||
files = (
|
||||
);
|
||||
inputPaths = (
|
||||
);
|
||||
name = "Fix dylib install names";
|
||||
outputPaths = (
|
||||
);
|
||||
runOnlyForDeploymentPostprocessing = 0;
|
||||
shellPath = /bin/sh;
|
||||
shellScript = ./fix_dylibs.sh;
|
||||
};
|
||||
91ACCE911900345400FAEF8B /* Fix dylib install names */ = {
|
||||
isa = PBXShellScriptBuildPhase;
|
||||
buildActionMask = 2147483647;
|
||||
files = (
|
||||
);
|
||||
inputPaths = (
|
||||
);
|
||||
name = "Fix dylib install names";
|
||||
outputPaths = (
|
||||
);
|
||||
runOnlyForDeploymentPostprocessing = 0;
|
||||
shellPath = /bin/sh;
|
||||
shellScript = ./fix_dylibs.sh;
|
||||
};
|
||||
/* End PBXShellScriptBuildPhase section */
|
||||
|
||||
/* Begin PBXSourcesBuildPhase section */
|
||||
@@ -2912,11 +3039,6 @@
|
||||
GCC_OPTIMIZATION_LEVEL = 0;
|
||||
INFOPLIST_FILE = "Blades of Exile-Info.plist";
|
||||
INSTALL_PATH = "$(HOME)/Applications";
|
||||
LIBRARY_SEARCH_PATHS = (
|
||||
"$(inherited)",
|
||||
"$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_1)",
|
||||
/opt/local/lib,
|
||||
);
|
||||
OTHER_LDFLAGS_QUOTED_FOR_TARGET_1 = "\"$(PROJECT_DIR)/misc/\"";
|
||||
PRODUCT_NAME = "Blades of Exile";
|
||||
WRAPPER_EXTENSION = app;
|
||||
@@ -2931,11 +3053,6 @@
|
||||
GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
|
||||
INFOPLIST_FILE = "Blades of Exile-Info.plist";
|
||||
INSTALL_PATH = "$(HOME)/Applications";
|
||||
LIBRARY_SEARCH_PATHS = (
|
||||
"$(inherited)",
|
||||
"$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_1)",
|
||||
/opt/local/lib,
|
||||
);
|
||||
OTHER_LDFLAGS_QUOTED_FOR_TARGET_1 = "\"$(PROJECT_DIR)/misc/\"";
|
||||
PRODUCT_NAME = "Blades of Exile";
|
||||
WRAPPER_EXTENSION = app;
|
||||
@@ -2972,11 +3089,6 @@
|
||||
GCC_OPTIMIZATION_LEVEL = 0;
|
||||
INFOPLIST_FILE = "pcedit/Blades of Exile Character Editor-Info.plist";
|
||||
INSTALL_PATH = "$(HOME)/Applications";
|
||||
LIBRARY_SEARCH_PATHS = (
|
||||
"$(inherited)",
|
||||
"$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_1)",
|
||||
/opt/local/lib,
|
||||
);
|
||||
OTHER_LDFLAGS_QUOTED_FOR_TARGET_1 = "\"$(PROJECT_DIR)/misc/\"";
|
||||
PRODUCT_NAME = "Blades of Exile Character Editor";
|
||||
WRAPPER_EXTENSION = app;
|
||||
@@ -2992,11 +3104,6 @@
|
||||
GCC_MODEL_TUNING = G5;
|
||||
INFOPLIST_FILE = "pcedit/Blades of Exile Character Editor-Info.plist";
|
||||
INSTALL_PATH = "$(HOME)/Applications";
|
||||
LIBRARY_SEARCH_PATHS = (
|
||||
"$(inherited)",
|
||||
"$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_1)",
|
||||
/opt/local/lib,
|
||||
);
|
||||
OTHER_LDFLAGS_QUOTED_FOR_TARGET_1 = "\"$(PROJECT_DIR)/misc/\"";
|
||||
PRODUCT_NAME = "Blades of Exile Character Editor";
|
||||
WRAPPER_EXTENSION = app;
|
||||
@@ -3014,11 +3121,6 @@
|
||||
GCC_OPTIMIZATION_LEVEL = 0;
|
||||
INFOPLIST_FILE = "scenedit/BoE Scenario Editor-Info.plist";
|
||||
INSTALL_PATH = "$(HOME)/Applications";
|
||||
LIBRARY_SEARCH_PATHS = (
|
||||
"$(inherited)",
|
||||
"$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_1)",
|
||||
/opt/local/lib,
|
||||
);
|
||||
OTHER_CFLAGS = "-fpack-struct=2";
|
||||
OTHER_CPLUSPLUSFLAGS = "-fpack-struct=2";
|
||||
PRODUCT_NAME = "BoE Scenario Editor";
|
||||
@@ -3037,11 +3139,6 @@
|
||||
GCC_MODEL_TUNING = G5;
|
||||
INFOPLIST_FILE = "scenedit/BoE Scenario Editor-Info.plist";
|
||||
INSTALL_PATH = "$(HOME)/Applications";
|
||||
LIBRARY_SEARCH_PATHS = (
|
||||
"$(inherited)",
|
||||
"$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_1)",
|
||||
/opt/local/lib,
|
||||
);
|
||||
OTHER_CFLAGS = "-fpack-struct=2";
|
||||
OTHER_CPLUSPLUSFLAGS = "-fpack-struct=2";
|
||||
PRODUCT_NAME = "BoE Scenario Editor";
|
||||
|
||||
21
osx/fix_dylibs.sh
Executable file
21
osx/fix_dylibs.sh
Executable file
@@ -0,0 +1,21 @@
|
||||
#!/bin/sh
|
||||
|
||||
# fix_dylibs.sh
|
||||
# BoE
|
||||
#
|
||||
# Created by Celtic Minstrel on 14-04-17.
|
||||
#
|
||||
|
||||
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"
|
||||
|
||||
# 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"
|
||||
|
||||
# Update references within Boost
|
||||
install_name_tool -change libboost_system.dylib "$EXEPATH/libboost_system.dylib" "$BFSPATH"
|
||||
|
||||
Reference in New Issue
Block a user