From 0eec2893a13524b8453821b082da6c0687141d0f Mon Sep 17 00:00:00 2001 From: Albrecht Schlosser Date: Thu, 20 Jan 2011 00:37:18 +0000 Subject: Updated VisualC2008 and VisualC2010 project files to define FL_LIBRARY in non-dll builds. Also changed some dependencies to get correct build order. To Do: VisualC2008 doesn't create the .cxx and .h files with fluid from .fl files correctly (VisualC2010 does, but maybe except test/tree.cxx). git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@8293 ea41ed52-d2ee-0310-a9c1-e6b18d33e121 --- ide/VisualC2008/fltk.lib.vcproj | 8 ++++---- ide/VisualC2008/fltk.sln | 22 +++++++++++++++++----- ide/VisualC2008/fltkforms.vcproj | 8 ++++---- ide/VisualC2008/fltkgl.vcproj | 8 ++++---- ide/VisualC2008/fltkimages.vcproj | 8 ++++---- 5 files changed, 33 insertions(+), 21 deletions(-) (limited to 'ide/VisualC2008') diff --git a/ide/VisualC2008/fltk.lib.vcproj b/ide/VisualC2008/fltk.lib.vcproj index 1d67174f7..ba75fba2c 100644 --- a/ide/VisualC2008/fltk.lib.vcproj +++ b/ide/VisualC2008/fltk.lib.vcproj @@ -43,7 +43,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;../.." - PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN" + PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_LIBRARY;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN" RuntimeLibrary="3" UsePrecompiledHeader="0" PrecompiledHeaderFile=".\Debug/fltk.lib.pch" @@ -116,7 +116,7 @@ InlineFunctionExpansion="2" FavorSizeOrSpeed="0" AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;../.." - PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN" + PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_LIBRARY;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN" RuntimeLibrary="2" UsePrecompiledHeader="0" PrecompiledHeaderFile=".\Release/fltk.lib.pch" @@ -185,7 +185,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;../.." - PreprocessorDefinitions="FLTK_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;FL_LIBRARY;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN" RuntimeLibrary="3" UsePrecompiledHeader="0" PrecompiledHeaderFile=".\Debug/fltk.lib.pch" @@ -258,7 +258,7 @@ InlineFunctionExpansion="2" FavorSizeOrSpeed="0" AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;../.." - PreprocessorDefinitions="FLTK_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;FL_LIBRARY;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN" RuntimeLibrary="2" UsePrecompiledHeader="0" PrecompiledHeaderFile=".\Release/fltk.lib.pch" diff --git a/ide/VisualC2008/fltk.sln b/ide/VisualC2008/fltk.sln index 7d130ff60..563d9059a 100644 --- a/ide/VisualC2008/fltk.sln +++ b/ide/VisualC2008/fltk.sln @@ -188,28 +188,37 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "file_chooser", "file_choose EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "fltk", "fltk.lib.vcproj", "{E070AAFC-9D03-41A3-BC7D-30887EA0D50F}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "fltkdll", "fltkdll.vcproj", "{F0B8F4BD-955D-43CB-980C-805364D04A25}" ProjectSection(ProjectDependencies) = postProject {D640A221-F95A-40FF-AC0E-0E8B615C7681} = {D640A221-F95A-40FF-AC0E-0E8B615C7681} - {E1D9CE3F-400D-40E8-AD0D-61C29B1847FF} = {E1D9CE3F-400D-40E8-AD0D-61C29B1847FF} {08B82852-90B3-4767-A5D2-F0A4FCCB2377} = {08B82852-90B3-4767-A5D2-F0A4FCCB2377} - {289C605C-94CC-437F-836B-2FE41528EEEC} = {289C605C-94CC-437F-836B-2FE41528EEEC} EndProjectSection EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "fltkdll", "fltkdll.vcproj", "{F0B8F4BD-955D-43CB-980C-805364D04A25}" +EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "fltkforms", "fltkforms.vcproj", "{C17BAB42-F00B-4F71-9DF6-A921511C89EE}" + ProjectSection(ProjectDependencies) = postProject + {E070AAFC-9D03-41A3-BC7D-30887EA0D50F} = {E070AAFC-9D03-41A3-BC7D-30887EA0D50F} + EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "fltkgl", "fltkgl.vcproj", "{F7974A9C-C255-4385-96BC-E24EE0816F7C}" + ProjectSection(ProjectDependencies) = postProject + {E070AAFC-9D03-41A3-BC7D-30887EA0D50F} = {E070AAFC-9D03-41A3-BC7D-30887EA0D50F} + EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "fltkimages", "fltkimages.vcproj", "{6E8E1663-B88D-4454-ADF2-279666A93306}" + ProjectSection(ProjectDependencies) = postProject + {D640A221-F95A-40FF-AC0E-0E8B615C7681} = {D640A221-F95A-40FF-AC0E-0E8B615C7681} + {08B82852-90B3-4767-A5D2-F0A4FCCB2377} = {08B82852-90B3-4767-A5D2-F0A4FCCB2377} + {E070AAFC-9D03-41A3-BC7D-30887EA0D50F} = {E070AAFC-9D03-41A3-BC7D-30887EA0D50F} + EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "fluid", "fluid.vcproj", "{8AED3078-8CD8-40C9-A8FF-46080024F1EB}" ProjectSection(ProjectDependencies) = postProject {D640A221-F95A-40FF-AC0E-0E8B615C7681} = {D640A221-F95A-40FF-AC0E-0E8B615C7681} - {E1D9CE3F-400D-40E8-AD0D-61C29B1847FF} = {E1D9CE3F-400D-40E8-AD0D-61C29B1847FF} {C17BAB42-F00B-4F71-9DF6-A921511C89EE} = {C17BAB42-F00B-4F71-9DF6-A921511C89EE} {08B82852-90B3-4767-A5D2-F0A4FCCB2377} = {08B82852-90B3-4767-A5D2-F0A4FCCB2377} {6E8E1663-B88D-4454-ADF2-279666A93306} = {6E8E1663-B88D-4454-ADF2-279666A93306} + {F0B8F4BD-955D-43CB-980C-805364D04A25} = {F0B8F4BD-955D-43CB-980C-805364D04A25} {E070AAFC-9D03-41A3-BC7D-30887EA0D50F} = {E070AAFC-9D03-41A3-BC7D-30887EA0D50F} EndProjectSection EndProject @@ -441,6 +450,9 @@ EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zlib", "zlib.vcproj", "{E1D9CE3F-400D-40E8-AD0D-61C29B1847FF}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libpng", "libpng.vcproj", "{D640A221-F95A-40FF-AC0E-0E8B615C7681}" + ProjectSection(ProjectDependencies) = postProject + {E1D9CE3F-400D-40E8-AD0D-61C29B1847FF} = {E1D9CE3F-400D-40E8-AD0D-61C29B1847FF} + EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "input_choice", "input_choice.vcproj", "{50651D04-C8F7-4C2B-B412-0848573BDF88}" ProjectSection(ProjectDependencies) = postProject diff --git a/ide/VisualC2008/fltkforms.vcproj b/ide/VisualC2008/fltkforms.vcproj index e669928da..e088312db 100644 --- a/ide/VisualC2008/fltkforms.vcproj +++ b/ide/VisualC2008/fltkforms.vcproj @@ -45,7 +45,7 @@ InlineFunctionExpansion="2" FavorSizeOrSpeed="0" AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;../.." - PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN" + PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_LIBRARY;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN" RuntimeLibrary="2" UsePrecompiledHeader="0" PrecompiledHeaderFile=".\Release/fltkforms.pch" @@ -114,7 +114,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;../.." - PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN" + PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_LIBRARY;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN" RuntimeLibrary="3" UsePrecompiledHeader="0" PrecompiledHeaderFile=".\Debug/fltkforms.pch" @@ -185,7 +185,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;../.." - PreprocessorDefinitions="FLTK_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;FL_LIBRARY;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN" RuntimeLibrary="3" UsePrecompiledHeader="0" PrecompiledHeaderFile=".\Debug/fltkforms.pch" @@ -258,7 +258,7 @@ InlineFunctionExpansion="2" FavorSizeOrSpeed="0" AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;../.." - PreprocessorDefinitions="FLTK_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;FL_LIBRARY;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN" RuntimeLibrary="2" UsePrecompiledHeader="0" PrecompiledHeaderFile=".\Release/fltkforms.pch" diff --git a/ide/VisualC2008/fltkgl.vcproj b/ide/VisualC2008/fltkgl.vcproj index 90c8ff2d9..b696f5933 100644 --- a/ide/VisualC2008/fltkgl.vcproj +++ b/ide/VisualC2008/fltkgl.vcproj @@ -45,7 +45,7 @@ InlineFunctionExpansion="2" FavorSizeOrSpeed="0" AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;..\.." - PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN" + PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_LIBRARY;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN" RuntimeLibrary="2" UsePrecompiledHeader="0" PrecompiledHeaderFile=".\Release/fltkgl.pch" @@ -114,7 +114,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;..\.." - PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN" + PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_LIBRARY;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN" RuntimeLibrary="3" UsePrecompiledHeader="0" PrecompiledHeaderFile=".\Debug/fltkgl.pch" @@ -185,7 +185,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;..\.." - PreprocessorDefinitions="FLTK_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;FL_LIBRARY;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN" RuntimeLibrary="3" UsePrecompiledHeader="0" PrecompiledHeaderFile=".\Debug/fltkgl.pch" @@ -258,7 +258,7 @@ InlineFunctionExpansion="2" FavorSizeOrSpeed="0" AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;..\.." - PreprocessorDefinitions="FLTK_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;FL_LIBRARY;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN" RuntimeLibrary="2" UsePrecompiledHeader="0" PrecompiledHeaderFile=".\Release/fltkgl.pch" diff --git a/ide/VisualC2008/fltkimages.vcproj b/ide/VisualC2008/fltkimages.vcproj index 458fa0d41..dba1dc087 100644 --- a/ide/VisualC2008/fltkimages.vcproj +++ b/ide/VisualC2008/fltkimages.vcproj @@ -43,7 +43,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;../.." - PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN" + PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_LIBRARY;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN" RuntimeLibrary="3" UsePrecompiledHeader="0" PrecompiledHeaderFile=".\Debug/fltkimages.pch" @@ -116,7 +116,7 @@ InlineFunctionExpansion="2" FavorSizeOrSpeed="0" AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;../.." - PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN" + PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_LIBRARY;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN" RuntimeLibrary="2" UsePrecompiledHeader="0" PrecompiledHeaderFile=".\Release/fltkimages.pch" @@ -185,7 +185,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;../.." - PreprocessorDefinitions="FLTK_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;FL_LIBRARY;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN" RuntimeLibrary="3" UsePrecompiledHeader="0" PrecompiledHeaderFile=".\Debug/fltkimages.pch" @@ -258,7 +258,7 @@ InlineFunctionExpansion="2" FavorSizeOrSpeed="0" AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;../.." - PreprocessorDefinitions="FLTK_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;FL_LIBRARY;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN" RuntimeLibrary="2" UsePrecompiledHeader="0" PrecompiledHeaderFile=".\Release/fltkimages.pch" -- cgit v1.2.3