Apply patches from polygon7 to fix #857 (Compilation error after refactoring the folder structure)

http://sourceforge.net/apps/trac/cppcheck/ticket/857
This commit is contained in:
Reijo Tomperi 2009-10-27 11:28:36 +02:00
parent 3be9f2e6cc
commit 0fc86924c6
2 changed files with 114 additions and 78 deletions

View File

@ -39,6 +39,7 @@
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
Optimization="0" Optimization="0"
AdditionalIncludeDirectories=".\lib;.\cli"
PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;" PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;"
MinimalRebuild="true" MinimalRebuild="true"
BasicRuntimeChecks="3" BasicRuntimeChecks="3"
@ -110,6 +111,7 @@
/> />
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
AdditionalIncludeDirectories=".\lib;.\cli"
PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;" PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;"
RuntimeLibrary="2" RuntimeLibrary="2"
UsePrecompiledHeader="0" UsePrecompiledHeader="0"
@ -168,91 +170,95 @@
UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}" UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
> >
<File <File
RelativePath=".\src\check.h" RelativePath=".\lib\check.h"
> >
</File> </File>
<File <File
RelativePath=".\src\checkautovariables.h" RelativePath=".\lib\checkautovariables.h"
> >
</File> </File>
<File <File
RelativePath=".\src\checkbufferoverrun.h" RelativePath=".\lib\checkbufferoverrun.h"
> >
</File> </File>
<File <File
RelativePath=".\src\checkclass.h" RelativePath=".\lib\checkclass.h"
> >
</File> </File>
<File <File
RelativePath=".\src\checkdangerousfunctions.h" RelativePath=".\lib\checkdangerousfunctions.h"
> >
</File> </File>
<File <File
RelativePath=".\src\checkheaders.h" RelativePath=".\lib\checkexceptionsafety.h"
> >
</File> </File>
<File <File
RelativePath=".\src\checkmemoryleak.h" RelativePath=".\lib\checkheaders.h"
> >
</File> </File>
<File <File
RelativePath=".\src\checkother.h" RelativePath=".\lib\checkmemoryleak.h"
> >
</File> </File>
<File <File
RelativePath=".\src\checkstl.h" RelativePath=".\lib\checkother.h"
> >
</File> </File>
<File <File
RelativePath=".\src\checkunusedfunctions.h" RelativePath=".\lib\checkstl.h"
> >
</File> </File>
<File <File
RelativePath=".\src\cppcheck.h" RelativePath=".\lib\checkunusedfunctions.h"
> >
</File> </File>
<File <File
RelativePath=".\src\cppcheckexecutor.h" RelativePath=".\lib\classinfo.h"
> >
</File> </File>
<File <File
RelativePath=".\src\errorlogger.h" RelativePath=".\lib\cppcheck.h"
> >
</File> </File>
<File <File
RelativePath=".\src\filelister.h" RelativePath=".\cli\cppcheckexecutor.h"
> >
</File> </File>
<File <File
RelativePath=".\src\mathlib.h" RelativePath=".\lib\errorlogger.h"
> >
</File> </File>
<File <File
RelativePath=".\src\preprocessor.h" RelativePath=".\lib\filelister.h"
> >
</File> </File>
<File <File
RelativePath=".\src\resource.h" RelativePath=".\lib\mathlib.h"
> >
</File> </File>
<File <File
RelativePath=".\src\resource.h" RelativePath=".\lib\preprocessor.h"
> >
</File> </File>
<File <File
RelativePath=".\src\settings.h" RelativePath=".\lib\resource.h"
> >
</File> </File>
<File <File
RelativePath=".\src\threadexecutor.h" RelativePath=".\lib\settings.h"
> >
</File> </File>
<File <File
RelativePath=".\src\token.h" RelativePath=".\cli\threadexecutor.h"
> >
</File> </File>
<File <File
RelativePath=".\src\tokenize.h" RelativePath=".\lib\token.h"
>
</File>
<File
RelativePath=".\lib\tokenize.h"
> >
</File> </File>
</Filter> </Filter>
@ -262,7 +268,7 @@
UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}" UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
> >
<File <File
RelativePath=".\src\cppcheck.rc" RelativePath=".\lib\cppcheck.rc"
> >
</File> </File>
</Filter> </Filter>
@ -272,83 +278,87 @@
UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}" UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
> >
<File <File
RelativePath=".\src\checkautovariables.cpp" RelativePath=".\lib\checkautovariables.cpp"
> >
</File> </File>
<File <File
RelativePath=".\src\checkbufferoverrun.cpp" RelativePath=".\lib\checkbufferoverrun.cpp"
> >
</File> </File>
<File <File
RelativePath=".\src\checkclass.cpp" RelativePath=".\lib\checkclass.cpp"
> >
</File> </File>
<File <File
RelativePath=".\src\checkdangerousfunctions.cpp" RelativePath=".\lib\checkdangerousfunctions.cpp"
> >
</File> </File>
<File <File
RelativePath=".\src\checkheaders.cpp" RelativePath=".\lib\checkexceptionsafety.cpp"
> >
</File> </File>
<File <File
RelativePath=".\src\checkmemoryleak.cpp" RelativePath=".\lib\checkheaders.cpp"
> >
</File> </File>
<File <File
RelativePath=".\src\checkother.cpp" RelativePath=".\lib\checkmemoryleak.cpp"
> >
</File> </File>
<File <File
RelativePath=".\src\checkstl.cpp" RelativePath=".\lib\checkother.cpp"
> >
</File> </File>
<File <File
RelativePath=".\src\checkunusedfunctions.cpp" RelativePath=".\lib\checkstl.cpp"
> >
</File> </File>
<File <File
RelativePath=".\src\cppcheck.cpp" RelativePath=".\lib\checkunusedfunctions.cpp"
> >
</File> </File>
<File <File
RelativePath=".\src\cppcheckexecutor.cpp" RelativePath=".\lib\cppcheck.cpp"
> >
</File> </File>
<File <File
RelativePath=".\src\errorlogger.cpp" RelativePath=".\cli\cppcheckexecutor.cpp"
> >
</File> </File>
<File <File
RelativePath=".\src\filelister.cpp" RelativePath=".\lib\errorlogger.cpp"
> >
</File> </File>
<File <File
RelativePath=".\src\main.cpp" RelativePath=".\lib\filelister.cpp"
> >
</File> </File>
<File <File
RelativePath=".\src\mathlib.cpp" RelativePath=".\cli\main.cpp"
> >
</File> </File>
<File <File
RelativePath=".\src\preprocessor.cpp" RelativePath=".\lib\mathlib.cpp"
> >
</File> </File>
<File <File
RelativePath=".\src\settings.cpp" RelativePath=".\lib\preprocessor.cpp"
> >
</File> </File>
<File <File
RelativePath=".\src\threadexecutor.cpp" RelativePath=".\lib\settings.cpp"
> >
</File> </File>
<File <File
RelativePath=".\src\token.cpp" RelativePath=".\cli\threadexecutor.cpp"
> >
</File> </File>
<File <File
RelativePath=".\src\tokenize.cpp" RelativePath=".\lib\token.cpp"
>
</File>
<File
RelativePath=".\lib\tokenize.cpp"
> >
</File> </File>
</Filter> </Filter>

View File

@ -39,6 +39,7 @@
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
Optimization="0" Optimization="0"
AdditionalIncludeDirectories=".\lib;.\test"
MinimalRebuild="true" MinimalRebuild="true"
BasicRuntimeChecks="3" BasicRuntimeChecks="3"
RuntimeLibrary="3" RuntimeLibrary="3"
@ -110,6 +111,7 @@
/> />
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
AdditionalIncludeDirectories=".\lib;.\test"
RuntimeLibrary="2" RuntimeLibrary="2"
UsePrecompiledHeader="0" UsePrecompiledHeader="0"
WarningLevel="3" WarningLevel="3"
@ -167,67 +169,79 @@
UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}" UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
> >
<File <File
RelativePath=".\src\check.h" RelativePath=".\lib\check.h"
> >
</File> </File>
<File <File
RelativePath=".\src\checkautovariables.h" RelativePath=".\lib\checkautovariables.h"
> >
</File> </File>
<File <File
RelativePath=".\src\CheckBufferOverrun.h" RelativePath=".\lib\checkbufferoverrun.h"
> >
</File> </File>
<File <File
RelativePath=".\src\CheckClass.h" RelativePath=".\lib\checkclass.h"
> >
</File> </File>
<File <File
RelativePath=".\src\checkdangerousfunctions.h" RelativePath=".\lib\checkdangerousfunctions.h"
> >
</File> </File>
<File <File
RelativePath=".\src\CheckHeaders.h" RelativePath=".\lib\checkexceptionsafety.h"
> >
</File> </File>
<File <File
RelativePath=".\src\CheckMemoryLeak.h" RelativePath=".\lib\checkheaders.h"
> >
</File> </File>
<File <File
RelativePath=".\src\CheckOther.h" RelativePath=".\lib\checkmemoryleak.h"
> >
</File> </File>
<File <File
RelativePath=".\src\checkstl.h" RelativePath=".\lib\checkother.h"
> >
</File> </File>
<File <File
RelativePath=".\src\checkunusedfunctions.h" RelativePath=".\lib\checkstl.h"
> >
</File> </File>
<File <File
RelativePath=".\src\cppcheck.h" RelativePath=".\lib\checkunusedfunctions.h"
> >
</File> </File>
<File <File
RelativePath=".\src\errorlogger.h" RelativePath=".\lib\classinfo.h"
> >
</File> </File>
<File <File
RelativePath=".\src\FileLister.h" RelativePath=".\lib\cppcheck.h"
> >
</File> </File>
<File <File
RelativePath=".\src\mathlib.h" RelativePath=".\lib\errorlogger.h"
> >
</File> </File>
<File <File
RelativePath=".\src\preprocessor.h" RelativePath=".\lib\filelister.h"
> >
</File> </File>
<File <File
RelativePath=".\src\settings.h" RelativePath=".\lib\mathlib.h"
>
</File>
<File
RelativePath=".\lib\preprocessor.h"
>
</File>
<File
RelativePath=".\lib\resource.h"
>
</File>
<File
RelativePath=".\lib\settings.h"
> >
</File> </File>
<File <File
@ -235,11 +249,11 @@
> >
</File> </File>
<File <File
RelativePath=".\src\token.h" RelativePath=".\lib\token.h"
> >
</File> </File>
<File <File
RelativePath=".\src\tokenize.h" RelativePath=".\lib\tokenize.h"
> >
</File> </File>
</Filter> </Filter>
@ -248,6 +262,10 @@
Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx" Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"
UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}" UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
> >
<File
RelativePath=".\lib\cppcheck.rc"
>
</File>
</Filter> </Filter>
<Filter <Filter
Name="Source Files" Name="Source Files"
@ -255,63 +273,67 @@
UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}" UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
> >
<File <File
RelativePath=".\src\checkautovariables.cpp" RelativePath=".\lib\checkautovariables.cpp"
> >
</File> </File>
<File <File
RelativePath=".\src\CheckBufferOverrun.cpp" RelativePath=".\lib\checkbufferoverrun.cpp"
> >
</File> </File>
<File <File
RelativePath=".\src\CheckClass.cpp" RelativePath=".\lib\checkclass.cpp"
> >
</File> </File>
<File <File
RelativePath=".\src\checkdangerousfunctions.cpp" RelativePath=".\lib\checkdangerousfunctions.cpp"
> >
</File> </File>
<File <File
RelativePath=".\src\CheckHeaders.cpp" RelativePath=".\lib\checkexceptionsafety.cpp"
> >
</File> </File>
<File <File
RelativePath=".\src\CheckMemoryLeak.cpp" RelativePath=".\lib\checkheaders.cpp"
> >
</File> </File>
<File <File
RelativePath=".\src\CheckOther.cpp" RelativePath=".\lib\checkmemoryleak.cpp"
> >
</File> </File>
<File <File
RelativePath=".\src\checkstl.cpp" RelativePath=".\lib\checkother.cpp"
> >
</File> </File>
<File <File
RelativePath=".\src\checkunusedfunctions.cpp" RelativePath=".\lib\checkstl.cpp"
> >
</File> </File>
<File <File
RelativePath=".\src\cppcheck.cpp" RelativePath=".\lib\checkunusedfunctions.cpp"
> >
</File> </File>
<File <File
RelativePath=".\src\errorlogger.cpp" RelativePath=".\lib\cppcheck.cpp"
> >
</File> </File>
<File <File
RelativePath=".\src\FileLister.cpp" RelativePath=".\lib\errorlogger.cpp"
> >
</File> </File>
<File <File
RelativePath=".\src\mathlib.cpp" RelativePath=".\lib\filelister.cpp"
> >
</File> </File>
<File <File
RelativePath=".\src\preprocessor.cpp" RelativePath=".\lib\mathlib.cpp"
> >
</File> </File>
<File <File
RelativePath=".\src\settings.cpp" RelativePath=".\lib\preprocessor.cpp"
>
</File>
<File
RelativePath=".\lib\settings.cpp"
> >
</File> </File>
<File <File
@ -346,6 +368,10 @@
RelativePath=".\test\testdivision.cpp" RelativePath=".\test\testdivision.cpp"
> >
</File> </File>
<File
RelativePath=".\test\testexceptionsafety.cpp"
>
</File>
<File <File
RelativePath=".\test\testfilelister.cpp" RelativePath=".\test\testfilelister.cpp"
> >
@ -411,11 +437,11 @@
> >
</File> </File>
<File <File
RelativePath=".\src\token.cpp" RelativePath=".\lib\token.cpp"
> >
</File> </File>
<File <File
RelativePath=".\src\tokenize.cpp" RelativePath=".\lib\tokenize.cpp"
> >
</File> </File>
</Filter> </Filter>