From 7951de875a7a5f1c664e2e3984d3238da0f67e32 Mon Sep 17 00:00:00 2001 From: z3APA3A <3APA3A@3proxy.ru> Date: Tue, 17 Feb 2015 16:05:55 +0300 Subject: [PATCH] Move icon compilations to makefiles --- 3proxy.ico | Bin 32988 -> 32988 bytes 3proxy.rc | 4 ++-- Makefile.msvc | 12 ++++++------ Makefile.msvc64 | 7 +++++++ src/version.h | 2 +- 5 files changed, 16 insertions(+), 9 deletions(-) diff --git a/3proxy.ico b/3proxy.ico index 44dc48143d48dcf29b781f062f63da9359954b73..b879bd139849135061178bdf072acc1984b5b02f 100644 GIT binary patch literal 32988 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 TBft^h2yg^A0vv(Ph`@gU<@t}U literal 32988 zcmeI4J&znk5QZCM@gWEtS|Zu(j6{I=1t%d9Lk1Cnb0o_#vSkZ7wuDT0h{S@7Kj46f zfQX22QvV8g-@Sd#FKV|x4L_3_Ey{4TkTdmJ#D%!+Ff10Xss<4 ztNYuneW$TIcUJfBxAy$Y)^2Nj$$zW0m*2E@S2AL2k3=4?RtOXVg+L)t2owT^Kp{{F z6as}nAy5bu0);>!PzV$Pg+L)t2=pNEKx3~&Cp~jlHT1R&|0McX)QLV2&DE}Z{Knu{ z(K|B%a2?~1q1r!V@Od1Zuz%g-|46a^BYHYv%uyBbf2=|Fobm3n_m##k%LVx|U!R^K z9iOfE@9CPGb#|gT&H>{8P5SYfYqmM$yF~Smz1IE|Aserq#_=7#xTiVqBA-N-jr?2R z9D9I##b*Hi*k)V@WAUS>FRrX7=Xy*pb6LkZI=lbH?~E;Z>STi4;mbO_c-E%}e63sm z-CeGmh#Ru-dG2db%n>}hULAiYBF3oCbJ6Bd{H)QqR>t&r4jJb)+K6)S_)LiX$g^vI zEdCsCzQ;DcZ4$p_S$pfq#kDYHEie}UocU*8IR9SXIVR@gobex8E1KG>k%PRa!Ml@I z_6GU)dW;QUI}O6i{Lmb_z89l0$U5^GX??7-%PL zdWgfk?}=P@bfSoz^<_Kg%e-RUy4g-AdLpu)k+OZq--#kG@sj5#Pv0_Qv4IB|<$H-= zG;$Dgbuqa`hxqLuIkexMDEh41M*KXph%fpQb$FhbEbqp;&f_tz*guzg{dWwT*Id;r z1PXydpb#ho3IQWP?Zh*?@7a8)NR8EI)Nh9xyW^rJyO)Bb&dRk|V!P3|Oa$|GZF%nde~NxsYWJ=|0APY_Z2Y@;SsYW58O7 zpWj4`4xvAG#veoc&LMHeI*-rMUTOa15E4BS19cu}e!S+Ictp*Oo?;)w*bjN%-{@qO z^MybmPzdaTfPW`oAvzV+?*s^hYK6cs0|dhz8Ck5UyVV>uCUvFXv3bAt+_M#*F8^!j;~gc+_SyI6melT<_e^vCUdfLl z@@XA^hkJG3Xv7b{{Y5_8H}6Xkcw|}o=I`|oi@M8qFpuH0$70JmJZC+|GTYDh(O1jm zSegGsbI(QjyH=L5eSd$I+#zE;vc1dV=Y5k{&5zyt>VvVm7Y+NY7w5DS8Drb`ccAf2 z-6b~YkNL+pe@BHJc|P*ew;mdD-)f+5{r{rzpGBR>KH;x<8B_NSzl_7v)fm1z7O&5~ z9B8=O6(Zm@AHM_7THJ?A*k+yBW?a{E`w;gVwpioQC+7BXy=wb?n9LnF>%iyAKG$E4 z>#DK0KR!SAg+YF1?%TfY`FZc>g&X+yJ*&<+rvDq)p4Z<#ZBHLfXvE9BiM8 z*7%$t)>3QfA7HW`uQAp;Y*XpCKGt)5ep&wuk!^P(*K*M&GMvBfYTh*gdm*1mu4f;M zsOPMUn9$2rQ_C|g>T=&U{jOm@&qV0*neq z(d#QQIsWXwhL&eneCP4`Mg2{D=CiIJM6TyM5%|AY-G8VnH5h)xbCJHU_@VAnudme# zf$NTd*RIbO6Z>i^pV_nMi~E(aDX(+s2cx*hr}W#p;u$rS?s!(tq2GRjjn|K#8P)cH zfa@fGsI(BRQ74IO^2R%X^WKU4?A)})nqX5|^IP7}Zq6@1qc>@mKMMkzo*%i6*+d@v zewTe>81g^Yfz)Kd_0g{VVsGX%c~r1xa$9-g-Q^i$9G;0bU2DW885GVu+fkL1VCR1PXydpb#ho3V}kP5GVu+fkL1VCR1PXyd Spb#ho3V}kP5GVwe2>b_IV3_Ct 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"