summaryrefslogtreecommitdiff
path: root/src/core/stduserinfo
diff options
context:
space:
mode:
Diffstat (limited to 'src/core/stduserinfo')
-rw-r--r--src/core/stduserinfo/res/resource.rc4
-rw-r--r--src/core/stduserinfo/src/commonheaders.h3
-rw-r--r--src/core/stduserinfo/stduserinfo_10.vcxproj9
-rw-r--r--src/core/stduserinfo/stduserinfo_10.vcxproj.filters3
-rw-r--r--src/core/stduserinfo/stduserinfo_12.vcxproj9
-rw-r--r--src/core/stduserinfo/stduserinfo_12.vcxproj.filters3
6 files changed, 11 insertions, 20 deletions
diff --git a/src/core/stduserinfo/res/resource.rc b/src/core/stduserinfo/res/resource.rc
index 63b5fd52eb..c91b0a1c03 100644
--- a/src/core/stduserinfo/res/resource.rc
+++ b/src/core/stduserinfo/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
/////////////////////////////////////////////////////////////////////////////
@@ -285,7 +285,7 @@ END
1 TEXTINCLUDE
BEGIN
- "..\..\resource.h\0"
+ "..\..\mir_app\src\resource.h\0"
END
2 TEXTINCLUDE
diff --git a/src/core/stduserinfo/src/commonheaders.h b/src/core/stduserinfo/src/commonheaders.h
index d7e900ffae..ec79f2ea84 100644
--- a/src/core/stduserinfo/src/commonheaders.h
+++ b/src/core/stduserinfo/src/commonheaders.h
@@ -68,7 +68,6 @@ 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/stduserinfo/stduserinfo_10.vcxproj b/src/core/stduserinfo/stduserinfo_10.vcxproj
index d04fcf9a96..50062a45d6 100644
--- a/src/core/stduserinfo/stduserinfo_10.vcxproj
+++ b/src/core/stduserinfo/stduserinfo_10.vcxproj
@@ -91,7 +91,7 @@
<AdditionalIncludeDirectories>..\..\..\include\msapi;..\..\..\include</AdditionalIncludeDirectories>
</ResourceCompile>
<Link>
- <AdditionalDependencies>miranda32.lib;ws2_32.lib;comctl32.lib;UxTheme.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>ws2_32.lib;comctl32.lib;UxTheme.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;UxTheme.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>ws2_32.lib;comctl32.lib;UxTheme.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;UxTheme.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>ws2_32.lib;comctl32.lib;UxTheme.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;UxTheme.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>ws2_32.lib;comctl32.lib;UxTheme.lib;%(AdditionalDependencies)</AdditionalDependencies>
<GenerateDebugInformation>true</GenerateDebugInformation>
<BaseAddress>0x3ae00000</BaseAddress>
<RandomizedBaseAddress>false</RandomizedBaseAddress>
@@ -208,7 +208,6 @@
<ClCompile Include="src\userinfo.cpp" />
</ItemGroup>
<ItemGroup>
- <ClInclude Include="..\stdplug.h" />
<ClInclude Include="src\commonheaders.h" />
<ClInclude Include="src\version.h" />
</ItemGroup>
diff --git a/src/core/stduserinfo/stduserinfo_10.vcxproj.filters b/src/core/stduserinfo/stduserinfo_10.vcxproj.filters
index dd6ca7bfcf..17fb965c79 100644
--- a/src/core/stduserinfo/stduserinfo_10.vcxproj.filters
+++ b/src/core/stduserinfo/stduserinfo_10.vcxproj.filters
@@ -32,9 +32,6 @@
</ClCompile>
</ItemGroup>
<ItemGroup>
- <ClInclude Include="..\stdplug.h">
- <Filter>Header Files</Filter>
- </ClInclude>
<ClInclude Include="src\commonheaders.h">
<Filter>Header Files</Filter>
</ClInclude>
diff --git a/src/core/stduserinfo/stduserinfo_12.vcxproj b/src/core/stduserinfo/stduserinfo_12.vcxproj
index d6df81b469..2119bb3812 100644
--- a/src/core/stduserinfo/stduserinfo_12.vcxproj
+++ b/src/core/stduserinfo/stduserinfo_12.vcxproj
@@ -95,7 +95,7 @@
<AdditionalIncludeDirectories>..\..\..\include\msapi;..\..\..\include</AdditionalIncludeDirectories>
</ResourceCompile>
<Link>
- <AdditionalDependencies>miranda32.lib;ws2_32.lib;comctl32.lib;UxTheme.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>ws2_32.lib;comctl32.lib;UxTheme.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;UxTheme.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>ws2_32.lib;comctl32.lib;UxTheme.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;UxTheme.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>ws2_32.lib;comctl32.lib;UxTheme.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;UxTheme.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>ws2_32.lib;comctl32.lib;UxTheme.lib;%(AdditionalDependencies)</AdditionalDependencies>
<GenerateDebugInformation>true</GenerateDebugInformation>
<BaseAddress>0x3ae00000</BaseAddress>
<RandomizedBaseAddress>false</RandomizedBaseAddress>
@@ -211,7 +211,6 @@
<ClCompile Include="src\userinfo.cpp" />
</ItemGroup>
<ItemGroup>
- <ClInclude Include="..\stdplug.h" />
<ClInclude Include="src\commonheaders.h" />
<ClInclude Include="src\version.h" />
</ItemGroup>
diff --git a/src/core/stduserinfo/stduserinfo_12.vcxproj.filters b/src/core/stduserinfo/stduserinfo_12.vcxproj.filters
index dd6ca7bfcf..17fb965c79 100644
--- a/src/core/stduserinfo/stduserinfo_12.vcxproj.filters
+++ b/src/core/stduserinfo/stduserinfo_12.vcxproj.filters
@@ -32,9 +32,6 @@
</ClCompile>
</ItemGroup>
<ItemGroup>
- <ClInclude Include="..\stdplug.h">
- <Filter>Header Files</Filter>
- </ClInclude>
<ClInclude Include="src\commonheaders.h">
<Filter>Header Files</Filter>
</ClInclude>