From cbe3cb21f5bca61a03bbd4ae811ee906e09b3f4f Mon Sep 17 00:00:00 2001
From: George Hazan <george.hazan@gmail.com>
Date: Sat, 13 Jun 2015 16:55:17 +0000
Subject: - miranda32.exe now does nothing bug extends PATH to
 %miranda_root%\libs and loads mir_app.dll; - everything that was in
 miranda32.exe (including resources) moved to mir_app.dll; - exports from
 mir_app.dll now available for using directly, without perversions; -
 src/stdplug.h deleted;

git-svn-id: http://svn.miranda-ng.org/main/trunk@14143 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
---
 src/core/stdhelp/res/resource.rc            | 4 ++--
 src/core/stdhelp/src/commonheaders.h        | 3 +--
 src/core/stdhelp/stdhelp_10.vcxproj         | 9 ++++-----
 src/core/stdhelp/stdhelp_10.vcxproj.filters | 3 ---
 src/core/stdhelp/stdhelp_12.vcxproj         | 9 ++++-----
 src/core/stdhelp/stdhelp_12.vcxproj.filters | 3 ---
 6 files changed, 11 insertions(+), 20 deletions(-)

(limited to 'src/core/stdhelp')

diff --git a/src/core/stdhelp/res/resource.rc b/src/core/stdhelp/res/resource.rc
index 98a5334dca..e3f8728481 100644
--- a/src/core/stdhelp/res/resource.rc
+++ b/src/core/stdhelp/res/resource.rc
@@ -1,6 +1,6 @@
 // Microsoft Visual C++ generated resource script.
 //
-#include "..\..\resource.h"
+#include "..\..\mir_app\src\resource.h"
 
 #define APSTUDIO_READONLY_SYMBOLS
 /////////////////////////////////////////////////////////////////////////////
@@ -76,7 +76,7 @@ END
 
 1 TEXTINCLUDE
 BEGIN
-    "..\..\resource.h\0"
+	"..\..\mir_app\src\resource.h\0"
 END
 
 2 TEXTINCLUDE
diff --git a/src/core/stdhelp/src/commonheaders.h b/src/core/stdhelp/src/commonheaders.h
index 83c8ce38b1..e1763c4cc8 100644
--- a/src/core/stdhelp/src/commonheaders.h
+++ b/src/core/stdhelp/src/commonheaders.h
@@ -66,8 +66,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 #include "version.h"
 
-#include "../../resource.h"
-#include "../stdplug.h"
+#include "../../mir_app/src/resource.h"
 
 extern HINSTANCE hInst;
 
diff --git a/src/core/stdhelp/stdhelp_10.vcxproj b/src/core/stdhelp/stdhelp_10.vcxproj
index ac4df7abec..92a51e53f1 100644
--- a/src/core/stdhelp/stdhelp_10.vcxproj
+++ b/src/core/stdhelp/stdhelp_10.vcxproj
@@ -91,7 +91,7 @@
       <AdditionalIncludeDirectories>..\..\..\include\msapi;..\..\..\include</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Link>
-      <AdditionalDependencies>miranda32.lib;ws2_32.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>ws2_32.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <OptimizeReferences>true</OptimizeReferences>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
@@ -125,7 +125,7 @@
       <AdditionalIncludeDirectories>..\..\..\include\msapi;..\..\..\include</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Link>
-      <AdditionalDependencies>miranda32.lib;ws2_32.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>ws2_32.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <BaseAddress>0x3ae00000</BaseAddress>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
@@ -156,7 +156,7 @@
       <AdditionalIncludeDirectories>..\..\..\include\msapi;..\..\..\include</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Link>
-      <AdditionalDependencies>miranda64.lib;ws2_32.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>ws2_32.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <OptimizeReferences>true</OptimizeReferences>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
@@ -189,7 +189,7 @@
       <AdditionalIncludeDirectories>..\..\..\include\msapi;..\..\..\include</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Link>
-      <AdditionalDependencies>miranda64.lib;ws2_32.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>ws2_32.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <BaseAddress>0x3ae00000</BaseAddress>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
@@ -207,7 +207,6 @@
     <ClCompile Include="src\main.cpp" />
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\stdplug.h" />
     <ClInclude Include="src\commonheaders.h" />
     <ClInclude Include="src\version.h" />
   </ItemGroup>
diff --git a/src/core/stdhelp/stdhelp_10.vcxproj.filters b/src/core/stdhelp/stdhelp_10.vcxproj.filters
index d783a2d94c..896fa3dd73 100644
--- a/src/core/stdhelp/stdhelp_10.vcxproj.filters
+++ b/src/core/stdhelp/stdhelp_10.vcxproj.filters
@@ -32,9 +32,6 @@
     <ClInclude Include="src\commonheaders.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\stdplug.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="src\version.h">
       <Filter>Header Files</Filter>
     </ClInclude>
diff --git a/src/core/stdhelp/stdhelp_12.vcxproj b/src/core/stdhelp/stdhelp_12.vcxproj
index 67af883c0b..ae8167a6b1 100644
--- a/src/core/stdhelp/stdhelp_12.vcxproj
+++ b/src/core/stdhelp/stdhelp_12.vcxproj
@@ -95,7 +95,7 @@
       <AdditionalIncludeDirectories>..\..\..\include\msapi;..\..\..\include</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Link>
-      <AdditionalDependencies>miranda32.lib;ws2_32.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>ws2_32.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <OptimizeReferences>true</OptimizeReferences>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
@@ -128,7 +128,7 @@
       <AdditionalIncludeDirectories>..\..\..\include\msapi;..\..\..\include</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Link>
-      <AdditionalDependencies>miranda32.lib;ws2_32.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>ws2_32.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <BaseAddress>0x3ae00000</BaseAddress>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
@@ -160,7 +160,7 @@
       <AdditionalIncludeDirectories>..\..\..\include\msapi;..\..\..\include</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Link>
-      <AdditionalDependencies>miranda64.lib;ws2_32.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>ws2_32.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <OptimizeReferences>true</OptimizeReferences>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
@@ -192,7 +192,7 @@
       <AdditionalIncludeDirectories>..\..\..\include\msapi;..\..\..\include</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Link>
-      <AdditionalDependencies>miranda64.lib;ws2_32.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>ws2_32.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <BaseAddress>0x3ae00000</BaseAddress>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
@@ -210,7 +210,6 @@
     <ClCompile Include="src\main.cpp" />
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\stdplug.h" />
     <ClInclude Include="src\commonheaders.h" />
     <ClInclude Include="src\version.h" />
   </ItemGroup>
diff --git a/src/core/stdhelp/stdhelp_12.vcxproj.filters b/src/core/stdhelp/stdhelp_12.vcxproj.filters
index d783a2d94c..896fa3dd73 100644
--- a/src/core/stdhelp/stdhelp_12.vcxproj.filters
+++ b/src/core/stdhelp/stdhelp_12.vcxproj.filters
@@ -32,9 +32,6 @@
     <ClInclude Include="src\commonheaders.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\stdplug.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="src\version.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-- 
cgit v1.2.3