Skip to content

Commit 96fd2d9

Browse files
committed
Add LSQUIC_API to the header
1 parent 183fbac commit 96fd2d9

11 files changed

+201
-113
lines changed

CMakeLists.txt

+1-4
Original file line numberDiff line numberDiff line change
@@ -112,9 +112,7 @@ SET(MY_CMAKE_FLAGS "${MY_CMAKE_FLAGS} /wd4706") # assignment within conditional
112112
SET(MY_CMAKE_FLAGS "${MY_CMAKE_FLAGS} /wd4090") # different 'const' qualifier (TODO: debug ls-sfparser.c)
113113
SET(MY_CMAKE_FLAGS "${MY_CMAKE_FLAGS} /wd4305") # truncation from double to float
114114
SET(MY_CMAKE_FLAGS "${MY_CMAKE_FLAGS} -W4 -WX -Zi -DWIN32_LEAN_AND_MEAN -DNOMINMAX -D_CRT_SECURE_NO_WARNINGS -I${CMAKE_CURRENT_SOURCE_DIR}/wincompat")
115-
IF(LSQUIC_SHARED_LIB)
116-
SET(MY_CMAKE_FLAGS "${MY_CMAKE_FLAGS} -DLSQUIC_SHARED_LIB")
117-
ENDIF()
115+
118116
IF(CMAKE_BUILD_TYPE STREQUAL "Debug")
119117
SET(MY_CMAKE_FLAGS "${MY_CMAKE_FLAGS} -Od")
120118
#SET (MY_CMAKE_FLAGS "${MY_CMAKE_FLAGS} -DFIU_ENABLE=1")
@@ -138,7 +136,6 @@ ENDIF()
138136

139137
IF (MSVC)
140138
IF(LSQUIC_SHARED_LIB)
141-
set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS YES CACHE BOOL "Export all symbols")
142139
SET(LIB_SUFFIX .dll)
143140
ELSE()
144141
SET(LIB_SUFFIX .lib)

bin/CMakeLists.txt

+5-2
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,11 @@ ENDIF()
2424
add_executable(http_server http_server.c prog.c test_common.c test_cert.c)
2525
IF(NOT MSVC) # TODO: port MD5 server and client to Windows
2626
add_executable(md5_server md5_server.c prog.c test_common.c test_cert.c)
27-
add_executable(md5_client md5_client.c prog.c test_common.c test_cert.c)
27+
if(NOT LSQUIC_SHARED_LIB)
28+
# uses an internal function that gets hidden in shared libs
29+
add_executable(md5_client md5_client.c prog.c test_common.c test_cert.c)
30+
TARGET_LINK_LIBRARIES(md5_client ${LIBS})
31+
endif()
2832
ENDIF()
2933
add_executable(echo_server echo_server.c prog.c test_common.c test_cert.c)
3034
add_executable(echo_client echo_client.c prog.c test_common.c test_cert.c)
@@ -59,7 +63,6 @@ TARGET_LINK_LIBRARIES(http_client ${LIBS})
5963
TARGET_LINK_LIBRARIES(http_server ${LIBS})
6064
IF(NOT MSVC)
6165
TARGET_LINK_LIBRARIES(md5_server ${LIBS})
62-
TARGET_LINK_LIBRARIES(md5_client ${LIBS})
6366
ENDIF()
6467
TARGET_LINK_LIBRARIES(echo_server ${LIBS})
6568
TARGET_LINK_LIBRARIES(echo_client ${LIBS})

0 commit comments

Comments
 (0)