Adding icons, resolving MinGW compilation

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

1
.gitignore vendored
View File

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

BIN
3proxy.res Normal file

Binary file not shown.

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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