From bc509d32eb741e5d3876eaaf0abd270cf68cd3b4 Mon Sep 17 00:00:00 2001 From: Manolo Gouy Date: Thu, 6 Jan 2011 10:24:58 +0000 Subject: Fix STR #2504 (first part). Replaced HAVE _CAIRO by FLTK_HAVE_CAIRO and USE_CAIRO by FLTK_USE_CAIRO everywhere. git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@8198 ea41ed52-d2ee-0310-a9c1-e6b18d33e121 --- ide/VisualC2008/CubeView.vcproj | 4 ++-- ide/VisualC2008/adjuster.vcproj | 4 ++-- ide/VisualC2008/arc.vcproj | 4 ++-- ide/VisualC2008/ask.vcproj | 4 ++-- ide/VisualC2008/bitmap.vcproj | 4 ++-- ide/VisualC2008/blocks.vcproj | 4 ++-- ide/VisualC2008/boxtype.vcproj | 4 ++-- ide/VisualC2008/browser.vcproj | 4 ++-- ide/VisualC2008/button.vcproj | 4 ++-- ide/VisualC2008/buttons.vcproj | 4 ++-- ide/VisualC2008/cairo_test.vcproj | 4 ++-- ide/VisualC2008/checkers.vcproj | 4 ++-- ide/VisualC2008/clock.vcproj | 4 ++-- ide/VisualC2008/colbrowser.vcproj | 4 ++-- ide/VisualC2008/color_chooser.vcproj | 4 ++-- ide/VisualC2008/config.h | 2 +- ide/VisualC2008/cube.vcproj | 4 ++-- ide/VisualC2008/cursor.vcproj | 4 ++-- ide/VisualC2008/curve.vcproj | 4 ++-- ide/VisualC2008/demo.vcproj | 4 ++-- 20 files changed, 39 insertions(+), 39 deletions(-) (limited to 'ide/VisualC2008') diff --git a/ide/VisualC2008/CubeView.vcproj b/ide/VisualC2008/CubeView.vcproj index 3791843c7..2e6c73783 100644 --- a/ide/VisualC2008/CubeView.vcproj +++ b/ide/VisualC2008/CubeView.vcproj @@ -235,7 +235,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;../.." - PreprocessorDefinitions="HAVE_CAIRO=1;_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN" + PreprocessorDefinitions="FLTK_HAVE_CAIRO=1;_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN" RuntimeLibrary="3" UsePrecompiledHeader="0" PrecompiledHeaderFile=".\CubeView__0/CubeView.pch" @@ -330,7 +330,7 @@ InlineFunctionExpansion="2" FavorSizeOrSpeed="2" AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;../.." - PreprocessorDefinitions="HAVE_CAIRO=1,_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN" + PreprocessorDefinitions="FLTK_HAVE_CAIRO=1,_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN" RuntimeLibrary="2" UsePrecompiledHeader="0" PrecompiledHeaderFile=".\CubeView___/CubeView.pch" diff --git a/ide/VisualC2008/adjuster.vcproj b/ide/VisualC2008/adjuster.vcproj index b045aeb4d..7b31bbc93 100644 --- a/ide/VisualC2008/adjuster.vcproj +++ b/ide/VisualC2008/adjuster.vcproj @@ -234,7 +234,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;../.." - PreprocessorDefinitions="HAVE_CAIRO=1;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN" + PreprocessorDefinitions="FLTK_HAVE_CAIRO=1;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN" RuntimeLibrary="3" UsePrecompiledHeader="0" PrecompiledHeaderFile=".\adjuster_/adjuster.pch" @@ -329,7 +329,7 @@ InlineFunctionExpansion="2" FavorSizeOrSpeed="2" AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;../.." - PreprocessorDefinitions="HAVE_CAIRO=1,_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN" + PreprocessorDefinitions="FLTK_HAVE_CAIRO=1,_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN" RuntimeLibrary="2" UsePrecompiledHeader="0" PrecompiledHeaderFile=".\Release/adjuster.pch" diff --git a/ide/VisualC2008/arc.vcproj b/ide/VisualC2008/arc.vcproj index 3ba97923a..cecc42d4a 100644 --- a/ide/VisualC2008/arc.vcproj +++ b/ide/VisualC2008/arc.vcproj @@ -234,7 +234,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;../.." - PreprocessorDefinitions="HAVE_CAIRO=1;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN" + PreprocessorDefinitions="FLTK_HAVE_CAIRO=1;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN" RuntimeLibrary="3" UsePrecompiledHeader="0" PrecompiledHeaderFile=".\arc_/arc.pch" @@ -329,7 +329,7 @@ InlineFunctionExpansion="2" FavorSizeOrSpeed="2" AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;../.." - PreprocessorDefinitions="HAVE_CAIRO=1,_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN" + PreprocessorDefinitions="FLTK_HAVE_CAIRO=1,_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN" RuntimeLibrary="2" UsePrecompiledHeader="0" PrecompiledHeaderFile=".\Release/arc.pch" diff --git a/ide/VisualC2008/ask.vcproj b/ide/VisualC2008/ask.vcproj index 7c84457b3..3a98dcfa3 100644 --- a/ide/VisualC2008/ask.vcproj +++ b/ide/VisualC2008/ask.vcproj @@ -234,7 +234,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;../.." - PreprocessorDefinitions="HAVE_CAIRO=1;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN" + PreprocessorDefinitions="FLTK_HAVE_CAIRO=1;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN" RuntimeLibrary="3" UsePrecompiledHeader="0" PrecompiledHeaderFile=".\ask_/ask.pch" @@ -329,7 +329,7 @@ InlineFunctionExpansion="2" FavorSizeOrSpeed="2" AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;../.." - PreprocessorDefinitions="HAVE_CAIRO=1,_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN" + PreprocessorDefinitions="FLTK_HAVE_CAIRO=1,_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN" RuntimeLibrary="2" UsePrecompiledHeader="0" PrecompiledHeaderFile=".\Release/ask.pch" diff --git a/ide/VisualC2008/bitmap.vcproj b/ide/VisualC2008/bitmap.vcproj index c8463562a..72a837fa4 100644 --- a/ide/VisualC2008/bitmap.vcproj +++ b/ide/VisualC2008/bitmap.vcproj @@ -234,7 +234,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;../.." - PreprocessorDefinitions="HAVE_CAIRO=1;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN" + PreprocessorDefinitions="FLTK_HAVE_CAIRO=1;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN" RuntimeLibrary="3" UsePrecompiledHeader="0" PrecompiledHeaderFile=".\bitmap_/bitmap.pch" @@ -329,7 +329,7 @@ InlineFunctionExpansion="2" FavorSizeOrSpeed="2" AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;../.." - PreprocessorDefinitions="HAVE_CAIRO=1,_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN" + PreprocessorDefinitions="FLTK_HAVE_CAIRO=1,_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN" RuntimeLibrary="2" UsePrecompiledHeader="0" PrecompiledHeaderFile=".\Release/bitmap.pch" diff --git a/ide/VisualC2008/blocks.vcproj b/ide/VisualC2008/blocks.vcproj index ac9e62fe6..cbb32f6f7 100644 --- a/ide/VisualC2008/blocks.vcproj +++ b/ide/VisualC2008/blocks.vcproj @@ -234,7 +234,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;../.." - PreprocessorDefinitions="HAVE_CAIRO=1;_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN" + PreprocessorDefinitions="FLTK_HAVE_CAIRO=1;_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN" RuntimeLibrary="3" UsePrecompiledHeader="0" PrecompiledHeaderFile=".\blocks_/blocks.pch" @@ -329,7 +329,7 @@ InlineFunctionExpansion="2" FavorSizeOrSpeed="2" AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;../.." - PreprocessorDefinitions="HAVE_CAIRO=1,_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN" + PreprocessorDefinitions="FLTK_HAVE_CAIRO=1,_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN" RuntimeLibrary="2" UsePrecompiledHeader="0" PrecompiledHeaderFile=".\Release/blocks.pch" diff --git a/ide/VisualC2008/boxtype.vcproj b/ide/VisualC2008/boxtype.vcproj index dd67b40f5..63c1d3755 100644 --- a/ide/VisualC2008/boxtype.vcproj +++ b/ide/VisualC2008/boxtype.vcproj @@ -234,7 +234,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;../.." - PreprocessorDefinitions="HAVE_CAIRO=1;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN" + PreprocessorDefinitions="FLTK_HAVE_CAIRO=1;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN" RuntimeLibrary="3" UsePrecompiledHeader="0" PrecompiledHeaderFile=".\boxtype_/boxtype.pch" @@ -329,7 +329,7 @@ InlineFunctionExpansion="2" FavorSizeOrSpeed="2" AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;../.." - PreprocessorDefinitions="HAVE_CAIRO=1,_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN" + PreprocessorDefinitions="FLTK_HAVE_CAIRO=1,_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN" RuntimeLibrary="2" UsePrecompiledHeader="0" PrecompiledHeaderFile=".\Release/boxtype.pch" diff --git a/ide/VisualC2008/browser.vcproj b/ide/VisualC2008/browser.vcproj index 3a882ef92..e4b94d920 100644 --- a/ide/VisualC2008/browser.vcproj +++ b/ide/VisualC2008/browser.vcproj @@ -234,7 +234,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;../.." - PreprocessorDefinitions="HAVE_CAIRO=1;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN" + PreprocessorDefinitions="FLTK_HAVE_CAIRO=1;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN" RuntimeLibrary="3" UsePrecompiledHeader="0" PrecompiledHeaderFile=".\browser_/browser.pch" @@ -329,7 +329,7 @@ InlineFunctionExpansion="2" FavorSizeOrSpeed="2" AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;../.." - PreprocessorDefinitions="HAVE_CAIRO=1,_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN" + PreprocessorDefinitions="FLTK_HAVE_CAIRO=1,_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN" RuntimeLibrary="2" UsePrecompiledHeader="0" PrecompiledHeaderFile=".\Release/browser.pch" diff --git a/ide/VisualC2008/button.vcproj b/ide/VisualC2008/button.vcproj index a1ff7e464..acd77200c 100644 --- a/ide/VisualC2008/button.vcproj +++ b/ide/VisualC2008/button.vcproj @@ -234,7 +234,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;../.." - PreprocessorDefinitions="HAVE_CAIRO=1;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN" + PreprocessorDefinitions="FLTK_HAVE_CAIRO=1;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN" RuntimeLibrary="3" UsePrecompiledHeader="0" PrecompiledHeaderFile=".\button_/button.pch" @@ -329,7 +329,7 @@ InlineFunctionExpansion="2" FavorSizeOrSpeed="2" AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;../.." - PreprocessorDefinitions="HAVE_CAIRO=1,_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN" + PreprocessorDefinitions="FLTK_HAVE_CAIRO=1,_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN" RuntimeLibrary="2" UsePrecompiledHeader="0" PrecompiledHeaderFile=".\Release/button.pch" diff --git a/ide/VisualC2008/buttons.vcproj b/ide/VisualC2008/buttons.vcproj index e2a72f8ac..ae85525c4 100644 --- a/ide/VisualC2008/buttons.vcproj +++ b/ide/VisualC2008/buttons.vcproj @@ -234,7 +234,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;../.." - PreprocessorDefinitions="HAVE_CAIRO=1;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN" + PreprocessorDefinitions="FLTK_HAVE_CAIRO=1;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN" RuntimeLibrary="3" UsePrecompiledHeader="0" PrecompiledHeaderFile=".\buttons_/buttons.pch" @@ -329,7 +329,7 @@ InlineFunctionExpansion="2" FavorSizeOrSpeed="2" AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;../.." - PreprocessorDefinitions="HAVE_CAIRO=1,_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN" + PreprocessorDefinitions="FLTK_HAVE_CAIRO=1,_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN" RuntimeLibrary="2" UsePrecompiledHeader="0" PrecompiledHeaderFile=".\Release/buttons.pch" diff --git a/ide/VisualC2008/cairo_test.vcproj b/ide/VisualC2008/cairo_test.vcproj index 9bb79a485..a73603f94 100644 --- a/ide/VisualC2008/cairo_test.vcproj +++ b/ide/VisualC2008/cairo_test.vcproj @@ -236,7 +236,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories=".,../.." - PreprocessorDefinitions="HAVE_CAIRO=1;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN" + PreprocessorDefinitions="FLTK_HAVE_CAIRO=1;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN" MinimalRebuild="true" RuntimeLibrary="3" PrecompiledHeaderFile=".\cairo_test_/cairo_test.pch" @@ -332,7 +332,7 @@ InlineFunctionExpansion="2" FavorSizeOrSpeed="2" AdditionalIncludeDirectories=".,../.." - PreprocessorDefinitions="HAVE_CAIRO=1,WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN" + PreprocessorDefinitions="FLTK_HAVE_CAIRO=1,WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN" RuntimeLibrary="2" PrecompiledHeaderFile=".\Release/cairo_test.pch" AssemblerListingLocation=".\Release/" diff --git a/ide/VisualC2008/checkers.vcproj b/ide/VisualC2008/checkers.vcproj index a794b1b12..9485367e7 100644 --- a/ide/VisualC2008/checkers.vcproj +++ b/ide/VisualC2008/checkers.vcproj @@ -234,7 +234,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;../.." - PreprocessorDefinitions="HAVE_CAIRO=1;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN" + PreprocessorDefinitions="FLTK_HAVE_CAIRO=1;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN" RuntimeLibrary="3" UsePrecompiledHeader="0" PrecompiledHeaderFile=".\checkers_/checkers.pch" @@ -329,7 +329,7 @@ InlineFunctionExpansion="2" FavorSizeOrSpeed="2" AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;../.." - PreprocessorDefinitions="HAVE_CAIRO=1,_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN" + PreprocessorDefinitions="FLTK_HAVE_CAIRO=1,_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN" RuntimeLibrary="2" UsePrecompiledHeader="0" PrecompiledHeaderFile=".\Release/checkers.pch" diff --git a/ide/VisualC2008/clock.vcproj b/ide/VisualC2008/clock.vcproj index db21f65bf..1a8662d31 100644 --- a/ide/VisualC2008/clock.vcproj +++ b/ide/VisualC2008/clock.vcproj @@ -234,7 +234,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;../.." - PreprocessorDefinitions="HAVE_CAIRO=1;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN" + PreprocessorDefinitions="FLTK_HAVE_CAIRO=1;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN" RuntimeLibrary="3" UsePrecompiledHeader="0" PrecompiledHeaderFile=".\clock_/clock.pch" @@ -329,7 +329,7 @@ InlineFunctionExpansion="2" FavorSizeOrSpeed="2" AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;../.." - PreprocessorDefinitions="HAVE_CAIRO=1,_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN" + PreprocessorDefinitions="FLTK_HAVE_CAIRO=1,_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN" RuntimeLibrary="2" UsePrecompiledHeader="0" PrecompiledHeaderFile=".\Release/clock.pch" diff --git a/ide/VisualC2008/colbrowser.vcproj b/ide/VisualC2008/colbrowser.vcproj index eb9340945..47a58d3ec 100644 --- a/ide/VisualC2008/colbrowser.vcproj +++ b/ide/VisualC2008/colbrowser.vcproj @@ -234,7 +234,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;../.." - PreprocessorDefinitions="HAVE_CAIRO=1;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN" + PreprocessorDefinitions="FLTK_HAVE_CAIRO=1;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN" RuntimeLibrary="3" UsePrecompiledHeader="0" PrecompiledHeaderFile=".\colbrowser_/colbrowser.pch" @@ -329,7 +329,7 @@ InlineFunctionExpansion="2" FavorSizeOrSpeed="2" AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;../.." - PreprocessorDefinitions="HAVE_CAIRO=1,_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN" + PreprocessorDefinitions="FLTK_HAVE_CAIRO=1,_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN" RuntimeLibrary="2" UsePrecompiledHeader="0" PrecompiledHeaderFile=".\Release/colbrowser.pch" diff --git a/ide/VisualC2008/color_chooser.vcproj b/ide/VisualC2008/color_chooser.vcproj index ed50841f3..585c902e5 100644 --- a/ide/VisualC2008/color_chooser.vcproj +++ b/ide/VisualC2008/color_chooser.vcproj @@ -232,7 +232,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;../.." - PreprocessorDefinitions="HAVE_CAIRO=1;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN" + PreprocessorDefinitions="FLTK_HAVE_CAIRO=1;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN" RuntimeLibrary="3" UsePrecompiledHeader="0" PrecompiledHeaderFile=".\color_chooser_/color_chooser.pch" @@ -326,7 +326,7 @@ InlineFunctionExpansion="2" FavorSizeOrSpeed="2" AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;../.." - PreprocessorDefinitions="HAVE_CAIRO=1,_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN" + PreprocessorDefinitions="FLTK_HAVE_CAIRO=1,_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN" RuntimeLibrary="2" UsePrecompiledHeader="0" PrecompiledHeaderFile=".\Release/color_chooser.pch" diff --git a/ide/VisualC2008/config.h b/ide/VisualC2008/config.h index fa53ab3e1..fe9b47114 100644 --- a/ide/VisualC2008/config.h +++ b/ide/VisualC2008/config.h @@ -182,7 +182,7 @@ */ // uncomment the following for using cairo -// #define HAVE_CAIRO 1 +// #define FLTK_HAVE_CAIRO 1 /* * Which header file do we include for libpng? diff --git a/ide/VisualC2008/cube.vcproj b/ide/VisualC2008/cube.vcproj index c41cb9ffc..a3d6fc338 100644 --- a/ide/VisualC2008/cube.vcproj +++ b/ide/VisualC2008/cube.vcproj @@ -234,7 +234,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;../.." - PreprocessorDefinitions="HAVE_CAIRO=1;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN" + PreprocessorDefinitions="FLTK_HAVE_CAIRO=1;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN" RuntimeLibrary="3" UsePrecompiledHeader="0" PrecompiledHeaderFile=".\cube_/cube.pch" @@ -329,7 +329,7 @@ InlineFunctionExpansion="2" FavorSizeOrSpeed="2" AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;../.." - PreprocessorDefinitions="HAVE_CAIRO=1,_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN" + PreprocessorDefinitions="FLTK_HAVE_CAIRO=1,_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN" RuntimeLibrary="2" UsePrecompiledHeader="0" PrecompiledHeaderFile=".\Release/cube.pch" diff --git a/ide/VisualC2008/cursor.vcproj b/ide/VisualC2008/cursor.vcproj index 0b7212099..0e5672a77 100644 --- a/ide/VisualC2008/cursor.vcproj +++ b/ide/VisualC2008/cursor.vcproj @@ -234,7 +234,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;../.." - PreprocessorDefinitions="HAVE_CAIRO=1;_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN" + PreprocessorDefinitions="FLTK_HAVE_CAIRO=1;_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN" RuntimeLibrary="3" UsePrecompiledHeader="0" PrecompiledHeaderFile=".\cursor_/cursor.pch" @@ -329,7 +329,7 @@ InlineFunctionExpansion="2" FavorSizeOrSpeed="2" AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;../.." - PreprocessorDefinitions="HAVE_CAIRO=1,_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN" + PreprocessorDefinitions="FLTK_HAVE_CAIRO=1,_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN" RuntimeLibrary="2" UsePrecompiledHeader="0" PrecompiledHeaderFile=".\Release/cursor.pch" diff --git a/ide/VisualC2008/curve.vcproj b/ide/VisualC2008/curve.vcproj index fd3fb8ff7..865bd6ca7 100644 --- a/ide/VisualC2008/curve.vcproj +++ b/ide/VisualC2008/curve.vcproj @@ -234,7 +234,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;../.." - PreprocessorDefinitions="HAVE_CAIRO=1;_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN" + PreprocessorDefinitions="FLTK_HAVE_CAIRO=1;_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN" RuntimeLibrary="3" UsePrecompiledHeader="0" PrecompiledHeaderFile=".\curve_/curve.pch" @@ -329,7 +329,7 @@ InlineFunctionExpansion="2" FavorSizeOrSpeed="2" AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;../.." - PreprocessorDefinitions="HAVE_CAIRO=1,_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN" + PreprocessorDefinitions="FLTK_HAVE_CAIRO=1,_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN" RuntimeLibrary="2" UsePrecompiledHeader="0" PrecompiledHeaderFile=".\Release/curve.pch" diff --git a/ide/VisualC2008/demo.vcproj b/ide/VisualC2008/demo.vcproj index d8ebf8520..d8ca6b169 100644 --- a/ide/VisualC2008/demo.vcproj +++ b/ide/VisualC2008/demo.vcproj @@ -234,7 +234,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;../.." - PreprocessorDefinitions="HAVE_CAIRO=1;_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN" + PreprocessorDefinitions="FLTK_HAVE_CAIRO=1;_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN" RuntimeLibrary="3" UsePrecompiledHeader="0" PrecompiledHeaderFile=".\demo_/demo.pch" @@ -329,7 +329,7 @@ InlineFunctionExpansion="2" FavorSizeOrSpeed="2" AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;../.." - PreprocessorDefinitions="HAVE_CAIRO=1,_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN" + PreprocessorDefinitions="FLTK_HAVE_CAIRO=1,_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN" RuntimeLibrary="2" UsePrecompiledHeader="0" PrecompiledHeaderFile=".\Release/demo.pch" -- cgit v1.2.3