From c2539883fbb671db229f1dbfe753e8c039d659ff Mon Sep 17 00:00:00 2001
From: Albrecht Schlosser <albrechts.fltk@online.de>
Date: Sun, 4 Jul 2010 17:19:38 +0000
Subject: First step cleaning up the IDE jungle:  - renamed ide/unsupported to
 ide/deprecated  - fixed ide/vc2005 to make it compatible with VC++ 2010
 Express    (this was not really what we wanted, but I couldn't convert    
 the older IDE files with VC++ 2010 Express)  - FL/Fl_Device.H: fixed missing
 FL_EXPORT for building the FLTK dll    (STR #2393).

git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@7666 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
---
 ide/vc2005/editor.vcproj | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

(limited to 'ide/vc2005/editor.vcproj')

diff --git a/ide/vc2005/editor.vcproj b/ide/vc2005/editor.vcproj
index 50732394a..85a8de2eb 100644
--- a/ide/vc2005/editor.vcproj
+++ b/ide/vc2005/editor.vcproj
@@ -15,8 +15,8 @@
 	<Configurations>
 		<Configuration
 			Name="Release|Win32"
-			OutputDirectory=".\Release"
-			IntermediateDirectory=".\Release"
+			OutputDirectory="..\..\test"
+			IntermediateDirectory=".\Release\editor"
 			ConfigurationType="1"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			UseOfMFC="0"
@@ -49,7 +49,7 @@
 				InlineFunctionExpansion="2"
 				FavorSizeOrSpeed="2"
 				AdditionalIncludeDirectories=".,../.."
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
+				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
 				PrecompiledHeaderFile=".\Release/editor.pch"
@@ -72,7 +72,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="comctl32.lib"
+				AdditionalDependencies="fltk.lib comctl32.lib"
 				OutputFile="../../test/editor.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
@@ -110,8 +110,8 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|Win32"
-			OutputDirectory=".\editor_"
-			IntermediateDirectory=".\editor_"
+			OutputDirectory="..\..\test"
+			IntermediateDirectory=".\Debug\editor"
 			ConfigurationType="1"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			UseOfMFC="0"
@@ -142,7 +142,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="0"
 				AdditionalIncludeDirectories=".,../.."
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
+				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="0"
 				PrecompiledHeaderFile=".\editor_/editor.pch"
@@ -166,7 +166,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="comctl32.lib"
+				AdditionalDependencies="fltkd.lib comctl32.lib"
 				OutputFile="../../test/editord.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
@@ -261,7 +261,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="comctl32.lib cairo.lib"
+				AdditionalDependencies="cairo.lib fltkd.lib comctl32.lib"
 				OutputFile="../../test/editord.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
@@ -334,7 +334,7 @@
 				InlineFunctionExpansion="2"
 				FavorSizeOrSpeed="2"
 				AdditionalIncludeDirectories=".,../.."
-				PreprocessorDefinitions="HAVE_CAIRO=1,_CRT_SECURE_NO_DEPRECATE;FL_DLL;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
+				PreprocessorDefinitions="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/editor.pch"
@@ -357,7 +357,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="comctl32.lib cairo.lib"
+				AdditionalDependencies="cairo.lib fltk.lib comctl32.lib"
 				OutputFile="../../test/editor.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-- 
cgit v1.2.3