From 5543b3052dde45f09362e09f89112b02ad050f16 Mon Sep 17 00:00:00 2001
From: Vladimir Dubrovin <3proxy@3proxy.ru>
Date: Sun, 13 Apr 2014 19:21:18 +0400
Subject: [PATCH] Moving icons compilation to Makefiles

---
 .gitignore       |   1 +
 3proxy.res       | Bin 25272 -> 0 bytes
 Makefile.msvc    |   8 +++++++-
 Makefile.msvc64  |   7 +++++++
 src/Makefile.inc |   2 +-
 5 files changed, 16 insertions(+), 2 deletions(-)
 delete mode 100644 3proxy.res

diff --git a/.gitignore b/.gitignore
index 05e2ab2..4bd7388 100644
--- a/.gitignore
+++ b/.gitignore
@@ -18,6 +18,7 @@ tmp/
 src/version.h
 src/res
 version.c
+3proxy.res
 doc/html/man3/
 doc/html/man8/
 doc/html/index.html
diff --git a/3proxy.res b/3proxy.res
deleted file mode 100644
index 115b2b77dbc53fbcc26bf9ca6cd55f7926afbd86..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 25272
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
EKiS_-g#Z8m

diff --git a/Makefile.msvc b/Makefile.msvc
index 0ee2858..db8d4db 100644
--- a/Makefile.msvc
+++ b/Makefile.msvc
@@ -28,10 +28,16 @@ TYPECOMMAND = type
 COMPATLIBS =
 MAKEFILE = Makefile.msvc
 PLUGINS = utf8tocp1251 WindowsAuthentication TrafficPlugin StringsPlugin PCREPlugin lastFripper FilePlugin
-
+VERFILE = 3proxyres.obj $(VERFILE)
 
 include Makefile.inc
 
+../3proxy.res:
+	rc /fo../3proxy.res ../3proxy.rc
+
+3proxyres.obj: ../3proxy.res
+	cvtres /out:3proxyres.obj /MACHINE:X86 ../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 6ee3eda..f4d5d3c 100644
--- a/Makefile.msvc64
+++ b/Makefile.msvc64
@@ -28,9 +28,16 @@ TYPECOMMAND = type
 COMPATLIBS =
 MAKEFILE = Makefile.msvc64
 PLUGINS = utf8tocp1251 WindowsAuthentication TrafficPlugin StringsPlugin PCREPlugin
+VERFILE = 3proxyres.obj $(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/Makefile.inc b/src/Makefile.inc
index 8571993..96176d7 100644
--- a/src/Makefile.inc
+++ b/src/Makefile.inc
@@ -3,7 +3,7 @@
 # 3 proxy common Makefile
 #
 
-all:	pre $(BUILDDIR)3proxy$(EXESUFFICS) $(BUILDDIR)mycrypt$(EXESUFFICS) $(BUILDDIR)dighosts$(EXESUFFICS) $(BUILDDIR)pop3p$(EXESUFFICS) $(BUILDDIR)smtpp$(EXESUFFICS) $(BUILDDIR)ftppr$(EXESUFFICS) $(BUILDDIR)tcppm$(EXESUFFICS) $(BUILDDIR)icqpr$(EXESUFFICS) $(BUILDDIR)msnpr$(EXESUFFICS) $(BUILDDIR)udppm$(EXESUFFICS) $(BUILDDIR)socks$(EXESUFFICS) $(BUILDDIR)proxy$(EXESUFFICS) $(BUILDDIR)countersutil$(EXESUFFICS) allplugins
+all:	pre $(VERFILE) $(BUILDDIR)3proxy$(EXESUFFICS) $(BUILDDIR)mycrypt$(EXESUFFICS) $(BUILDDIR)dighosts$(EXESUFFICS) $(BUILDDIR)pop3p$(EXESUFFICS) $(BUILDDIR)smtpp$(EXESUFFICS) $(BUILDDIR)ftppr$(EXESUFFICS) $(BUILDDIR)tcppm$(EXESUFFICS) $(BUILDDIR)icqpr$(EXESUFFICS) $(BUILDDIR)msnpr$(EXESUFFICS) $(BUILDDIR)udppm$(EXESUFFICS) $(BUILDDIR)socks$(EXESUFFICS) $(BUILDDIR)proxy$(EXESUFFICS) $(BUILDDIR)countersutil$(EXESUFFICS) allplugins
 
 
 pre: