diff --git a/cli/cli.vcxproj b/cli/cli.vcxproj
index 82a097ae7..6530566dc 100644
--- a/cli/cli.vcxproj
+++ b/cli/cli.vcxproj
@@ -154,7 +154,7 @@
- ..\lib;..\externals\simplecpp;..\externals\tinyxml;%(AdditionalIncludeDirectories)
+ ..\lib;..\externals\..\externals\simplecpp;..\externals\tinyxml;%(AdditionalIncludeDirectories)
false
true
ProgramDatabase
@@ -165,6 +165,7 @@
Level4
4251;4482;4512
true
+ true
shlwapi.lib;%(AdditionalDependencies)
@@ -178,7 +179,7 @@
- ..\lib;..\externals\simplecpp;..\externals\tinyxml;%(AdditionalIncludeDirectories)
+ ..\lib;..\externals\..\externals\simplecpp;..\externals\tinyxml;%(AdditionalIncludeDirectories)
false
true
ProgramDatabase
@@ -189,6 +190,7 @@
Level4
4251;4482;4512
true
+ true
shlwapi.lib;%(AdditionalDependencies)
@@ -201,7 +203,7 @@
- ..\lib;..\externals\simplecpp;..\externals\tinyxml;%(AdditionalIncludeDirectories)
+ ..\lib;..\externals\..\externals\simplecpp;..\externals\tinyxml;%(AdditionalIncludeDirectories)
true
ProgramDatabase
Disabled
@@ -211,6 +213,7 @@
Level4
4251;4482;4512
true
+ true
shlwapi.lib;%(AdditionalDependencies)
@@ -222,7 +225,7 @@
- ..\lib;..\externals\simplecpp;..\externals\tinyxml;%(AdditionalIncludeDirectories)
+ ..\lib;..\externals\..\externals\simplecpp;..\externals\tinyxml;%(AdditionalIncludeDirectories)
true
ProgramDatabase
Disabled
@@ -232,6 +235,7 @@
Level4
4251;4482;4512
true
+ true
shlwapi.lib;%(AdditionalDependencies)
@@ -243,7 +247,7 @@
- ..\lib;..\externals\simplecpp;..\externals\tinyxml;%(AdditionalIncludeDirectories)
+ ..\lib;..\externals\..\externals\simplecpp;..\externals\tinyxml;%(AdditionalIncludeDirectories)
false
MaxSpeed
CPPCHECKLIB_IMPORT;NDEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)
@@ -260,6 +264,7 @@
true
/Zc:inline /Zc:throwingNew %(AdditionalOptions)
+ true
shlwapi.lib;%(AdditionalDependencies)
@@ -275,7 +280,7 @@
- ..\lib;..\externals\simplecpp;..\externals\tinyxml;%(AdditionalIncludeDirectories)
+ ..\lib;..\externals\..\externals\simplecpp;..\externals\tinyxml;%(AdditionalIncludeDirectories)
false
MaxSpeed
CPPCHECKLIB_IMPORT;TINYXML2_IMPORT;NDEBUG;WIN32;HAVE_RULES;_CRT_SECURE_NO_WARNINGS;WIN32_LEAN_AND_MEAN;TIXML_USE_STL;%(PreprocessorDefinitions)
@@ -292,6 +297,7 @@
true
/Zc:inline /Zc:throwingNew %(AdditionalOptions)
+ true
shlwapi.lib;%(AdditionalDependencies)
@@ -307,7 +313,7 @@
- ..\lib;..\externals\simplecpp;..\externals\tinyxml;%(AdditionalIncludeDirectories)
+ ..\lib;..\externals\..\externals\simplecpp;..\externals\tinyxml;%(AdditionalIncludeDirectories)
false
MaxSpeed
CPPCHECKLIB_IMPORT;NDEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;WIN32_LEAN_AND_MEAN;_WIN64;%(PreprocessorDefinitions)
@@ -325,6 +331,7 @@
true
/Zc:inline /Zc:throwingNew %(AdditionalOptions)
+ true
shlwapi.lib;%(AdditionalDependencies)
@@ -339,7 +346,7 @@
- ..\lib;..\externals\simplecpp;..\externals\tinyxml;%(AdditionalIncludeDirectories)
+ ..\lib;..\externals\..\externals\simplecpp;..\externals\tinyxml;%(AdditionalIncludeDirectories)
false
MaxSpeed
CPPCHECKLIB_IMPORT;TINYXML2_IMPORT;NDEBUG;WIN32;HAVE_RULES;_CRT_SECURE_NO_WARNINGS;WIN32_LEAN_AND_MEAN;_WIN64;%(PreprocessorDefinitions)
@@ -357,6 +364,7 @@
true
/Zc:inline /Zc:throwingNew %(AdditionalOptions)
+ true
shlwapi.lib;%(AdditionalDependencies)
diff --git a/cppcheck.sln b/cppcheck.sln
index ad986cad9..7084e1f15 100644
--- a/cppcheck.sln
+++ b/cppcheck.sln
@@ -1,6 +1,8 @@
-Microsoft Visual Studio Solution File, Format Version 11.00
-# Visual Studio Express 2013 for Windows Desktop
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio 14
+VisualStudioVersion = 14.0.25123.0
+MinimumVisualStudioVersion = 10.0.40219.1
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cli", "cli\cli.vcxproj", "{35CBDF51-2456-3EC3-99ED-113C30858883}"
ProjectSection(ProjectDependencies) = postProject
{C183DB5B-AD6C-423D-80CA-1F9549555A1A} = {C183DB5B-AD6C-423D-80CA-1F9549555A1A}
diff --git a/externals/simplecpp/simplecpp.h b/externals/simplecpp/simplecpp.h
index 7a8909937..1f26297cd 100644
--- a/externals/simplecpp/simplecpp.h
+++ b/externals/simplecpp/simplecpp.h
@@ -27,6 +27,20 @@
#include
#include
+
+#ifdef _WIN32
+# ifdef SIMPLECPP_EXPORT
+# define SIMPLECPP_LIB __declspec(dllexport)
+# elif defined(SIMPLECPP_IMPORT)
+# define SIMPLECPP_LIB __declspec(dllimport)
+# else
+# define SIMPLECPP_LIB
+# endif
+#else
+# define SIMPLECPP_LIB
+#endif
+
+
namespace simplecpp {
typedef std::string TokenString;
@@ -34,7 +48,7 @@ typedef std::string TokenString;
/**
* Location in source code
*/
-class Location {
+class SIMPLECPP_LIB Location {
public:
Location(const std::vector &f) : files(f), fileIndex(0), line(1U), col(0U) {}
@@ -76,7 +90,7 @@ public:
* token class.
* @todo don't use std::string representation - for both memory and performance reasons
*/
-class Token {
+class SIMPLECPP_LIB Token {
public:
Token(const TokenString &s, const Location &loc) :
str(string), location(loc), previous(NULL), next(NULL), string(s)
@@ -134,7 +148,7 @@ private:
};
/** Output from preprocessor */
-struct Output {
+struct SIMPLECPP_LIB Output {
Output(const std::vector &files) : type(ERROR), location(files) {}
enum Type {
ERROR, /* #error */
@@ -148,7 +162,7 @@ struct Output {
typedef std::list OutputList;
/** List of tokens. */
-class TokenList {
+class SIMPLECPP_LIB TokenList {
public:
TokenList(std::vector &filenames);
TokenList(std::istream &istr, std::vector &filenames, const std::string &filename=std::string(), OutputList *outputList = 0);
@@ -228,20 +242,20 @@ private:
};
/** Tracking how macros are used */
-struct MacroUsage {
+struct SIMPLECPP_LIB MacroUsage {
MacroUsage(const std::vector &f) : macroLocation(f), useLocation(f) {}
std::string macroName;
Location macroLocation;
Location useLocation;
};
-struct DUI {
+struct SIMPLECPP_LIB DUI {
std::list defines;
std::set undefined;
std::list includePaths;
};
-std::map load(const TokenList &rawtokens, std::vector &filenames, const struct DUI &dui, OutputList *outputList = 0);
+SIMPLECPP_LIB std::map load(const TokenList &rawtokens, std::vector &filenames, const struct DUI &dui, OutputList *outputList = 0);
/**
* Preprocess
@@ -257,7 +271,7 @@ std::map load(const TokenList &rawtokens, std::vector &files, const std::map &filedata, const struct DUI &dui, OutputList *outputList = 0, std::list *macroUsage = 0);
+SIMPLECPP_LIB void preprocess(TokenList &output, const TokenList &rawtokens, std::vector &files, const std::map &filedata, const struct DUI &dui, OutputList *outputList = 0, std::list *macroUsage = 0);
}
#endif
diff --git a/lib/cppcheck.vcxproj b/lib/cppcheck.vcxproj
index f96ec582d..983c3bd5e 100644
--- a/lib/cppcheck.vcxproj
+++ b/lib/cppcheck.vcxproj
@@ -90,6 +90,7 @@
+
@@ -263,14 +264,15 @@
ProgramDatabase
true
Disabled
- CPPCHECKLIB_EXPORT;TINYXML2_EXPORT;WIN32;_CRT_SECURE_NO_WARNINGS;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)
+ CPPCHECKLIB_EXPORT;TINYXML2_EXPORT;SIMPLECPP_EXPORT;WIN32;_CRT_SECURE_NO_WARNINGS;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)
Level4
- ..\externals\simplecpp;..\externals\tinyxml;%(AdditionalIncludeDirectories)
+ ..\externals;..\externals\simplecpp;..\externals\tinyxml;%(AdditionalIncludeDirectories)
4251;4482;4512
MultiThreadedDebugDLL
Use
check.h
check.h
+ true
../externals;%(AdditionalLibraryDirectories)
@@ -288,14 +290,15 @@
ProgramDatabase
true
Disabled
- CPPCHECKLIB_EXPORT;TINYXML2_EXPORT;WIN32;HAVE_RULES;_CRT_SECURE_NO_WARNINGS;WIN32_LEAN_AND_MEAN;TIXML_USE_STL;%(PreprocessorDefinitions)
+ CPPCHECKLIB_EXPORT;TINYXML2_EXPORT;SIMPLECPP_EXPORT;WIN32;HAVE_RULES;_CRT_SECURE_NO_WARNINGS;WIN32_LEAN_AND_MEAN;TIXML_USE_STL;%(PreprocessorDefinitions)
Level4
- ..\externals\simplecpp;..\externals\tinyxml;%(AdditionalIncludeDirectories)
+ ..\externals;..\externals\simplecpp;..\externals\tinyxml;%(AdditionalIncludeDirectories)
4251;4482;4512
MultiThreadedDebugDLL
Use
check.h
check.h
+ true
pcre.lib;%(AdditionalDependencies)
@@ -313,14 +316,15 @@
ProgramDatabase
true
Disabled
- CPPCHECKLIB_EXPORT;TINYXML2_EXPORT;WIN32;_CRT_SECURE_NO_WARNINGS;WIN32_LEAN_AND_MEAN;_WIN64;%(PreprocessorDefinitions)
+ CPPCHECKLIB_EXPORT;TINYXML2_EXPORT;SIMPLECPP_EXPORT;WIN32;_CRT_SECURE_NO_WARNINGS;WIN32_LEAN_AND_MEAN;_WIN64;%(PreprocessorDefinitions)
Level4
- ..\externals\simplecpp;..\externals\tinyxml;%(AdditionalIncludeDirectories)
+ ..\externals;..\externals\simplecpp;..\externals\tinyxml;%(AdditionalIncludeDirectories)
4251;4482;4512
MultiThreadedDebugDLL
Use
check.h
check.h
+ true
../externals;%(AdditionalLibraryDirectories)
@@ -336,14 +340,15 @@
ProgramDatabase
true
Disabled
- CPPCHECKLIB_EXPORT;TINYXML2_EXPORT;WIN32;HAVE_RULES;_CRT_SECURE_NO_WARNINGS;WIN32_LEAN_AND_MEAN;_WIN64;%(PreprocessorDefinitions)
+ CPPCHECKLIB_EXPORT;TINYXML2_EXPORT;SIMPLECPP_EXPORT;WIN32;HAVE_RULES;_CRT_SECURE_NO_WARNINGS;WIN32_LEAN_AND_MEAN;_WIN64;%(PreprocessorDefinitions)
Level4
- ..\externals\simplecpp;..\externals\tinyxml;%(AdditionalIncludeDirectories)
+ ..\externals;..\externals\simplecpp;..\externals\tinyxml;%(AdditionalIncludeDirectories)
4251;4482;4512
MultiThreadedDebugDLL
Use
check.h
check.h
+ true
pcre64.lib;%(AdditionalDependencies)
@@ -365,9 +370,9 @@
true
true
true
- ..\externals\simplecpp;..\externals\tinyxml;%(AdditionalIncludeDirectories)
+ ..\externals;..\externals\simplecpp;..\externals\tinyxml;%(AdditionalIncludeDirectories)
4251;4482;4512
- CPPCHECKLIB_EXPORT;TINYXML2_EXPORT;NDEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)
+ CPPCHECKLIB_EXPORT;TINYXML2_EXPORT;SIMPLECPP_EXPORT;NDEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)
MultiThreadedDLL
@@ -377,6 +382,7 @@
check.h
check.h
/Zc:inline /Zc:throwingNew %(AdditionalOptions)
+ true
../externals;%(AdditionalLibraryDirectories)
@@ -400,9 +406,9 @@
true
true
true
- ..\externals\simplecpp;..\externals\tinyxml;%(AdditionalIncludeDirectories)
+ ..\externals;..\externals\simplecpp;..\externals\tinyxml;%(AdditionalIncludeDirectories)
4251;4482;4512
- CPPCHECKLIB_EXPORT;TINYXML2_EXPORT;NDEBUG;WIN32;HAVE_RULES;_CRT_SECURE_NO_WARNINGS;WIN32_LEAN_AND_MEAN;TIXML_USE_STL;%(PreprocessorDefinitions)
+ CPPCHECKLIB_EXPORT;TINYXML2_EXPORT;SIMPLECPP_EXPORT;NDEBUG;WIN32;HAVE_RULES;_CRT_SECURE_NO_WARNINGS;WIN32_LEAN_AND_MEAN;TIXML_USE_STL;%(PreprocessorDefinitions)
MultiThreadedDLL
@@ -412,6 +418,7 @@
check.h
check.h
/Zc:inline /Zc:throwingNew %(AdditionalOptions)
+ true
pcre.lib;%(AdditionalDependencies)
@@ -436,9 +443,9 @@
true
true
true
- ..\externals\simplecpp;..\externals\tinyxml;%(AdditionalIncludeDirectories)
+ ..\externals;..\externals\simplecpp;..\externals\tinyxml;%(AdditionalIncludeDirectories)
4251;4482;4512
- CPPCHECKLIB_EXPORT;TINYXML2_EXPORT;NDEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;WIN32_LEAN_AND_MEAN;_WIN64;%(PreprocessorDefinitions)
+ CPPCHECKLIB_EXPORT;TINYXML2_EXPORT;SIMPLECPP_EXPORT;NDEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;WIN32_LEAN_AND_MEAN;_WIN64;%(PreprocessorDefinitions)
MultiThreadedDLL
@@ -448,6 +455,7 @@
check.h
check.h
/Zc:inline /Zc:throwingNew %(AdditionalOptions)
+ true
../externals;%(AdditionalLibraryDirectories)
@@ -470,9 +478,9 @@
true
true
true
- ..\externals\simplecpp;..\externals\tinyxml;%(AdditionalIncludeDirectories)
+ ..\externals;..\externals\simplecpp;..\externals\tinyxml;%(AdditionalIncludeDirectories)
4251;4482;4512
- CPPCHECKLIB_EXPORT;TINYXML2_EXPORT;NDEBUG;WIN32;HAVE_RULES;_CRT_SECURE_NO_WARNINGS;WIN32_LEAN_AND_MEAN;_WIN64;%(PreprocessorDefinitions)
+ CPPCHECKLIB_EXPORT;TINYXML2_EXPORT;SIMPLECPP_EXPORT;NDEBUG;WIN32;HAVE_RULES;_CRT_SECURE_NO_WARNINGS;WIN32_LEAN_AND_MEAN;_WIN64;%(PreprocessorDefinitions)
MultiThreadedDLL
@@ -482,6 +490,7 @@
check.h
check.h
/Zc:inline /Zc:throwingNew %(AdditionalOptions)
+ true
pcre64.lib;%(AdditionalDependencies)
diff --git a/lib/cppcheck.vcxproj.filters b/lib/cppcheck.vcxproj.filters
index 0dabe0f59..becd8965b 100644
--- a/lib/cppcheck.vcxproj.filters
+++ b/lib/cppcheck.vcxproj.filters
@@ -283,6 +283,9 @@
Header Files
+
+ Header Files
+
diff --git a/test/testrunner.vcxproj b/test/testrunner.vcxproj
index 8b2dd2704..8c63a58c8 100644
--- a/test/testrunner.vcxproj
+++ b/test/testrunner.vcxproj
@@ -29,7 +29,6 @@
-
@@ -169,11 +168,11 @@
- ..\cli;..\lib;..\externals\simplecpp;..\externals\tinyxml;%(AdditionalIncludeDirectories)
+ ..\cli;..\lib;..\externals;..\externals\simplecpp;..\externals\tinyxml;%(AdditionalIncludeDirectories)
true
ProgramDatabase
Disabled
- CPPCHECKLIB_IMPORT;WIN32;_CRT_SECURE_NO_WARNINGS;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)
+ CPPCHECKLIB_IMPORT;SIMPLECPP_IMPORT;WIN32;_CRT_SECURE_NO_WARNINGS;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)
MultiThreadedDebugDLL
true
Level4
@@ -182,6 +181,7 @@
Use
testsuite.h
testsuite.h
+ true
shlwapi.lib;%(AdditionalDependencies)
@@ -194,11 +194,11 @@
- ..\cli;..\lib;..\externals\simplecpp;..\externals\tinyxml;%(AdditionalIncludeDirectories)
+ ..\cli;..\lib;..\externals;..\externals\simplecpp;..\externals\tinyxml;%(AdditionalIncludeDirectories)
true
ProgramDatabase
Disabled
- CPPCHECKLIB_IMPORT;WIN32;_CRT_SECURE_NO_WARNINGS;WIN32_LEAN_AND_MEAN;_WIN64;%(PreprocessorDefinitions)
+ CPPCHECKLIB_IMPORT;SIMPLECPP_IMPORT;WIN32;_CRT_SECURE_NO_WARNINGS;WIN32_LEAN_AND_MEAN;_WIN64;%(PreprocessorDefinitions)
MultiThreadedDebugDLL
true
Level4
@@ -207,6 +207,7 @@
Use
testsuite.h
testsuite.h
+ true
shlwapi.lib;%(AdditionalDependencies)
@@ -218,10 +219,10 @@
- ..\cli;..\lib;..\externals\simplecpp;..\externals\tinyxml;%(AdditionalIncludeDirectories)
+ ..\cli;..\lib;..\externals;..\externals\simplecpp;..\externals\tinyxml;%(AdditionalIncludeDirectories)
false
MaxSpeed
- CPPCHECKLIB_IMPORT;NDEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)
+ CPPCHECKLIB_IMPORT;SIMPLECPP_IMPORT;NDEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)
MultiThreadedDLL
true
Level4
@@ -239,6 +240,7 @@
testsuite.h
testsuite.h
/Zc:inline /Zc:throwingNew %(AdditionalOptions)
+ true
shlwapi.lib;%(AdditionalDependencies)
@@ -254,10 +256,10 @@
- ..\cli;..\lib;..\externals\simplecpp;..\externals\tinyxml;%(AdditionalIncludeDirectories)
+ ..\cli;..\lib;..\externals;..\externals\simplecpp;..\externals\tinyxml;%(AdditionalIncludeDirectories)
false
MaxSpeed
- CPPCHECKLIB_IMPORT;NDEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;WIN32_LEAN_AND_MEAN;_WIN64;%(PreprocessorDefinitions)
+ CPPCHECKLIB_IMPORT;SIMPLECPP_IMPORT;NDEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;WIN32_LEAN_AND_MEAN;_WIN64;%(PreprocessorDefinitions)
MultiThreadedDLL
true
Level4
@@ -275,6 +277,7 @@
testsuite.h
testsuite.h
/Zc:inline /Zc:throwingNew %(AdditionalOptions)
+ true
shlwapi.lib;%(AdditionalDependencies)
diff --git a/test/testrunner.vcxproj.filters b/test/testrunner.vcxproj.filters
index 540d07f32..e00e47f20 100644
--- a/test/testrunner.vcxproj.filters
+++ b/test/testrunner.vcxproj.filters
@@ -202,9 +202,6 @@
Source Files
-
- Source Files
-