From 52245921c5eb8d6e77d2f18ac692e33622af3915 Mon Sep 17 00:00:00 2001
From: Vadim Dashevskiy <watcherhd@gmail.com>
Date: Wed, 21 Nov 2012 11:26:23 +0000
Subject: consistent hash generation fix - part 4

git-svn-id: http://svn.miranda-ng.org/main/trunk@2412 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
---
 plugins/New_GPG/Makefile                   | 23 -----------------------
 plugins/New_GPG/new_gpg_10.vcxproj         |  8 +++-----
 plugins/New_GPG/new_gpg_10.vcxproj.filters |  3 +++
 plugins/New_GPG/src/stdafx.cpp             | 18 ++++++++++++++++++
 4 files changed, 24 insertions(+), 28 deletions(-)
 delete mode 100755 plugins/New_GPG/Makefile
 create mode 100644 plugins/New_GPG/src/stdafx.cpp

(limited to 'plugins/New_GPG')

diff --git a/plugins/New_GPG/Makefile b/plugins/New_GPG/Makefile
deleted file mode 100755
index 183390389b..0000000000
--- a/plugins/New_GPG/Makefile
+++ /dev/null
@@ -1,23 +0,0 @@
-CFLAGS=-g  -mdll -mwindows -I../miranda-im/miranda/include -I./ -I/home/sss/temp/windows/libs/utf8cpp/include -D DEBUG -D _UNICODE -D UNICODE -DBOOST_SYSTEM_STATIC_LINK=1 -DBOOST_THREAD_USE_LIB
-CXXFLAGS=${CFLAGS}
-LDFLAGS=-static-libgcc -Wl,-O1 -shared -s -Wl,--subsystem,windows,--kill-at -lshlwapi -lcomdlg32 -lboost_system-mt -lboost_thread_win32-mt -lboost_random-mt -lboost_date_time-mt
-CPPFLAGS =
-CC=i686-pc-mingw32-gcc
-CXX=i686-pc-mingw32-g++
-STRIP=i686-pc-mingw32-strip
-LD=i686-pc-mingw32-ld
-LNK_COMMON=-lkernel32
-
-MAINOBJS=jabber_account.o clist.o init.o options.o gpg_wrapper.o srmm.o messages.o utilities.o metacontacts.o main.o log.o icons.o
-
-WINDRES=i686-pc-mingw32-windres
-
-all: main
-main: $(MAINOBJS)
-	$(WINDRES) -i new_gpg.rc -o resources.o
-	$(CXX) $(MAINOBJS) resources.o $(LNK_COMMON) $(LDFLAGS) -o new_gpg.dll
-	$(STRIP) new_gpg.dll
-	upx --best --compress-icons=0 new_gpg.dll
-clean:
-	rm *.o
-	rm new_gpg.dll
diff --git a/plugins/New_GPG/new_gpg_10.vcxproj b/plugins/New_GPG/new_gpg_10.vcxproj
index 0e5660cfe2..a437bbe66a 100755
--- a/plugins/New_GPG/new_gpg_10.vcxproj
+++ b/plugins/New_GPG/new_gpg_10.vcxproj
@@ -25,16 +25,14 @@
     <ClCompile Include="src\init.cpp" />
     <ClCompile Include="src\jabber_account.cpp" />
     <ClCompile Include="src\log.cpp" />
-    <ClCompile Include="src\main.cpp">
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|X64'">Create</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|X64'">Create</PrecompiledHeader>
+    <ClCompile Include="src\stdafx.cpp">
+      <PrecompiledHeader>Create</PrecompiledHeader>
     </ClCompile>
     <ClCompile Include="src\messages.cpp" />
     <ClCompile Include="src\metacontacts.cpp" />
     <ClCompile Include="src\options.cpp" />
     <ClCompile Include="src\srmm.cpp" />
+    <ClCompile Include="src\main.cpp" />
     <ClCompile Include="src\utilities.cpp" />
   </ItemGroup>
   <ItemGroup>
diff --git a/plugins/New_GPG/new_gpg_10.vcxproj.filters b/plugins/New_GPG/new_gpg_10.vcxproj.filters
index 96cb8c90fe..692179cf66 100755
--- a/plugins/New_GPG/new_gpg_10.vcxproj.filters
+++ b/plugins/New_GPG/new_gpg_10.vcxproj.filters
@@ -48,6 +48,9 @@
     <ClCompile Include="src\utilities.cpp">
       <Filter>Sources</Filter>
     </ClCompile>
+    <ClCompile Include="src\stdafx.cpp">
+      <Filter>Sources</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="src\commonheaders.h">
diff --git a/plugins/New_GPG/src/stdafx.cpp b/plugins/New_GPG/src/stdafx.cpp
new file mode 100644
index 0000000000..b985a910cd
--- /dev/null
+++ b/plugins/New_GPG/src/stdafx.cpp
@@ -0,0 +1,18 @@
+/*
+Copyright (C) 2012 Miranda NG team (http://miranda-ng.org)
+
+This program is free software; you can redistribute it and/or
+modify it under the terms of the GNU General Public License
+as published by the Free Software Foundation version 2
+of the License.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program. If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include "commonheaders.h"
\ No newline at end of file
-- 
cgit v1.2.3