vc2005 ide fixes: old fluid custom compile would not use variables m…

…aking difficult to port them -> now uses devenv (InputName) var. Moved vc2005 to ide. Checked full builds in Release/Debug and Release Cairo/Debug Cairo. git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@6469 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
fltk · Oct 19, 2008 · 488ee44 · 488ee44
1 parent ac7c975
commit 488ee44
Show file tree

Hide file tree

Showing 76 changed files with 1,269 additions and 1,257 deletions.
diff --git a/CHANGES b/CHANGES
@@ -24,7 +24,9 @@ CHANGES IN FLTK 1.3.0
           widgets (STR #1770)
         - Initial setup (STR #1904)
 	- winsock dll is dynamically loaded and by default ws2_32.dll, use of winsock1 is still possible by defining USE_WSOCK1 at compile time.
-
+	- Cairo support: added --enable-cairo and --enable-cairoext 
+          configure options.
+	- Now vc2005 devenv in ide subdirectory
 
 CHANGES IN FLTK 1.1.9
 

diff --git a/vc2005/CubeView.vcproj → ide/vc2005/CubeView.vcproj b/vc2005/CubeView.vcproj → ide/vc2005/CubeView.vcproj
@@ -47,7 +47,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\vc2005;..\zlib;..\png;..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
 				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="0"
@@ -76,7 +76,7 @@
 				OutputFile="../test/CubeViewd.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\lib"
+				AdditionalLibraryDirectories="..\..\lib"
 				IgnoreDefaultLibraryNames="libcd"
 				GenerateDebugInformation="true"
 				ProgramDatabaseFile=".\CubeView__0/CubeViewd.pdb"
@@ -143,7 +143,7 @@
 				Optimization="4"
 				InlineFunctionExpansion="2"
 				FavorSizeOrSpeed="2"
-				AdditionalIncludeDirectories="..\vc2005;..\zlib;..\png;..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
 				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
@@ -171,7 +171,7 @@
 				OutputFile="../test/CubeView.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\lib"
+				AdditionalLibraryDirectories="..\..\lib"
 				IgnoreDefaultLibraryNames="libcd"
 				ProgramDatabaseFile=".\CubeView___/CubeView.pdb"
 				SubSystem="2"
@@ -235,7 +235,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\vc2005;..\zlib;..\png;..\jpeg;.."
+				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"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="0"
@@ -264,7 +264,7 @@
 				OutputFile="../test/CubeViewd.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\lib"
+				AdditionalLibraryDirectories="..\..\lib"
 				IgnoreDefaultLibraryNames="libcd"
 				GenerateDebugInformation="true"
 				ProgramDatabaseFile=".\CubeView__0/CubeViewd.pdb"
@@ -331,7 +331,7 @@
 				Optimization="4"
 				InlineFunctionExpansion="2"
 				FavorSizeOrSpeed="2"
-				AdditionalIncludeDirectories="..\vc2005;..\zlib;..\png;..\jpeg;.."
+				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"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
@@ -359,7 +359,7 @@
 				OutputFile="../test/CubeView.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\lib"
+				AdditionalLibraryDirectories="..\..\lib"
 				IgnoreDefaultLibraryNames="libcd"
 				ProgramDatabaseFile=".\CubeView___/CubeView.pdb"
 				SubSystem="2"
@@ -395,7 +395,7 @@
 	</References>
 	<Files>
 		<File
-			RelativePath="..\test\CubeMain.cxx"
+			RelativePath="..\..\test\CubeMain.cxx"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
@@ -437,7 +437,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\test\CubeView.cxx"
+			RelativePath="..\..\test\CubeView.cxx"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
@@ -479,7 +479,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\test\CubeViewUI.cxx"
+			RelativePath="..\..\test\CubeViewUI.cxx"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
@@ -521,16 +521,16 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\test\CubeViewUI.fl"
+			RelativePath="..\..\test\CubeViewUI.fl"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
 				>
 				<Tool
 					Name="VCCustomBuildTool"
 					Description="Create .cxx and .h file with fluidd"
-					CommandLine="cd ..\test&#x0D;&#x0A;..\fluid\fluidd -c CubeViewUI.fl&#x0D;&#x0A;cd ..\vcnet&#x0D;&#x0A;"
-					Outputs="..\test\CubeViewUI.cxx"
+					CommandLine="cfluid /D $(InputName).fl"
+					Outputs="..\..\test\$(InputName).cxx"
 				/>
 			</FileConfiguration>
 			<FileConfiguration
@@ -539,8 +539,8 @@
 				<Tool
 					Name="VCCustomBuildTool"
 					Description="Create .cxx and .h file with fluid"
-					CommandLine="cd ..\test&#x0D;&#x0A;..\fluid\fluid -c CubeViewUI.fl&#x0D;&#x0A;cd ..\vcnet&#x0D;&#x0A;"
-					Outputs="..\test\CubeViewUI.cxx"
+					CommandLine="cfluid $(InputName).fl"
+					Outputs="..\..\test\$(InputName).cxx"
 				/>
 			</FileConfiguration>
 			<FileConfiguration
@@ -549,8 +549,8 @@
 				<Tool
 					Name="VCCustomBuildTool"
 					Description="Create .cxx and .h file with fluidd"
-					CommandLine="cd ..\test&#x0D;&#x0A;..\fluid\fluidd -c CubeViewUI.fl&#x0D;&#x0A;cd ..\vcnet&#x0D;&#x0A;"
-					Outputs="..\test\CubeViewUI.cxx"
+					CommandLine="cfluid /D $(InputName).fl"
+					Outputs="..\..\test\$(InputName).cxx"
 				/>
 			</FileConfiguration>
 			<FileConfiguration
@@ -559,8 +559,7 @@
 				<Tool
 					Name="VCCustomBuildTool"
 					Description="Create .cxx and .h file with fluid"
-					CommandLine="cd ..\test&#x0D;&#x0A;..\fluid\fluid -c CubeViewUI.fl&#x0D;&#x0A;cd ..\vcnet&#x0D;&#x0A;"
-					Outputs="..\test\CubeViewUI.cxx"
+					CommandLine="cfluid -c $(InputName).fl"
 				/>
 			</FileConfiguration>
 		</File>

diff --git a/vc2005/adjuster.vcproj → ide/vc2005/adjuster.vcproj b/vc2005/adjuster.vcproj → ide/vc2005/adjuster.vcproj
@@ -46,7 +46,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\vc2005;..\zlib;..\png;..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
 				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="0"
@@ -75,7 +75,7 @@
 				OutputFile="../test/adjusterd.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\lib"
+				AdditionalLibraryDirectories="..\..\lib"
 				IgnoreDefaultLibraryNames="libcd"
 				GenerateDebugInformation="true"
 				ProgramDatabaseFile=".\adjuster_/adjusterd.pdb"
@@ -142,7 +142,7 @@
 				Optimization="4"
 				InlineFunctionExpansion="2"
 				FavorSizeOrSpeed="2"
-				AdditionalIncludeDirectories="..\vc2005;..\zlib;..\png;..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
 				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
@@ -170,7 +170,7 @@
 				OutputFile="../test/adjuster.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\lib"
+				AdditionalLibraryDirectories="..\..\lib"
 				IgnoreDefaultLibraryNames="libcd"
 				ProgramDatabaseFile=".\Release/adjuster.pdb"
 				SubSystem="2"
@@ -234,7 +234,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\vc2005;..\zlib;..\png;..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
 				PreprocessorDefinitions="HAVE_CAIRO=1;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="0"
@@ -263,7 +263,7 @@
 				OutputFile="../test/adjusterd.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\lib"
+				AdditionalLibraryDirectories="..\..\lib"
 				IgnoreDefaultLibraryNames="libcd"
 				GenerateDebugInformation="true"
 				ProgramDatabaseFile=".\adjuster_/adjusterd.pdb"
@@ -330,7 +330,7 @@
 				Optimization="4"
 				InlineFunctionExpansion="2"
 				FavorSizeOrSpeed="2"
-				AdditionalIncludeDirectories="..\vc2005;..\zlib;..\png;..\jpeg;.."
+				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"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
@@ -358,7 +358,7 @@
 				OutputFile="../test/adjuster.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\lib"
+				AdditionalLibraryDirectories="..\..\lib"
 				IgnoreDefaultLibraryNames="libcd"
 				ProgramDatabaseFile=".\Release/adjuster.pdb"
 				SubSystem="2"
@@ -394,7 +394,7 @@
 	</References>
 	<Files>
 		<File
-			RelativePath="..\test\adjuster.cxx"
+			RelativePath="..\..\test\adjuster.cxx"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"

diff --git a/vc2005/arc.vcproj → ide/vc2005/arc.vcproj b/vc2005/arc.vcproj → ide/vc2005/arc.vcproj
@@ -46,7 +46,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\vc2005;..\zlib;..\png;..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
 				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="0"
@@ -75,7 +75,7 @@
 				OutputFile="../test/arcd.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\lib"
+				AdditionalLibraryDirectories="..\..\lib"
 				IgnoreDefaultLibraryNames="libcd"
 				GenerateDebugInformation="true"
 				ProgramDatabaseFile=".\arc_/arcd.pdb"
@@ -142,7 +142,7 @@
 				Optimization="4"
 				InlineFunctionExpansion="2"
 				FavorSizeOrSpeed="2"
-				AdditionalIncludeDirectories="..\vc2005;..\zlib;..\png;..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
 				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
@@ -170,7 +170,7 @@
 				OutputFile="../test/arc.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\lib"
+				AdditionalLibraryDirectories="..\..\lib"
 				IgnoreDefaultLibraryNames="libcd"
 				ProgramDatabaseFile=".\Release/arc.pdb"
 				SubSystem="2"
@@ -234,7 +234,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\vc2005;..\zlib;..\png;..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
 				PreprocessorDefinitions="HAVE_CAIRO=1;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="0"
@@ -263,7 +263,7 @@
 				OutputFile="../test/arcd.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\lib"
+				AdditionalLibraryDirectories="..\..\lib"
 				IgnoreDefaultLibraryNames="libcd"
 				GenerateDebugInformation="true"
 				ProgramDatabaseFile=".\arc_/arcd.pdb"
@@ -330,7 +330,7 @@
 				Optimization="4"
 				InlineFunctionExpansion="2"
 				FavorSizeOrSpeed="2"
-				AdditionalIncludeDirectories="..\vc2005;..\zlib;..\png;..\jpeg;.."
+				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"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
@@ -358,7 +358,7 @@
 				OutputFile="../test/arc.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\lib"
+				AdditionalLibraryDirectories="..\..\lib"
 				IgnoreDefaultLibraryNames="libcd"
 				ProgramDatabaseFile=".\Release/arc.pdb"
 				SubSystem="2"
@@ -394,7 +394,7 @@
 	</References>
 	<Files>
 		<File
-			RelativePath="..\test\arc.cxx"
+			RelativePath="..\..\test\arc.cxx"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"