RPCS3/hidapi
1
0
Fork 0
mirror of https://github.com/RPCS3/hidapi.git synced 2026-07-18 18:44:26 -04:00
Code Issues Packages Projects Releases Wiki Activity

windows: Have a separate definition flag for export (#515)

Browse Source 
On some compilers an empty definition (e.g. -DHID_API_EXPORT)
means the same as `=1` (i.e. -DHID_API_EXPORT=1), but the HID_API_EXPORT macro should be
empty in static library build case.

Having a separate compiler definition flag solves that issue.
This commit is contained in:
Ihor Dutchak
2023-03-13 12:11:37 +02:00
committed by GitHub
parent e6caff3db3
commit fc3eed3845
2 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
hidapi/hidapi.h
+7 -8
View File
@@ -29,18 +29,17 @@
#include <wchar.h>
/* #480: this is to be refactored properly for v1.0 */
#ifdef _WIN32
/* #480: this is to be refactored properly for v1.0 */
#ifndef HID_API_EXPORT
#ifndef HID_API_NO_EXPORT_DEFINE
#define HID_API_EXPORT __declspec(dllexport)
#endif
#define HID_API_CALL
#else
#ifndef HID_API_EXPORT
#define HID_API_EXPORT /**< API export macro */
#endif
#define HID_API_CALL /**< API call macro */
#endif
#ifndef HID_API_EXPORT
#define HID_API_EXPORT /**< API export macro */
#endif
/* To be removed in v1.0 */
#define HID_API_CALL /**< API call macro */
#define HID_API_EXPORT_CALL HID_API_EXPORT HID_API_CALL /**< API export and call macro*/
windows/CMakeLists.txt
+1 -1
View File
@@ -26,7 +26,7 @@ if(NOT BUILD_SHARED_LIBS)
target_compile_definitions(hidapi_winapi
# prevent marking functions as __declspec(dllexport) for static library build
# #480: this should be refactored for v1.0
PUBLIC HID_API_EXPORT
PUBLIC HID_API_NO_EXPORT_DEFINE
)
endif()