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/VisualC2010/fltk.lib.vcxproj | 8 ++++---- ide/VisualC2010/fltk.sln | 10 ++++++++++ ide/VisualC2010/fltkforms.vcxproj | 8 ++++---- ide/VisualC2010/fltkgl.vcxproj | 8 ++++---- ide/VisualC2010/fltkimages.vcxproj | 8 ++++---- ide/VisualC2010/tree.vcxproj | 12 +++++++++++- 6 files changed, 37 insertions(+), 17 deletions(-) (limited to 'ide/VisualC2010') diff --git a/ide/VisualC2010/fltk.lib.vcxproj b/ide/VisualC2010/fltk.lib.vcxproj index 2362b14bd..47cee9ebf 100644 --- a/ide/VisualC2010/fltk.lib.vcxproj +++ b/ide/VisualC2010/fltk.lib.vcxproj @@ -77,7 +77,7 @@ Disabled .;..\..\zlib;..\..\png;..\..\jpeg;../..;%(AdditionalIncludeDirectories) - _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;%(PreprocessorDefinitions) MultiThreadedDebugDLL @@ -100,7 +100,7 @@ AnySuitable Neither .;..\..\zlib;..\..\png;..\..\jpeg;../..;%(AdditionalIncludeDirectories) - _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;%(PreprocessorDefinitions) MultiThreadedDLL @@ -122,7 +122,7 @@ Disabled .;..\..\zlib;..\..\png;..\..\jpeg;../..;%(AdditionalIncludeDirectories) - 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;%(PreprocessorDefinitions) MultiThreadedDebugDLL @@ -149,7 +149,7 @@ AnySuitable Neither .;..\..\zlib;..\..\png;..\..\jpeg;../..;%(AdditionalIncludeDirectories) - 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;%(PreprocessorDefinitions) MultiThreadedDLL diff --git a/ide/VisualC2010/fltk.sln b/ide/VisualC2010/fltk.sln index 6a565c369..4e593966e 100644 --- a/ide/VisualC2010/fltk.sln +++ b/ide/VisualC2010/fltk.sln @@ -47,6 +47,10 @@ EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "file_chooser", "file_chooser.vcxproj", "{6927F349-29DF-4D60-BC8F-5A3F5E133735}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "fltk", "fltk.lib.vcxproj", "{E070AAFC-9D03-41A3-BC7D-30887EA0D50F}" + ProjectSection(ProjectDependencies) = postProject + {D640A221-F95A-40FF-AC0E-0E8B615C7681} = {D640A221-F95A-40FF-AC0E-0E8B615C7681} + {08B82852-90B3-4767-A5D2-F0A4FCCB2377} = {08B82852-90B3-4767-A5D2-F0A4FCCB2377} + EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "fltkdll", "fltkdll.vcxproj", "{F0B8F4BD-955D-43CB-980C-805364D04A25}" EndProject @@ -57,6 +61,9 @@ EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "fltkimages", "fltkimages.vcxproj", "{6E8E1663-B88D-4454-ADF2-279666A93306}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "fluid", "fluid.vcxproj", "{8AED3078-8CD8-40C9-A8FF-46080024F1EB}" + ProjectSection(ProjectDependencies) = postProject + {F0B8F4BD-955D-43CB-980C-805364D04A25} = {F0B8F4BD-955D-43CB-980C-805364D04A25} + EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "fonts", "fonts.vcxproj", "{DF2A883A-7356-4603-9CB1-E8F1E6B1549D}" EndProject @@ -141,6 +148,9 @@ EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "fltkzlib", "zlib.vcxproj", "{E1D9CE3F-400D-40E8-AD0D-61C29B1847FF}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "fltkpng", "libpng.vcxproj", "{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.vcxproj", "{50651D04-C8F7-4C2B-B412-0848573BDF88}" EndProject diff --git a/ide/VisualC2010/fltkforms.vcxproj b/ide/VisualC2010/fltkforms.vcxproj index f26f2d6f5..dcf3fd512 100644 --- a/ide/VisualC2010/fltkforms.vcxproj +++ b/ide/VisualC2010/fltkforms.vcxproj @@ -78,7 +78,7 @@ AnySuitable Neither .;..\..\zlib;..\..\png;..\..\jpeg;../..;%(AdditionalIncludeDirectories) - _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;%(PreprocessorDefinitions) MultiThreadedDLL @@ -100,7 +100,7 @@ Disabled .;..\..\zlib;..\..\png;..\..\jpeg;../..;%(AdditionalIncludeDirectories) - _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;%(PreprocessorDefinitions) MultiThreadedDebugDLL @@ -121,7 +121,7 @@ Disabled .;..\..\zlib;..\..\png;..\..\jpeg;../..;%(AdditionalIncludeDirectories) - 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;%(PreprocessorDefinitions) MultiThreadedDebugDLL @@ -148,7 +148,7 @@ AnySuitable Neither .;..\..\zlib;..\..\png;..\..\jpeg;../..;%(AdditionalIncludeDirectories) - 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;%(PreprocessorDefinitions) MultiThreadedDLL diff --git a/ide/VisualC2010/fltkgl.vcxproj b/ide/VisualC2010/fltkgl.vcxproj index 9ee247996..96725899b 100644 --- a/ide/VisualC2010/fltkgl.vcxproj +++ b/ide/VisualC2010/fltkgl.vcxproj @@ -78,7 +78,7 @@ AnySuitable Neither .;..\..\zlib;..\..\png;..\..\jpeg;..\..;%(AdditionalIncludeDirectories) - _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;%(PreprocessorDefinitions) MultiThreadedDLL @@ -100,7 +100,7 @@ Disabled .;..\..\zlib;..\..\png;..\..\jpeg;..\..;%(AdditionalIncludeDirectories) - _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;%(PreprocessorDefinitions) MultiThreadedDebugDLL @@ -121,7 +121,7 @@ Disabled .;..\..\zlib;..\..\png;..\..\jpeg;..\..;%(AdditionalIncludeDirectories) - 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;%(PreprocessorDefinitions) MultiThreadedDebugDLL @@ -148,7 +148,7 @@ AnySuitable Neither .;..\..\zlib;..\..\png;..\..\jpeg;..\..;%(AdditionalIncludeDirectories) - 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;%(PreprocessorDefinitions) MultiThreadedDLL diff --git a/ide/VisualC2010/fltkimages.vcxproj b/ide/VisualC2010/fltkimages.vcxproj index d7ae5972e..d76894bd1 100644 --- a/ide/VisualC2010/fltkimages.vcxproj +++ b/ide/VisualC2010/fltkimages.vcxproj @@ -76,7 +76,7 @@ Disabled .;..\..\zlib;..\..\png;..\..\jpeg;../..;%(AdditionalIncludeDirectories) - _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;%(PreprocessorDefinitions) MultiThreadedDebugDLL @@ -99,7 +99,7 @@ AnySuitable Neither .;..\..\zlib;..\..\png;..\..\jpeg;../..;%(AdditionalIncludeDirectories) - _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;%(PreprocessorDefinitions) MultiThreadedDLL @@ -121,7 +121,7 @@ Disabled .;..\..\zlib;..\..\png;..\..\jpeg;../..;%(AdditionalIncludeDirectories) - 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;%(PreprocessorDefinitions) MultiThreadedDebugDLL @@ -148,7 +148,7 @@ AnySuitable Neither .;..\..\zlib;..\..\png;..\..\jpeg;../..;%(AdditionalIncludeDirectories) - 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;%(PreprocessorDefinitions) MultiThreadedDLL diff --git a/ide/VisualC2010/tree.vcxproj b/ide/VisualC2010/tree.vcxproj index a7b02c6ff..2bb93cc9d 100644 --- a/ide/VisualC2010/tree.vcxproj +++ b/ide/VisualC2010/tree.vcxproj @@ -262,9 +262,19 @@ - Create .cxx and .h file with fluidd + Create %(Filename).cxx and %(Filename).h file with fluid cfluid /D %(Filename).fl ../../test/%(Filename).cxx;%(Outputs) + cfluid /D %(Filename).fl + + Create %(Filename).cxx and %(Filename).h file with fluid + ../../test/%(Filename).cxx;%(Outputs) + cfluid %(Filename).fl + cfluid /D %(Filename).fl + Create %(Filename).cxx and %(Filename).h file with fluid + Create %(Filename).cxx and %(Filename).h file with fluid + ../../test/%(Filename).cxx;%(Outputs) + ../../test/%(Filename).cxx;%(Outputs) -- cgit v1.2.3