From ecaad6776b0348b9e9d851b74d68f707f1722e24 Mon Sep 17 00:00:00 2001
From: George Hazan <george.hazan@gmail.com>
Date: Tue, 16 Jun 2015 18:02:49 +0000
Subject: compilation fix

git-svn-id: http://svn.miranda-ng.org/main/trunk@14214 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
---
 plugins/MimCmd/MimCmd.vcxproj         |  1 +
 plugins/MimCmd/MimCmd.vcxproj.filters | 69 -----------------------------------
 plugins/MimCmd/src/MimCmd.cpp         | 29 +++++++++------
 3 files changed, 18 insertions(+), 81 deletions(-)

(limited to 'plugins')

diff --git a/plugins/MimCmd/MimCmd.vcxproj b/plugins/MimCmd/MimCmd.vcxproj
index 99f07ab2f4..b8b314ef55 100644
--- a/plugins/MimCmd/MimCmd.vcxproj
+++ b/plugins/MimCmd/MimCmd.vcxproj
@@ -32,6 +32,7 @@
     <Link>
       <SubSystem>Console</SubSystem>
       <DelayLoadDLLs>mir_core.dll</DelayLoadDLLs>
+      <AdditionalDependencies>delayimp.lib;comctl32.lib;ws2_32.lib;UxTheme.lib;Iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
 </Project>
\ No newline at end of file
diff --git a/plugins/MimCmd/MimCmd.vcxproj.filters b/plugins/MimCmd/MimCmd.vcxproj.filters
index 5d862e9cd3..de5ad9f66c 100644
--- a/plugins/MimCmd/MimCmd.vcxproj.filters
+++ b/plugins/MimCmd/MimCmd.vcxproj.filters
@@ -1,73 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$(ProjectDir)..\..\build\vc.common\common.filters" />
-  <ItemGroup>
-    <ClCompile Include="..\CmdLine\src\mimcmd_ipc.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\stdafx.cxx">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\commands.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\MimCmd.cpp" />
-    <ClCompile Include="src\commands.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\MimCmd.cpp" />
-    <ClCompile Include="src\commands.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\MimCmd.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="src\commands.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="src\resource.h" />
-    <ClInclude Include="src\stdafx.h" />
-    <ClInclude Include="src\version.h" />
-    <ClInclude Include="src\commands.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="src\resource.h" />
-    <ClInclude Include="src\stdafx.h" />
-    <ClInclude Include="src\version.h" />
-    <ClInclude Include="src\commands.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="src\resource.h" />
-    <ClInclude Include="src\stdafx.h" />
-    <ClInclude Include="src\version.h" />
-    <ClInclude Include="src\commands.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="src\resource.h" />
-    <ClInclude Include="src\stdafx.h" />
-    <ClInclude Include="src\version.h" />
-    <ClInclude Include="src\commands.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="src\resource.h" />
-    <ClInclude Include="src\stdafx.h" />
-    <ClInclude Include="src\version.h" />
-    <ClInclude Include="src\commands.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="src\resource.h" />
-    <ClInclude Include="src\stdafx.h" />
-    <ClInclude Include="src\version.h" />
-    <ClInclude Include="src\commands.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="src\resource.h" />
-    <ClInclude Include="src\stdafx.h" />
-    <ClInclude Include="src\version.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <ResourceCompile Include="res\*.rc">
-      <Filter>Resource Files</Filter>
-    </ResourceCompile>
-  </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/plugins/MimCmd/src/MimCmd.cpp b/plugins/MimCmd/src/MimCmd.cpp
index 6836069241..fe3c98b56a 100644
--- a/plugins/MimCmd/src/MimCmd.cpp
+++ b/plugins/MimCmd/src/MimCmd.cpp
@@ -81,19 +81,24 @@ int main(int argc, char *argv[])
 		return MIMRES_NOMIRANDA;
 	}
 
-	if (argc <= 1 || argc > MAX_ARGUMENTS)
+	if (argc <= 1 || argc > MAX_ARGUMENTS) {
 		PrintUsage();
+		return 0;
+	}
+
+	int error;
+	PReply reply = ParseCommand(argv, argc);
+	if (reply) {
+		error = reply->code;
+		lpprintf("%s\n", reply->message);
+	}
 	else {
-		PReply reply = ParseCommand(argv, argc);
-		if (reply) {
-			error = reply->code;
-			lpprintf("%s\n", reply->message);
-		}
-		else lpprintf(Translate("Unknown command '%s'.\n"), argv[1]);
-
-		DestroyKnownCommands();
-		DisconnectFromMiranda();
-		DestroyClient();
+		lpprintf(Translate("Unknown command '%s'.\n"), argv[1]);
+		error = 0;
 	}
-	return 0;
+
+	DestroyKnownCommands();
+	DisconnectFromMiranda();
+	DestroyClient();
+	return error;
 }
-- 
cgit v1.2.3