summaryrefslogtreecommitdiff
path: root/src/mir_core
diff options
context:
space:
mode:
Diffstat (limited to 'src/mir_core')
-rw-r--r--src/mir_core/mir_core_10.vcxproj8
-rw-r--r--src/mir_core/mir_core_12.vcxproj8
-rw-r--r--src/mir_core/src/icons.cpp1
-rw-r--r--src/mir_core/src/langpack.cpp2
-rw-r--r--src/mir_core/src/mir_core.def3
-rw-r--r--src/mir_core/src/mir_core64.def3
6 files changed, 9 insertions, 16 deletions
diff --git a/src/mir_core/mir_core_10.vcxproj b/src/mir_core/mir_core_10.vcxproj
index 8770eb8e40..2f3cd36668 100644
--- a/src/mir_core/mir_core_10.vcxproj
+++ b/src/mir_core/mir_core_10.vcxproj
@@ -171,7 +171,7 @@
<GenerateDebugInformation>true</GenerateDebugInformation>
<RandomizedBaseAddress>false</RandomizedBaseAddress>
<SubSystem>Windows</SubSystem>
- <AdditionalDependencies>miranda32.lib;ws2_32.lib;comctl32.lib;winmm.lib;version.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>ws2_32.lib;comctl32.lib;winmm.lib;version.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>$(ProfileDir)..\..\bin10\lib</AdditionalLibraryDirectories>
<ImportLibrary>$(IntDir)$(TargetName).lib</ImportLibrary>
<DelayLoadDLLs>miranda32.exe</DelayLoadDLLs>
@@ -212,7 +212,7 @@
<RandomizedBaseAddress>false</RandomizedBaseAddress>
<ImportLibrary>$(IntDir)$(TargetName)64.lib</ImportLibrary>
<SubSystem>Windows</SubSystem>
- <AdditionalDependencies>miranda64.lib;ws2_32.lib;comctl32.lib;winmm.lib;version.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>ws2_32.lib;comctl32.lib;winmm.lib;version.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>$(ProfileDir)..\..\bin10\lib</AdditionalLibraryDirectories>
<AdditionalOptions>/ignore:4197 %(AdditionalOptions)</AdditionalOptions>
<DelayLoadDLLs>miranda64.exe</DelayLoadDLLs>
@@ -246,7 +246,7 @@
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<RandomizedBaseAddress>false</RandomizedBaseAddress>
<SubSystem>Windows</SubSystem>
- <AdditionalDependencies>miranda32.lib;ws2_32.lib;comctl32.lib;winmm.lib;version.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>ws2_32.lib;comctl32.lib;winmm.lib;version.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>$(ProfileDir)..\..\bin10\lib</AdditionalLibraryDirectories>
<ImportLibrary>$(IntDir)$(TargetName).lib</ImportLibrary>
<DelayLoadDLLs>miranda32.exe</DelayLoadDLLs>
@@ -290,7 +290,7 @@
<RandomizedBaseAddress>false</RandomizedBaseAddress>
<ImportLibrary>$(IntDir)$(TargetName)64.lib</ImportLibrary>
<SubSystem>Windows</SubSystem>
- <AdditionalDependencies>miranda64.lib;ws2_32.lib;comctl32.lib;winmm.lib;version.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>ws2_32.lib;comctl32.lib;winmm.lib;version.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>$(ProfileDir)..\..\bin10\lib</AdditionalLibraryDirectories>
<AdditionalOptions>/PDBALTPATH:%_PDB% /ignore:4197</AdditionalOptions>
<DelayLoadDLLs>miranda64.exe</DelayLoadDLLs>
diff --git a/src/mir_core/mir_core_12.vcxproj b/src/mir_core/mir_core_12.vcxproj
index 626835ac80..bcec8cec62 100644
--- a/src/mir_core/mir_core_12.vcxproj
+++ b/src/mir_core/mir_core_12.vcxproj
@@ -179,7 +179,7 @@
<GenerateDebugInformation>true</GenerateDebugInformation>
<RandomizedBaseAddress>false</RandomizedBaseAddress>
<SubSystem>Windows</SubSystem>
- <AdditionalDependencies>miranda32.lib;ws2_32.lib;comctl32.lib;winmm.lib;version.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>ws2_32.lib;comctl32.lib;winmm.lib;version.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>$(ProfileDir)..\..\bin12\lib</AdditionalLibraryDirectories>
<ImportLibrary>$(IntDir)$(TargetName).lib</ImportLibrary>
<DelayLoadDLLs>miranda32.exe</DelayLoadDLLs>
@@ -221,7 +221,7 @@
<RandomizedBaseAddress>false</RandomizedBaseAddress>
<ImportLibrary>$(IntDir)$(TargetName)64.lib</ImportLibrary>
<SubSystem>Windows</SubSystem>
- <AdditionalDependencies>miranda64.lib;ws2_32.lib;comctl32.lib;winmm.lib;version.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>ws2_32.lib;comctl32.lib;winmm.lib;version.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>$(ProfileDir)..\..\bin12\lib</AdditionalLibraryDirectories>
<AdditionalOptions>/ignore:4197 %(AdditionalOptions)</AdditionalOptions>
<DelayLoadDLLs>miranda64.exe</DelayLoadDLLs>
@@ -255,7 +255,7 @@
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<RandomizedBaseAddress>false</RandomizedBaseAddress>
<SubSystem>Windows</SubSystem>
- <AdditionalDependencies>miranda32.lib;ws2_32.lib;comctl32.lib;winmm.lib;version.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>ws2_32.lib;comctl32.lib;winmm.lib;version.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>$(ProfileDir)..\..\bin12\lib</AdditionalLibraryDirectories>
<ImportLibrary>$(IntDir)$(TargetName).lib</ImportLibrary>
<DelayLoadDLLs>miranda32.exe</DelayLoadDLLs>
@@ -299,7 +299,7 @@
<RandomizedBaseAddress>false</RandomizedBaseAddress>
<ImportLibrary>$(IntDir)$(TargetName)64.lib</ImportLibrary>
<SubSystem>Windows</SubSystem>
- <AdditionalDependencies>miranda64.lib;ws2_32.lib;comctl32.lib;winmm.lib;version.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>ws2_32.lib;comctl32.lib;winmm.lib;version.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>$(ProfileDir)..\..\bin12\lib</AdditionalLibraryDirectories>
<DelayLoadDLLs>miranda64.exe</DelayLoadDLLs>
<AdditionalOptions>/ignore:4197 %(AdditionalOptions)</AdditionalOptions>
diff --git a/src/mir_core/src/icons.cpp b/src/mir_core/src/icons.cpp
index 47d6e1c904..fe3bb37319 100644
--- a/src/mir_core/src/icons.cpp
+++ b/src/mir_core/src/icons.cpp
@@ -24,7 +24,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#include "commonheaders.h"
#include <m_icolib.h>
-#include "..\src\core\stdplug.h"
MIR_CORE_DLL(void) Icon_Register(HINSTANCE hInst, const char *szSection, IconItem *pIcons, size_t iCount, char *prefix, int hLangpack)
{
diff --git a/src/mir_core/src/langpack.cpp b/src/mir_core/src/langpack.cpp
index 0cbe25e91c..062233e256 100644
--- a/src/mir_core/src/langpack.cpp
+++ b/src/mir_core/src/langpack.cpp
@@ -23,7 +23,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
#include "commonheaders.h"
-#include "../../modules/langpack/langpack.h"
+#include "../../mir_app/src/langpack.h"
#define LANGPACK_BUF_SIZE 4000
diff --git a/src/mir_core/src/mir_core.def b/src/mir_core/src/mir_core.def
index 5c5896f34f..f2decbe158 100644
--- a/src/mir_core/src/mir_core.def
+++ b/src/mir_core/src/mir_core.def
@@ -1,8 +1,6 @@
LIBRARY mir_core
EXPORTS
-CallContactService @1
-CallProtoService @2
Langpack_LookupUuid @3
Langpack_MarkPluginLoaded @4
CallFunctionAsync @5
@@ -161,7 +159,6 @@ wildcmpi @158
wildcmpiw @159
mir_base64_encode @160
mir_base64_decode @161
-ProtoServiceExists @162
ProtoBroadcastAck @163
db_set_resident @165
db_set @166
diff --git a/src/mir_core/src/mir_core64.def b/src/mir_core/src/mir_core64.def
index 4045e1d217..3a15379fcd 100644
--- a/src/mir_core/src/mir_core64.def
+++ b/src/mir_core/src/mir_core64.def
@@ -1,8 +1,6 @@
LIBRARY mir_core
EXPORTS
-CallContactService @1
-CallProtoService @2
Langpack_LookupUuid @3
Langpack_MarkPluginLoaded @4
CallFunctionAsync @5
@@ -161,7 +159,6 @@ wildcmpi @158
wildcmpiw @159
mir_base64_encode @160
mir_base64_decode @161
-ProtoServiceExists @162
ProtoBroadcastAck @163
db_set_resident @165
db_set @166
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-30 19:58:09 +0000