Move icon compilations to makefiles

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

Makefile.msvc

@@ -29,13 +29,13 @@ MAKEFILE = Makefile.msvc
 PLUGINS = utf8tocp1251 WindowsAuthentication TrafficPlugin StringsPlugin PCREPlugin lastFripper FilePlugin
 VERFILE = $(VERFILE)
 
-#../3proxy.res:
-#	rc /fo../3proxy.res ../3proxy.rc
+include Makefile.inc
 
-#3proxyres.obj: ../3proxy.res
-#	cvtres /out:3proxyres.obj /MACHINE:I386 ../3proxy.res
+../3proxy.res:
+	rc /fo../3proxy.res ../3proxy.rc
 
-include Makefile.inc
+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 ..\..)

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 ..\..)
 

src/version.h

@@ -1,2 +1,2 @@
 #define VERSION "3proxy-0.8b-devel"
-#define BUILDDATE "141214052453"
+#define BUILDDATE "150216013249"