hashtags/lmms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

Fix libcds MSVC compilation

Browse Source 
* Update to include 4227281c367a0dd36765bba58bd9bb6f43ceb88b fixing
  https://github.com/khizmax/libcds/issues/124
* Make CDS_BUILD_STATIC_LIB compile definition public to avoid dllimport
  attribute in defs.h
* Make dependencies' defintions actually propagate to lmmsobjs
This commit is contained in:
Lukas W
2020-05-11 15:20:36 +02:00
parent 5ae42cafc4
commit a64f83e0ed
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/3rdparty/CMakeLists.txt vendored
View File

@@ -52,7 +52,7 @@ ENDIF()
IF(CDS_LIBRARY_TYPE STREQUAL "STATIC")
TARGET_COMPILE_DEFINITIONS(cds
PRIVATE CDS_BUILD_STATIC_LIB
PUBLIC CDS_BUILD_STATIC_LIB
)
ELSE()
TARGET_COMPILE_DEFINITIONS(cds

2
src/3rdparty/libcds vendored

Submodule src/3rdparty/libcds updated: e5bba766b9...44c052bdb6

2
src/CMakeLists.txt
View File

@@ -123,7 +123,7 @@ TARGET_INCLUDE_DIRECTORIES(lmms
# See the documentation of DEFINE_SYMBOL for details.
# Also add LMMS_STATIC_DEFINE for targets linking against it.
TARGET_COMPILE_DEFINITIONS(lmmsobjs
PRIVATE -Dlmmsobjs_EXPORTS
PRIVATE -Dlmmsobjs_EXPORTS $<TARGET_PROPERTY:lmms,COMPILE_DEFINITIONS>
INTERFACE -DLMMS_STATIC_DEFINE
)
TARGET_COMPILE_DEFINITIONS(lmms