AMajor/SoftEtherVPN
1
0
Fork 0
mirror of https://github.com/SoftEtherVPN/SoftEtherVPN.git synced 2025-07-06 15:54:57 +03:00
Code Releases Activity

Link to Windows libraries in CMake project, remove related #pragma directives

Browse Source 
In addition to making the code cleaner, this also prevents potential issues due to #pragma directives being in headers.
This commit is contained in:
Davide Beatrici
2021-02-28 20:32:25 +01:00
parent ec201f340a
commit dbd4dd5ae7
7 changed files with 3 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Mayaqua/CMakeLists.txt
View File

@ -27,6 +27,8 @@ if(WIN32)
COMPILE_PDB_NAME "mayaqua"
COMPILE_PDB_OUTPUT_DIRECTORY "${BUILD_DIRECTORY}"
)
target_link_libraries(mayaqua PRIVATE setupapi.lib winmm.lib)
endif()
if(UNIX)

22
src/Mayaqua/Mayaqua.h
View File

@ -484,26 +484,6 @@ void WriteProbe(char *filename, UINT line, char *str);
void WriteProbeData(char *filename, UINT line, char *str, void *data, UINT size);
USHORT CalcChecksum16(void *buf, UINT size);
#ifdef OS_WIN32
// Import library (for Win32)
#pragma comment(lib, "Ws2_32.lib")
#pragma comment(lib, "winmm.lib")
#pragma comment(lib, "kernel32.lib")
#pragma comment(lib, "user32.lib")
#pragma comment(lib, "gdi32.lib")
#pragma comment(lib, "shell32.lib")
#pragma comment(lib, "comctl32.lib")
#pragma comment(lib, "dbghelp.lib")
#pragma comment(lib, "Iphlpapi.lib")
#pragma comment(lib, "setupapi.lib")
#pragma comment(lib, "version.lib")
#pragma comment(lib, "Netapi32.lib")
#pragma comment(lib, "shlwapi.lib")
#pragma comment(lib, "crypt32.lib")
#pragma warning( disable : 4099 )
#endif // OS_WIN32
// For Debugging
#ifndef ENCRYPT_C
//#define Disconnect(s) {Debug("Disconnect() Called: %s %u\n", __FILE__, __LINE__);Disconnect(s);}
@ -511,5 +491,3 @@ USHORT CalcChecksum16(void *buf, UINT size);
#endif // MAYAQUA_H