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

Add icon, resolve MinGW compilation issues

Browse Source
This commit is contained in:
Vladimir Dubrovin 2014-04-13 18:26:32 +04:00
parent d255b703a5
commit 2b0f8bbcfc
11 changed files with 10 additions and 34 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.ico Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 32 KiB

9
3proxy.rc
View File

@ -1,7 +1,6 @@
#include "src/version.h" #include "src/version.h"
#include "afxres.h"
LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT LANGUAGE 0x09, 0x01
VS_VERSION_INFO VERSIONINFO VS_VERSION_INFO VERSIONINFO
FILEVERSION 0,7,0,0 FILEVERSION 0,7,0,0
@ -18,9 +17,9 @@ BEGIN
VALUE "FileDescription", "3proxy - tiny proxy server" VALUE "FileDescription", "3proxy - tiny proxy server"
VALUE "FileVersion", VERSION "-" BUILDDATE VALUE "FileVersion", VERSION "-" BUILDDATE
VALUE "InternalName", "3proxy" VALUE "InternalName", "3proxy"
VALUE "LegalCopyright", "Copyright (C) 2002-2009 Vladimir Dubrovin" VALUE "LegalCopyright", "Copyright (C) 2002-2014 Vladimir Dubrovin"
VALUE "OriginalFilename", "3proxy.exe" VALUE "OriginalFilename", "3proxy.exe"
VALUE "ProductName", "3proxy" VALUE "ProductName", "3proxy - tiny proxy server"
VALUE "ProductVersion", VERSION VALUE "ProductVersion", VERSION
END END
END END
@ -29,4 +28,4 @@ BEGIN
VALUE "Translation", 0x0, 1200 VALUE "Translation", 0x0, 1200
END END
END END
0 ICON DISCARDABLE "3proxy.ico"

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 libeay32MT.lib ssleay32MT.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 libeay32MT.lib ssleay32MT.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

@ -229,7 +229,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;