Foolmerge1 #172
Open
Foolmerge1 #172
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
zlib cmake changed to make a libz versus libzlib (compatable with system libz) uox3 cmake modified to use system zlib if apple moved zlib/spidermonkey to support subdirectory, to allow orgnaization when using external libraries (non project files). added utility library to support modified uox3 files to use utility/strutil.hpp versus strutil.hpp copy. removed uox3 strutil.hpp copy updated build systems to handle new zlib/spidermonnkey location, and include support directory to include search path
updated uox3 cmake to look for spidermonkey in new location
Xoduz
added
the
nomerge - future ref
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This is mainly organization for support libraries.
It includes the strutil changes, and creates a support directory for non project "owned" files to go (no subtrees/submodules, just relocation).
Changes to accommodate the directory change, and new location of strutil.hpp
(this includes the entire utility library, for consistency if one ever wanted to go to subtree/submodules)