Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
maddouri committed Feb 21, 2018
2 parents 0efb75e + f052736 commit a69019a
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 9 deletions.
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ set(CONFIG_PACKAGE_BUILD_LOCATION "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}
set(CONFIG_PACKAGE_INSTALL_LOCATION "lib/cmake/${PROJECT_NAME}")
write_basic_package_version_file (
"${CONFIG_PACKAGE_BUILD_LOCATION}/${PROJECT_NAME}ConfigVersion.cmake"
VERSION 1.0.2
VERSION 1.0.3
COMPATIBILITY AnyNewerVersion
)
export(
Expand Down
12 changes: 6 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@

dynalo is a header-only library that provides a cross platform API for:

* Loading/unloading a shared library (`.so` in Linux and `.dll` in Windows)
* Getting a pointer to an exported function in the loaded shared library
* Loading and unloading a shared library (`.so` in Linux and `.dll` in Windows)
* Getting a pointer to exported functions in the loaded shared library

## API Summary

Expand All @@ -21,7 +21,7 @@ Everything is inside the `dynalo` namespace which is defined in the `dynalo/dyna
void close(native::handle lib_handle);
```

* Look up a function in the shared library and return pointer to it
* Look up a function in the shared library and return a pointer to it

```cpp
template <typename FunctionSignature>
Expand All @@ -46,7 +46,7 @@ Everything is inside the `dynalo` namespace which is defined in the `dynalo/dyna
};
```

* Generate a valid shared library file:
* Generate a valid shared library file name
* On Linux: Convert `awesome` to `libawesome.so`
* On Windows: Convert `awesome` to `awesome.dll`

Expand All @@ -57,7 +57,7 @@ Everything is inside the `dynalo` namespace which is defined in the `dynalo/dyna
## Example

This is a simple example of a shared library that exports some functions
and a program the dynamically load the library then calls its exported functions.
and a program that dynamically loads the library then calls its exported functions.

See the [`test`](test) folder for details on how to compile.

Expand Down Expand Up @@ -143,4 +143,4 @@ cmake --build . [--config (Debug|Release|...)] --target install

### Manual Installation

dynalo is a header-only library. You can simply copy the content of the [`include`](include) folder into your project. (just remember to link with the proper libs as mentioned in "Dependencies")
dynalo is a header-only library. Therefore, you can simply copy the content of the [`include`](include) folder into your project. (just remember to link with the proper libs as mentioned in "Dependencies")
4 changes: 2 additions & 2 deletions include/dynalo/detail/config.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,5 @@

#define DYNALO_VERSION_MAJOR 1
#define DYNALO_VERSION_MINOR 0
#define DYNALO_VERSION_PATCH 2
#define DYNALO_VERSION 0x010002 /**< major minor patch*/
#define DYNALO_VERSION_PATCH 3
#define DYNALO_VERSION 0x010003 /**< major minor patch*/

0 comments on commit a69019a

Please sign in to comment.