bughz/3proxy
1
0
Fork 0
mirror of https://github.com/3proxy/3proxy.git synced 2025-02-23 10:35:40 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Adding icons, resolving MinGW compilation

Browse Source
This commit is contained in:
Vladimir Dubrovin 2014-04-13 18:41:25 +04:00
commit 6a0b78268f
9 changed files with 6 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -14,7 +14,6 @@ tmp/
*.bat *.bat
*.swp *.swp
*.o *.o
3proxy.res
*.idb *.idb
src/version.h src/version.h
src/res src/res

BIN
3proxy.res Normal file
View File

Binary file not shown.

3
Makefile.msvc
View File

@ -15,7 +15,8 @@ LN = link
LDFLAGS = /nologo /subsystem:console /incremental:no /machine:I386 LDFLAGS = /nologo /subsystem:console /incremental:no /machine:I386
DLFLAGS = /DLL DLFLAGS = /DLL
DLSUFFICS = .dll DLSUFFICS = .dll
LIBS = ws2_32.lib advapi32.lib odbc32.lib user32.lib kernel32.lib Gdi32.lib LIBS = ws2_32.lib advapi32.lib odbc32.lib user32.lib kernel32.lib Gdi32.lib
LIBSOLD = libeay32MT.lib ssleay32MT.lib
LIBEXT = .lib LIBEXT = .lib
LNOUT = /out: LNOUT = /out:
EXESUFFICS = .exe EXESUFFICS = .exe

3
Makefile.msvc64
View File

@ -15,7 +15,8 @@ LN = link
LDFLAGS = /nologo /subsystem:console /incremental:no /machine:x64 LDFLAGS = /nologo /subsystem:console /incremental:no /machine:x64
DLFLAGS = /DLL DLFLAGS = /DLL
DLSUFFICS = .dll DLSUFFICS = .dll
LIBS = ws2_32.lib advapi32.lib odbc32.lib user32.lib kernel32.lib Gdi32.lib LIBS = ws2_32.lib advapi32.lib odbc32.lib user32.lib kernel32.lib Gdi32.lib
LIBSOLD = libeay32MT.lib ssleay32MT.lib
LIBEXT = .lib LIBEXT = .lib
LNOUT = /out: LNOUT = /out:
EXESUFFICS = .exe EXESUFFICS = .exe

7
src/plugins/LdapPlugin/ldapauth.c
View File

@ -105,13 +105,6 @@ int savecouters(void)
#ifdef _WIN32 #ifdef _WIN32
__declspec(dllexport) int start(struct pluginlink * pluginlink, __declspec(dllexport) int start(struct pluginlink * pluginlink,
int argc, char** argv); int argc, char** argv);
BOOL APIENTRY DllMain( HMODULE hModule,
DWORD ul_reason_for_call,
LPVOID lpReserved
)
{
return TRUE;
}
#else #else
int start(struct pluginlink * pluginlink, int start(struct pluginlink * pluginlink,

2
src/plugins/StringsPlugin/StringsPlugin.c
View File

@ -153,7 +153,7 @@ static int restore_old_table(void * v)
#ifdef _WIN32 #ifdef _WIN32
__declspec(dllexport) int start(struct pluginlink * pluginlink, __declspec(dllexport) int start(struct pluginlink * pluginlink,
int argc, char** argv); int argc, char** argv);
BOOL APIENTRY DllMain( HMODULE hModule, BOOL WINAPI DllMain( HINSTANCE hModule,
DWORD ul_reason_for_call, DWORD ul_reason_for_call,
LPVOID lpReserved LPVOID lpReserved
) )

2
src/plugins/TrafficPlugin/TrafficPlugin.c
View File

@ -257,7 +257,7 @@ void mylogfunc(struct clientparam * param, const unsigned char * pz) {
#ifdef _WIN32 #ifdef _WIN32
BOOL APIENTRY DllMain( HANDLE hModule, BOOL WINAPI DllMain( HINSTANCE hModule,
DWORD ul_reason_for_call, DWORD ul_reason_for_call,
LPVOID lpReserved LPVOID lpReserved
) )

8
src/plugins/WindowsAuthentication/WindowsAuthentication.c
View File

@ -20,14 +20,6 @@ extern "C" {
int argc, char** argv); int argc, char** argv);
BOOL APIENTRY DllMain( HMODULE hModule,
DWORD ul_reason_for_call,
LPVOID lpReserved
)
{
return TRUE;
}
static struct auth alwaysauth; static struct auth alwaysauth;
static char sidbuf[4096]; static char sidbuf[4096];

9
src/plugins/utf8tocp1251/utf8tocp1251.c
View File

@ -18,15 +18,6 @@ extern "C" {
__declspec(dllexport) int utf8tocp1251(struct pluginlink * pluginlink, __declspec(dllexport) int utf8tocp1251(struct pluginlink * pluginlink,
int argc, char** argv); int argc, char** argv);
BOOL APIENTRY DllMain( HMODULE hModule,
DWORD ul_reason_for_call,
LPVOID lpReserved
)
{
return TRUE;
}
static struct auth alwaysauth; static struct auth alwaysauth;