diff options
| author | Armin Burgmeier <armin@arbur.net> | 2010-10-25 23:27:28 +0200 |
|---|---|---|
| committer | Murray Cumming <murrayc@murrayc.com> | 2010-10-26 09:00:32 +0200 |
| commit | 90cb33b842a17565262bb0646cfb6c3c32e6f292 (patch) | |
| tree | a1e027a4d14f77c3728271df6340a5a48ff1ed75 /MSVC_Net2005/examples | |
| parent | 8a9a3aba2f29721653a3f0c88489b64fdba06d70 (diff) | |
Fix the build with MSVC (really)v1.9.6
The previous commit only included the ChangeLog for some reason.
2009-10-26 Armin Burgmeier <armin@arbur.net>
* MSVC_Net2005/cairomm/cairomm.rc.in:
* MSVC_Net2008/cairomm/cairomm.rc.in: Replaced GENERIC_MAJOR_VERSION
et al. by CAIROMM_MAJOR_VERSION, so that they are properly replaced
during configure.
* MSVC_Net2005/examples/image-surface/image-surface.vcproj:
* MSVC_Net2005/examples/pdf-surface/pdf-surface.vcproj:
* MSVC_Net2005/examples/ps-surface/ps-surface.vcproj:
* MSVC_Net2005/examples/svg-surface/svg-surface.vcproj:
* MSVC_Net2005/examples/text-rotate/text-rotate.vcproj:
* MSVC_Net2005/examples/toy-text/toy-text.vcproj:
* MSVC_Net2005/examples/user-font/user-font.vcproj:
* MSVC_Net2008/examples/image-surface/image-surface.vcproj:
* MSVC_Net2008/examples/pdf-surface/pdf-surface.vcproj:
* MSVC_Net2008/examples/ps-surface/ps-surface.vcproj:
* MSVC_Net2008/examples/svg-surface/svg-surface.vcproj:
* MSVC_Net2008/examples/text-rotate/text-rotate.vcproj:
* MSVC_Net2008/examples/toy-text/toy-text.vcproj:
* MSVC_Net2008/examples/user-font/user-font.vcproj: Added
$(SolutionDir)/cairomm to the include search paths, so that
cairommconfig.h is found even if configure did not run.
* cairomm/fontface.cc: MSVC does not allow to reinterpret_cast a bool
to void*, so use an int instead.
* examples/surfaces/image-surface.cc:
* examples/surfaces/pdf-surface.cc:
* examples/surfaces/ps-surface.cc:
* examples/surfaces/svg-surface.cc:
* examples/text/text-rotate.cc: Define _USE_MATH_DEFINES before
including anything, to make sure we get the defines even if math.h
is included indirectly via another header.
* cairomm/context.cc: In set_dash(std::valarray<double>), copy the
valarray into a vector and then call set_dash(std::vector<double>).
The reason is that there is no guarantee that the memory in a
std::valarray is contiguous, and also that in MSVC's STL (and also in
the C++ standard) std::valarray<T>::operator[](size_t) const returns
a T, not a const T&, so &dashes[0] is a compiler error if dashes is a
const std::valarray<double>&.
Diffstat (limited to 'MSVC_Net2005/examples')
7 files changed, 14 insertions, 14 deletions
diff --git a/MSVC_Net2005/examples/image-surface/image-surface.vcproj b/MSVC_Net2005/examples/image-surface/image-surface.vcproj index b265cac..b9e6c29 100644 --- a/MSVC_Net2005/examples/image-surface/image-surface.vcproj +++ b/MSVC_Net2005/examples/image-surface/image-surface.vcproj @@ -44,7 +44,7 @@ <Tool Name="VCCLCompilerTool" Optimization="0" - AdditionalIncludeDirectories=""$(SolutionDir)\.."" + AdditionalIncludeDirectories=""$(SolutionDir)\cairomm","$(SolutionDir)\.."" PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE" MinimalRebuild="true" BasicRuntimeChecks="3" @@ -125,7 +125,7 @@ /> <Tool Name="VCCLCompilerTool" - AdditionalIncludeDirectories=""$(SolutionDir)\.."" + AdditionalIncludeDirectories=""$(SolutionDir)\cairomm","$(SolutionDir)\.."" PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE" RuntimeLibrary="2" RuntimeTypeInfo="true" diff --git a/MSVC_Net2005/examples/pdf-surface/pdf-surface.vcproj b/MSVC_Net2005/examples/pdf-surface/pdf-surface.vcproj index 1427782..438479e 100644 --- a/MSVC_Net2005/examples/pdf-surface/pdf-surface.vcproj +++ b/MSVC_Net2005/examples/pdf-surface/pdf-surface.vcproj @@ -44,7 +44,7 @@ <Tool Name="VCCLCompilerTool" Optimization="0" - AdditionalIncludeDirectories=""$(SolutionDir)\.."" + AdditionalIncludeDirectories=""$(SolutionDir)\cairomm","$(SolutionDir)\.."" PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE" MinimalRebuild="true" BasicRuntimeChecks="3" @@ -125,7 +125,7 @@ /> <Tool Name="VCCLCompilerTool" - AdditionalIncludeDirectories=""$(SolutionDir)\.."" + AdditionalIncludeDirectories=""$(SolutionDir)\cairomm","$(SolutionDir)\.."" PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE" RuntimeLibrary="2" RuntimeTypeInfo="true" diff --git a/MSVC_Net2005/examples/ps-surface/ps-surface.vcproj b/MSVC_Net2005/examples/ps-surface/ps-surface.vcproj index 49aa233..150606c 100644 --- a/MSVC_Net2005/examples/ps-surface/ps-surface.vcproj +++ b/MSVC_Net2005/examples/ps-surface/ps-surface.vcproj @@ -44,7 +44,7 @@ <Tool Name="VCCLCompilerTool" Optimization="0" - AdditionalIncludeDirectories=""$(SolutionDir)\.."" + AdditionalIncludeDirectories=""$(SolutionDir)\cairomm","$(SolutionDir)\.."" PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE" MinimalRebuild="true" BasicRuntimeChecks="3" @@ -125,7 +125,7 @@ /> <Tool Name="VCCLCompilerTool" - AdditionalIncludeDirectories=""$(SolutionDir)\.."" + AdditionalIncludeDirectories=""$(SolutionDir)\cairomm","$(SolutionDir)\.."" PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE" RuntimeLibrary="2" RuntimeTypeInfo="true" diff --git a/MSVC_Net2005/examples/svg-surface/svg-surface.vcproj b/MSVC_Net2005/examples/svg-surface/svg-surface.vcproj index 3e3b3ce..1e28799 100644 --- a/MSVC_Net2005/examples/svg-surface/svg-surface.vcproj +++ b/MSVC_Net2005/examples/svg-surface/svg-surface.vcproj @@ -44,7 +44,7 @@ <Tool Name="VCCLCompilerTool" Optimization="0" - AdditionalIncludeDirectories=""$(SolutionDir)\.."" + AdditionalIncludeDirectories=""$(SolutionDir)\cairomm","$(SolutionDir)\.."" PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE" MinimalRebuild="true" BasicRuntimeChecks="3" @@ -125,7 +125,7 @@ /> <Tool Name="VCCLCompilerTool" - AdditionalIncludeDirectories=""$(SolutionDir)\.."" + AdditionalIncludeDirectories=""$(SolutionDir)\cairomm","$(SolutionDir)\.."" PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE" RuntimeLibrary="2" RuntimeTypeInfo="true" diff --git a/MSVC_Net2005/examples/text-rotate/text-rotate.vcproj b/MSVC_Net2005/examples/text-rotate/text-rotate.vcproj index 5ad9053..3b269b3 100644 --- a/MSVC_Net2005/examples/text-rotate/text-rotate.vcproj +++ b/MSVC_Net2005/examples/text-rotate/text-rotate.vcproj @@ -44,7 +44,7 @@ <Tool Name="VCCLCompilerTool" Optimization="0" - AdditionalIncludeDirectories=""$(SolutionDir)\.."" + AdditionalIncludeDirectories=""$(SolutionDir)\cairomm","$(SolutionDir)\.."" PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE" MinimalRebuild="true" BasicRuntimeChecks="3" @@ -125,7 +125,7 @@ /> <Tool Name="VCCLCompilerTool" - AdditionalIncludeDirectories=""$(SolutionDir)\.."" + AdditionalIncludeDirectories=""$(SolutionDir)\cairomm","$(SolutionDir)\.."" PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE" RuntimeLibrary="2" RuntimeTypeInfo="true" diff --git a/MSVC_Net2005/examples/toy-text/toy-text.vcproj b/MSVC_Net2005/examples/toy-text/toy-text.vcproj index a16dee8..f6fe84a 100644 --- a/MSVC_Net2005/examples/toy-text/toy-text.vcproj +++ b/MSVC_Net2005/examples/toy-text/toy-text.vcproj @@ -44,7 +44,7 @@ <Tool Name="VCCLCompilerTool" Optimization="0" - AdditionalIncludeDirectories=""$(SolutionDir)\.."" + AdditionalIncludeDirectories=""$(SolutionDir)\cairomm","$(SolutionDir)\.."" PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;_USE_MATH_DEFINES" MinimalRebuild="true" BasicRuntimeChecks="3" @@ -125,7 +125,7 @@ /> <Tool Name="VCCLCompilerTool" - AdditionalIncludeDirectories=""$(SolutionDir)\.."" + AdditionalIncludeDirectories=""$(SolutionDir)\cairomm","$(SolutionDir)\.."" PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;_USE_MATH_DEFINES" RuntimeLibrary="2" RuntimeTypeInfo="true" diff --git a/MSVC_Net2005/examples/user-font/user-font.vcproj b/MSVC_Net2005/examples/user-font/user-font.vcproj index 64d2248..443e041 100644 --- a/MSVC_Net2005/examples/user-font/user-font.vcproj +++ b/MSVC_Net2005/examples/user-font/user-font.vcproj @@ -44,7 +44,7 @@ <Tool Name="VCCLCompilerTool" Optimization="0" - AdditionalIncludeDirectories=""$(SolutionDir)\.."" + AdditionalIncludeDirectories=""$(SolutionDir)\cairomm","$(SolutionDir)\.."" PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;_USE_MATH_DEFINES" MinimalRebuild="true" BasicRuntimeChecks="3" @@ -125,7 +125,7 @@ /> <Tool Name="VCCLCompilerTool" - AdditionalIncludeDirectories=""$(SolutionDir)\.."" + AdditionalIncludeDirectories=""$(SolutionDir)\cairomm","$(SolutionDir)\.."" PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;_USE_MATH_DEFINES" RuntimeLibrary="2" RuntimeTypeInfo="true" |