AMajor/SoftEtherVPN
1
0
Fork 0
mirror of https://github.com/SoftEtherVPN/SoftEtherVPN.git synced 2024-11-22 09:29:52 +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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/Cedar/CMakeLists.txt
View File

@ -27,6 +27,7 @@ if(WIN32)
) )
target_include_directories(cedar PRIVATE winpcap) target_include_directories(cedar PRIVATE winpcap)
target_link_libraries(cedar PRIVATE comctl32.lib urlmon.lib)
endif() endif()
if(UNIX) if(UNIX)

5
src/Cedar/Win32Com.h
View File

@ -14,11 +14,6 @@
#endif // WIN32COM_CPP #endif // WIN32COM_CPP
// For external function
#pragma comment(lib,"htmlhelp.lib")
#pragma comment(lib,"Urlmon.lib")
#if defined(__cplusplus) #if defined(__cplusplus)
extern "C" extern "C"
{ {

3
src/Cedar/WinJumpList.cpp
View File

@ -80,9 +80,6 @@ extern "C"
//#include <propvarutil.h> //#include <propvarutil.h>
//#include <knownfolders.h> //#include <knownfolders.h>
//#include <shlobj.h> //#include <shlobj.h>
//
//#pragma comment(lib, "propsys.lib")
//#pragma comment(lib, "shlwapi.lib")
#define CREATE_PROPERTYKEY(l, w1, w2, b1, b2, b3, b4, b5, b6, b7, b8, pid) { { l, w1, w2, { b1, b2, b3, b4, b5, b6, b7, b8 } }, pid } #define CREATE_PROPERTYKEY(l, w1, w2, b1, b2, b3, b4, b5, b6, b7, b8, pid) { { l, w1, w2, { b1, b2, b3, b4, b5, b6, b7, b8 } }, pid }

2
src/Mayaqua/CMakeLists.txt
View File

@ -27,6 +27,8 @@ if(WIN32)
COMPILE_PDB_NAME "mayaqua" COMPILE_PDB_NAME "mayaqua"
COMPILE_PDB_OUTPUT_DIRECTORY "${BUILD_DIRECTORY}" COMPILE_PDB_OUTPUT_DIRECTORY "${BUILD_DIRECTORY}"
) )
target_link_libraries(mayaqua PRIVATE setupapi.lib winmm.lib)
endif() endif()
if(UNIX) 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); void WriteProbeData(char *filename, UINT line, char *str, void *data, UINT size);
USHORT CalcChecksum16(void *buf, 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 // For Debugging
#ifndef ENCRYPT_C #ifndef ENCRYPT_C
//#define Disconnect(s) {Debug("Disconnect() Called: %s %u\n", __FILE__, __LINE__);Disconnect(s);} //#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 #endif // MAYAQUA_H

2
src/vpninstall/vpninstall.c
View File

@ -26,8 +26,6 @@
#include "vpninstall.h" #include "vpninstall.h"
#include "resource.h" #include "resource.h"
#pragma comment(lib, "wininet.lib")
static bool is_debug = true; static bool is_debug = true;
static LIST *string_table = NULL; static LIST *string_table = NULL;
static VI_SETTING setting; static VI_SETTING setting;

2
src/vpnweb/vpnwebdlg.c
View File

@ -33,8 +33,6 @@
#include "vpnwebdlg_inner.h" #include "vpnwebdlg_inner.h"
#include "resource.h" #include "resource.h"
#pragma comment(lib, "wininet.lib")
static VPNWEBDLG_INIT data; static VPNWEBDLG_INIT data;
static bool inited = false; static bool inited = false;
static VW_TASK task; static VW_TASK task;