Skip to content

Commit 0f966ad

Browse files
committed
Replace outdated references to liblslXY libraries
1 parent 96fd7b1 commit 0f966ad

File tree

4 files changed

+7
-17
lines changed

4 files changed

+7
-17
lines changed

BUILD.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ From Visual Studio:<BR/>
3939

4040
The Library will be in buildRoot (defined in the configuration above) /LSL/liblsl
4141

42-
Generally you only need liblsl32.dll.
42+
Generally you only need `lsl.dll`.
4343

4444
Note that if you make significant changes, it may be necessary to do a full rebuild before CMake correctly notices the change. CMake -> Clean All is not sufficient to force this.
4545

@@ -65,7 +65,7 @@ To see a list of possible generators, run the command with garbage in the -G opt
6565

6666
The library is in labstreaminglayer\build\LSL\Release.
6767

68-
Generally you only need liblsl32.dll.
68+
Generally you only need `lsl.dll`.
6969

7070
You can open the Visual Studio Project with labstreaminglayer\build\LabStreamingLayer.sln.
7171

@@ -78,4 +78,4 @@ To be written
7878

7979
## OS X
8080

81-
To be written
81+
To be written

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,9 +75,9 @@ To connect an application to the lab streaming layer:
7575
* Include the header for your language (`lsl_c.h` for C, `lsl_cpp.h for C++`)
7676
(automatically done when using CMake) or get
7777
[bindings for your preferred language](https://github.com/sccn/labstreaminglayer/tree/master/LSL)
78-
* Make sure that the library file (`liblsl32`/`64``.dll`/`.so`/`.dylib`) is found by your application.
78+
* Make sure that the library file (`liblsl.so`/`liblsl.dylib`/`lsl.dll`) is found by your application.
7979
On Windows, it should be enough to put it in the same folder as your executable.
80-
When building a Windows app, also make sure that the liblsl64.lib (or liblsl32.lib) file is visible
80+
When building a Windows app, also make sure that the `lsl.lib` file is visible
8181
to your build environment.
8282
* To provide data, create a new streaminfo to describe your stream and create a new outlet with that info.
8383
Push samples into the outlet as your app produces them. Destroy the outlet when you're done.

include/lsl/common.h

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -27,18 +27,8 @@ typedef unsigned int uint32_t;
2727
#define LIBLSL_C_API __declspec(dllexport)
2828
#else
2929
#define LIBLSL_C_API __declspec(dllimport)
30-
#ifdef _WIN64
31-
#define LSLBITS "64"
32-
#else
33-
#define LSLBITS "32"
34-
#endif
35-
#if defined _DEBUG && defined LSL_DEBUG_BINDINGS
36-
#define LSLLIBPOSTFIX "-debug"
37-
#else
38-
#define LSLLIBPOSTFIX ""
39-
#endif
4030
#ifndef LSLNOAUTOLINK
41-
#pragma comment(lib, "liblsl" LSLBITS LSLLIBPOSTFIX ".lib")
31+
#pragma comment(lib, "lsl.lib")
4232
#endif
4333
#endif
4434
#pragma warning(disable : 4275)

include/lsl_cpp.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
* - The "pull API" allows to create stream inlets and read time-synched experiment data from them
1414
* (for recording, viewing or experiment control).
1515
*
16-
* To use this library you need to link to either the liblsl32 or liblsl64 shared library that comes with
16+
* To use this library you need to link to the shared library (lsl) that comes with
1717
* this header. Under Visual Studio the library is linked in automatically.
1818
*/
1919

0 commit comments

Comments
 (0)