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 115b2b7..0000000 Binary files a/3proxy.res and /dev/null differ 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: