X-Git-Url: http://plrg.eecs.uci.edu/git/?p=junction.git;a=blobdiff_plain;f=README.md;h=c60c8e363fa71d9c928596b25e725c5ec1178a0b;hp=0abbc997a22be3b46cc51e06a4765a5d47e30b2a;hb=cf6d887125e262323993629c27b285f302cc674f;hpb=673a618f0fa0da41cf25897d40edbb0293b4765d;ds=sidebyside diff --git a/README.md b/README.md index 0abbc99..c60c8e3 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@ Junction is a library of concurrent data structures in C++. It contains three ha junction::ConcurrentMap_LeapFrog junction::ConcurrentMap_Grampa -[CMake](https://cmake.org/) and [Turf](https://github.com/preshing/AcquireRelease) are required. See the blog post [New Concurrent Hash Maps for C++](http://preshing.com/20160201/new-concurrent-hash-maps-for-cpp/) for more information. +[CMake](https://cmake.org/) and [Turf](https://github.com/preshing/turf) are required. See the blog post [New Concurrent Hash Maps for C++](http://preshing.com/20160201/new-concurrent-hash-maps-for-cpp/) for more information. ## License @@ -35,7 +35,7 @@ To generate an Xcode project for iOS: The generated build system will contain separate targets for Junction, Turf, and some sample applications. -[[https://github.com/preshing/junction/docs/vs-solution.png]] +![Solution Explorer](/docs/vs-solution.png) Alternatively, you can run CMake on a specific sample only: @@ -78,7 +78,7 @@ For example, to configure Turf to use the C++11 standard library, you can set th Or, using the CMake GUI: -[[https://github.com/preshing/junction/docs/cmake-gui.png]] +![CMake GUI](/docs/cmake-gui.png) Many header files in Turf, and some in Junction, are configurable using preprocessor definitions. For example, `turf/Thread.h` will switch between `turf::Thread` implementations depending on the values of `TURF_IMPL_THREAD_PATH` and `TURF_IMPL_THREAD_TYPE`. If those macros are not defined, they will be set to default values based on information from the environment. You can set them directly by providing your own header file and passing it in the `TURF_USERCONFIG` variable when CMake runs. You can place this file anywhere; CMake will copy it to Turf's build tree right next to `include/turf_config.h`.