diff options
| author | George Hazan <ghazan@miranda.im> | 2021-12-04 19:24:01 +0300 |
|---|---|---|
| committer | George Hazan <ghazan@miranda.im> | 2021-12-04 19:24:01 +0300 |
| commit | c6599302f4f68abad3e508dd63445280fc481a76 (patch) | |
| tree | b2146475767811fa4b1d321dc793d34a9107d648 | |
| parent | 5ea47a8634e1facfeab862c62140fd94ff917d62 (diff) | |
no need to patch sqlite3.h anymore
| -rw-r--r-- | include/sqlite3.h | 2 | ||||
| -rw-r--r-- | libs/sqlite3/src/sqlite3.h | 2 | ||||
| -rw-r--r-- | plugins/Dbx_sqlite/dbx_sqlite.vcxproj | 5 | ||||
| -rw-r--r-- | plugins/Import/import.vcxproj | 2 | ||||
| -rw-r--r-- | plugins/Spamotron/src/stdafx.h | 2 |
5 files changed, 5 insertions, 8 deletions
diff --git a/include/sqlite3.h b/include/sqlite3.h new file mode 100644 index 0000000000..fe1d1485d0 --- /dev/null +++ b/include/sqlite3.h @@ -0,0 +1,2 @@ +#define SQLITE_API __declspec(dllimport) +#include "../libs/sqlite3/src/sqlite3.h" diff --git a/libs/sqlite3/src/sqlite3.h b/libs/sqlite3/src/sqlite3.h index 247a9b7698..1247048a31 100644 --- a/libs/sqlite3/src/sqlite3.h +++ b/libs/sqlite3/src/sqlite3.h @@ -72,7 +72,7 @@ extern "C" { # define SQLITE_EXTERN extern #endif #ifndef SQLITE_API -# define SQLITE_API __declspec(dllimport) +# define SQLITE_API #endif #ifndef SQLITE_CDECL # define SQLITE_CDECL diff --git a/plugins/Dbx_sqlite/dbx_sqlite.vcxproj b/plugins/Dbx_sqlite/dbx_sqlite.vcxproj index be896cf8bd..daf409c88e 100644 --- a/plugins/Dbx_sqlite/dbx_sqlite.vcxproj +++ b/plugins/Dbx_sqlite/dbx_sqlite.vcxproj @@ -51,9 +51,4 @@ <ResourceCompile Include="res\dbx_sqlite.rc" /> <ResourceCompile Include="res\version.rc" /> </ItemGroup> - <ItemDefinitionGroup> - <ClCompile> - <AdditionalIncludeDirectories>$(ProjectDir)..\..\libs\sqlite3\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - </ClCompile> - </ItemDefinitionGroup> </Project>
\ No newline at end of file diff --git a/plugins/Import/import.vcxproj b/plugins/Import/import.vcxproj index 89e8c1b8d7..bae7592121 100644 --- a/plugins/Import/import.vcxproj +++ b/plugins/Import/import.vcxproj @@ -82,7 +82,7 @@ </ItemGroup>
<ItemDefinitionGroup>
<ClCompile>
- <AdditionalIncludeDirectories>$(ProjectDir)..\..\libs\sqlite3\src;$(ProjectDir)include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>./include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ClCompile>
</ItemDefinitionGroup>
</Project>
\ No newline at end of file diff --git a/plugins/Spamotron/src/stdafx.h b/plugins/Spamotron/src/stdafx.h index b587286647..c09ca7d427 100644 --- a/plugins/Spamotron/src/stdafx.h +++ b/plugins/Spamotron/src/stdafx.h @@ -107,7 +107,7 @@ int LogToSystemHistory(char *message, char *origmessage); /* bayes.c */
-#include "../../Libs/sqlite3/src/sqlite3.h"
+#include <sqlite3.h>
extern sqlite3 *bayesdb;
#define BAYESDB_PATH "spamotron"
|