Add icon, resolve MinGW compilation issues

.gitignore

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

3proxy.rc

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

Makefile.msvc

@@ -15,7 +15,8 @@ LN = link
 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 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                                                                                               
 LNOUT = /out:
 EXESUFFICS = .exe

Makefile.msvc64

@@ -15,7 +15,8 @@ LN = link
 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 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
 LNOUT = /out:
 EXESUFFICS = .exe

src/plugins/LdapPlugin/ldapauth.c

@@ -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, 

src/plugins/StringsPlugin/StringsPlugin.c

@@ -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
 					 )

src/plugins/TrafficPlugin/TrafficPlugin.c

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

src/plugins/WindowsAuthentication/WindowsAuthentication.c

@@ -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];

src/plugins/utf8tocp1251/utf8tocp1251.c

@@ -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;