diff --git a/3proxy.ico b/3proxy.ico index 44dc481..b879bd1 100644 Binary files a/3proxy.ico and b/3proxy.ico differ diff --git a/3proxy.rc b/3proxy.rc index 5a9b43c..3ff2cfa 100644 --- a/3proxy.rc +++ b/3proxy.rc @@ -3,8 +3,8 @@ LANGUAGE 0x09, 0x01 VS_VERSION_INFO VERSIONINFO - FILEVERSION 0,7,0,0 - PRODUCTVERSION 0,7,0,0 + FILEVERSION 0,8,0,0 + PRODUCTVERSION 0,8,0,0 FILETYPE 0x1L FILESUBTYPE 0x0L BEGIN diff --git a/Makefile.msvc b/Makefile.msvc index 9e27291..84fe8ec 100644 --- a/Makefile.msvc +++ b/Makefile.msvc @@ -29,14 +29,14 @@ MAKEFILE = Makefile.msvc PLUGINS = utf8tocp1251 WindowsAuthentication TrafficPlugin StringsPlugin PCREPlugin lastFripper FilePlugin VERFILE = $(VERFILE) -#../3proxy.res: -# rc /fo../3proxy.res ../3proxy.rc - -#3proxyres.obj: ../3proxy.res -# cvtres /out:3proxyres.obj /MACHINE:I386 ../3proxy.res - include Makefile.inc +../3proxy.res: + rc /fo../3proxy.res ../3proxy.rc + +3proxyres.obj: ../3proxy.res + cvtres /out:3proxyres.obj /MACHINE:I386 ../3proxy.res + allplugins: for /D %%i in ($(PLUGINS)) do (copy Makefile plugins\%%i && copy Makefile.var plugins\%%i && cd plugins\%%i && nmake && del *.obj *.idb &&cd ..\..) \ No newline at end of file diff --git a/Makefile.msvc64 b/Makefile.msvc64 index d6dced7..8a1e98d 100644 --- a/Makefile.msvc64 +++ b/Makefile.msvc64 @@ -37,6 +37,13 @@ VERFILE = $(VERFILE) include Makefile.inc +../3proxy.res: + rc /fo../3proxy.res ../3proxy.rc + +3proxyres.obj: ../3proxy.res + cvtres /out:3proxyres.obj /machine:x64 ../3proxy.res + + allplugins: for /D %%i in ($(PLUGINS)) do (copy Makefile plugins\%%i && copy Makefile.var plugins\%%i && cd plugins\%%i && nmake && del *.obj *.idb &&cd ..\..) diff --git a/src/version.h b/src/version.h index 2a103c2..383b4b6 100644 --- a/src/version.h +++ b/src/version.h @@ -1,2 +1,2 @@ #define VERSION "3proxy-0.8b-devel" -#define BUILDDATE "141214052453" +#define BUILDDATE "150216013249"