9 files changed, 602 insertions, 523 deletions
diff --git a/vcnet/fltk.lib.vcproj b/vcnet/fltk.lib.vcproj
index f5782aeb6..426f96fd0 100644
--- a/vcnet/fltk.lib.vcproj
+++ b/vcnet/fltk.lib.vcproj
@@ -3,6 +3,7 @@
 	ProjectType="Visual C++"
 	Version="7.10"
 	Name="fltk"
+	ProjectGUID="{7695559D-4701-430D-A495-2095F50C9380}"
 	SccProjectName=""
 	SccLocalPath="">
 	<Platforms>
diff --git a/vcnet/fltk.sln b/vcnet/fltk.sln
index cf15c9966..3417cba4b 100644
--- a/vcnet/fltk.sln
+++ b/vcnet/fltk.sln
@@ -85,68 +85,71 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "curve", "curve.vcproj", "{2
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "demo", "demo.vcproj", "{09427220-8C9C-498A-8D50-1638D3FB87E5}"
 	ProjectSection(ProjectDependencies) = postProject
-		{D04E36D7-1C68-43E6-BE30-A7793CE3C799} = {D04E36D7-1C68-43E6-BE30-A7793CE3C799}
-		{C17BAB42-F00B-4F71-9DF6-A921511C89EE} = {C17BAB42-F00B-4F71-9DF6-A921511C89EE}
-		{45236F71-7031-40BC-ADCD-0535A64C04B0} = {45236F71-7031-40BC-ADCD-0535A64C04B0}
-		{9F3F86DA-3CC5-481F-8201-166933B5C8FF} = {9F3F86DA-3CC5-481F-8201-166933B5C8FF}
-		{23F17042-704E-4198-8017-A8584E884CF7} = {23F17042-704E-4198-8017-A8584E884CF7}
-		{8B25CCE0-0988-4999-AE65-5A5EE31BB44D} = {8B25CCE0-0988-4999-AE65-5A5EE31BB44D}
-		{E30BB28D-DFA0-479C-B670-8CD872224B38} = {E30BB28D-DFA0-479C-B670-8CD872224B38}
-		{F0B8F4BD-955D-43CB-980C-805364D04A25} = {F0B8F4BD-955D-43CB-980C-805364D04A25}
-		{0BDAEBF1-7A8D-434B-A543-4663464E972D} = {0BDAEBF1-7A8D-434B-A543-4663464E972D}
-		{B5271094-DE51-4E60-B4FA-D8F0BDB969FE} = {B5271094-DE51-4E60-B4FA-D8F0BDB969FE}
-		{CEB7B88B-3AA5-4DD6-818F-CF19E12BF1E1} = {CEB7B88B-3AA5-4DD6-818F-CF19E12BF1E1}
-		{CEE12ACB-20E4-45E4-AD5E-D15D7CFF68C3} = {CEE12ACB-20E4-45E4-AD5E-D15D7CFF68C3}
-		{28D24031-1A17-497A-B926-59CF78076DED} = {28D24031-1A17-497A-B926-59CF78076DED}
+		{1C1B5A00-5F5D-4290-A07B-8A5A4A78570A} = {1C1B5A00-5F5D-4290-A07B-8A5A4A78570A}
+		{8D8D210D-F628-48BB-9127-D8003DF22018} = {8D8D210D-F628-48BB-9127-D8003DF22018}
+		{7BBECC0F-9381-4BF2-87CA-3FD1DA93DEAF} = {7BBECC0F-9381-4BF2-87CA-3FD1DA93DEAF}
 		{AE750416-51BA-485C-BD76-EF11B4536EE8} = {AE750416-51BA-485C-BD76-EF11B4536EE8}
-		{3E822491-B134-43B0-A40E-9348FFAB527F} = {3E822491-B134-43B0-A40E-9348FFAB527F}
-		{7A2467D2-B03A-4964-A289-EF233EB39F69} = {7A2467D2-B03A-4964-A289-EF233EB39F69}
-		{45797F58-624B-4FA0-A7A3-5956114D8215} = {45797F58-624B-4FA0-A7A3-5956114D8215}
-		{97541B63-87AA-4ACE-BBF5-175F8D1389EC} = {97541B63-87AA-4ACE-BBF5-175F8D1389EC}
+		{DB6BAA16-C589-448F-9AB5-5969016549EB} = {DB6BAA16-C589-448F-9AB5-5969016549EB}
+		{78079B1F-152B-4E83-87CB-364586AB3AAC} = {78079B1F-152B-4E83-87CB-364586AB3AAC}
+		{D640A221-F95A-40FF-AC0E-0E8B615C7681} = {D640A221-F95A-40FF-AC0E-0E8B615C7681}
+		{67CE1C24-B0C0-4CD6-8D0F-68513C2398B9} = {67CE1C24-B0C0-4CD6-8D0F-68513C2398B9}
+		{D0BC7525-99E7-4247-B860-1B3CF2FF8165} = {D0BC7525-99E7-4247-B860-1B3CF2FF8165}
+		{ADA2462A-3656-41D2-B8A8-8D942AA0F8E9} = {ADA2462A-3656-41D2-B8A8-8D942AA0F8E9}
+		{2352F92C-8663-4637-B919-D76F0A9EC05E} = {2352F92C-8663-4637-B919-D76F0A9EC05E}
+		{28D24031-1A17-497A-B926-59CF78076DED} = {28D24031-1A17-497A-B926-59CF78076DED}
+		{37C32832-DCE4-4BAA-9306-826064B30CCB} = {37C32832-DCE4-4BAA-9306-826064B30CCB}
 		{2E03AF33-56A1-4366-B016-184CD96F3B56} = {2E03AF33-56A1-4366-B016-184CD96F3B56}
+		{0363AC35-F325-4C24-9DB9-E83337D55787} = {0363AC35-F325-4C24-9DB9-E83337D55787}
+		{DF2A883A-7356-4603-9CB1-E8F1E6B1549D} = {DF2A883A-7356-4603-9CB1-E8F1E6B1549D}
+		{65B5BB3F-EE54-4604-B49B-7676AED83AAB} = {65B5BB3F-EE54-4604-B49B-7676AED83AAB}
+		{E1D9CE3F-400D-40E8-AD0D-61C29B1847FF} = {E1D9CE3F-400D-40E8-AD0D-61C29B1847FF}
 		{46771042-C840-4314-BA3C-C5BC2FBD7CBB} = {46771042-C840-4314-BA3C-C5BC2FBD7CBB}
-		{AD5ACED4-F6EE-4AC0-B502-23CFD10EF603} = {AD5ACED4-F6EE-4AC0-B502-23CFD10EF603}
-		{289C605C-94CC-437F-836B-2FE41528EEEC} = {289C605C-94CC-437F-836B-2FE41528EEEC}
-		{1CD667DD-E7AE-4F36-A1F7-F41FB59786BE} = {1CD667DD-E7AE-4F36-A1F7-F41FB59786BE}
+		{23F17042-704E-4198-8017-A8584E884CF7} = {23F17042-704E-4198-8017-A8584E884CF7}
+		{C17BAB42-F00B-4F71-9DF6-A921511C89EE} = {C17BAB42-F00B-4F71-9DF6-A921511C89EE}
 		{3B0BF144-5D75-4D4A-BF75-7347186C808F} = {3B0BF144-5D75-4D4A-BF75-7347186C808F}
-		{1CA77C94-5785-4B38-B91A-1EAFBD885BC2} = {1CA77C94-5785-4B38-B91A-1EAFBD885BC2}
-		{AA0ED6EA-2DA3-4486-AFBD-76CC9D206A1E} = {AA0ED6EA-2DA3-4486-AFBD-76CC9D206A1E}
-		{F658ABE4-7FE1-4404-9B7C-55E0D660F1B3} = {F658ABE4-7FE1-4404-9B7C-55E0D660F1B3}
+		{6927F349-29DF-4D60-BC8F-5A3F5E133735} = {6927F349-29DF-4D60-BC8F-5A3F5E133735}
+		{0973844B-3E5F-4C38-95FF-E8935243D287} = {0973844B-3E5F-4C38-95FF-E8935243D287}
 		{E1A8934E-CB8D-4F74-B78A-EC7952BC4CBE} = {E1A8934E-CB8D-4F74-B78A-EC7952BC4CBE}
-		{78079B1F-152B-4E83-87CB-364586AB3AAC} = {78079B1F-152B-4E83-87CB-364586AB3AAC}
-		{7BBECC0F-9381-4BF2-87CA-3FD1DA93DEAF} = {7BBECC0F-9381-4BF2-87CA-3FD1DA93DEAF}
+		{08B82852-90B3-4767-A5D2-F0A4FCCB2377} = {08B82852-90B3-4767-A5D2-F0A4FCCB2377}
+		{B1749154-F87B-489D-B4B0-ABD5ED20A96F} = {B1749154-F87B-489D-B4B0-ABD5ED20A96F}
+		{45797F58-624B-4FA0-A7A3-5956114D8215} = {45797F58-624B-4FA0-A7A3-5956114D8215}
+		{289C605C-94CC-437F-836B-2FE41528EEEC} = {289C605C-94CC-437F-836B-2FE41528EEEC}
+		{97541B63-87AA-4ACE-BBF5-175F8D1389EC} = {97541B63-87AA-4ACE-BBF5-175F8D1389EC}
+		{EDDBF169-77C1-496E-9EFE-E500107E6E97} = {EDDBF169-77C1-496E-9EFE-E500107E6E97}
+		{45236F71-7031-40BC-ADCD-0535A64C04B0} = {45236F71-7031-40BC-ADCD-0535A64C04B0}
+		{8AED3078-8CD8-40C9-A8FF-46080024F1EB} = {8AED3078-8CD8-40C9-A8FF-46080024F1EB}
+		{BFE8CC78-6B58-4305-A096-796A3088BB26} = {BFE8CC78-6B58-4305-A096-796A3088BB26}
 		{C3E7B77C-EED2-4046-9A30-9446C6F096A0} = {C3E7B77C-EED2-4046-9A30-9446C6F096A0}
 		{4DFA9F84-0457-4FE4-8008-283270610487} = {4DFA9F84-0457-4FE4-8008-283270610487}
-		{1C1B5A00-5F5D-4290-A07B-8A5A4A78570A} = {1C1B5A00-5F5D-4290-A07B-8A5A4A78570A}
-		{3322F289-B025-4DB1-A7D1-FBA3840F8A0B} = {3322F289-B025-4DB1-A7D1-FBA3840F8A0B}
-		{37C32832-DCE4-4BAA-9306-826064B30CCB} = {37C32832-DCE4-4BAA-9306-826064B30CCB}
-		{ADA2462A-3656-41D2-B8A8-8D942AA0F8E9} = {ADA2462A-3656-41D2-B8A8-8D942AA0F8E9}
-		{BFE8CC78-6B58-4305-A096-796A3088BB26} = {BFE8CC78-6B58-4305-A096-796A3088BB26}
-		{8D8D210D-F628-48BB-9127-D8003DF22018} = {8D8D210D-F628-48BB-9127-D8003DF22018}
-		{2147B9FD-7D65-4854-9770-D7B8767DB9AE} = {2147B9FD-7D65-4854-9770-D7B8767DB9AE}
 		{58A83386-65E6-4F22-8712-8B6B7E62913D} = {58A83386-65E6-4F22-8712-8B6B7E62913D}
-		{B1749154-F87B-489D-B4B0-ABD5ED20A96F} = {B1749154-F87B-489D-B4B0-ABD5ED20A96F}
-		{DF2A883A-7356-4603-9CB1-E8F1E6B1549D} = {DF2A883A-7356-4603-9CB1-E8F1E6B1549D}
-		{8AED3078-8CD8-40C9-A8FF-46080024F1EB} = {8AED3078-8CD8-40C9-A8FF-46080024F1EB}
-		{6927F349-29DF-4D60-BC8F-5A3F5E133735} = {6927F349-29DF-4D60-BC8F-5A3F5E133735}
-		{2D29D6C9-B4A6-444C-A311-106A9C8A986F} = {2D29D6C9-B4A6-444C-A311-106A9C8A986F}
-		{EDDBF169-77C1-496E-9EFE-E500107E6E97} = {EDDBF169-77C1-496E-9EFE-E500107E6E97}
-		{27D45BA6-A403-4A71-B6D6-57DC0CEDCE15} = {27D45BA6-A403-4A71-B6D6-57DC0CEDCE15}
-		{0D1DB0EE-E997-4550-85D4-BDE209B75AD6} = {0D1DB0EE-E997-4550-85D4-BDE209B75AD6}
-		{0973844B-3E5F-4C38-95FF-E8935243D287} = {0973844B-3E5F-4C38-95FF-E8935243D287}
-		{BDACB9FC-6769-4A2D-A636-36CC25E3AC75} = {BDACB9FC-6769-4A2D-A636-36CC25E3AC75}
-		{D0BC7525-99E7-4247-B860-1B3CF2FF8165} = {D0BC7525-99E7-4247-B860-1B3CF2FF8165}
-		{122160ED-446E-4B15-8CB4-A2058DC7269A} = {122160ED-446E-4B15-8CB4-A2058DC7269A}
 		{92EEF887-8305-4D00-86B7-D3F98CC7AD87} = {92EEF887-8305-4D00-86B7-D3F98CC7AD87}
-		{67CE1C24-B0C0-4CD6-8D0F-68513C2398B9} = {67CE1C24-B0C0-4CD6-8D0F-68513C2398B9}
-		{0363AC35-F325-4C24-9DB9-E83337D55787} = {0363AC35-F325-4C24-9DB9-E83337D55787}
-		{2352F92C-8663-4637-B919-D76F0A9EC05E} = {2352F92C-8663-4637-B919-D76F0A9EC05E}
-		{E212D4B4-63D9-4D8D-84DB-45C8BC191462} = {E212D4B4-63D9-4D8D-84DB-45C8BC191462}
-		{65B5BB3F-EE54-4604-B49B-7676AED83AAB} = {65B5BB3F-EE54-4604-B49B-7676AED83AAB}
-		{DB6BAA16-C589-448F-9AB5-5969016549EB} = {DB6BAA16-C589-448F-9AB5-5969016549EB}
+		{3322F289-B025-4DB1-A7D1-FBA3840F8A0B} = {3322F289-B025-4DB1-A7D1-FBA3840F8A0B}
+		{CEB7B88B-3AA5-4DD6-818F-CF19E12BF1E1} = {CEB7B88B-3AA5-4DD6-818F-CF19E12BF1E1}
+		{E30BB28D-DFA0-479C-B670-8CD872224B38} = {E30BB28D-DFA0-479C-B670-8CD872224B38}
+		{3E822491-B134-43B0-A40E-9348FFAB527F} = {3E822491-B134-43B0-A40E-9348FFAB527F}
+		{B5271094-DE51-4E60-B4FA-D8F0BDB969FE} = {B5271094-DE51-4E60-B4FA-D8F0BDB969FE}
+		{1CA77C94-5785-4B38-B91A-1EAFBD885BC2} = {1CA77C94-5785-4B38-B91A-1EAFBD885BC2}
 		{39ADA7A1-A2C1-4F0B-8B92-04E335570C27} = {39ADA7A1-A2C1-4F0B-8B92-04E335570C27}
+		{27D45BA6-A403-4A71-B6D6-57DC0CEDCE15} = {27D45BA6-A403-4A71-B6D6-57DC0CEDCE15}
 		{51F6CDA8-3AF3-4DDC-B412-8E5E92F3393B} = {51F6CDA8-3AF3-4DDC-B412-8E5E92F3393B}
+		{E212D4B4-63D9-4D8D-84DB-45C8BC191462} = {E212D4B4-63D9-4D8D-84DB-45C8BC191462}
+		{F0B8F4BD-955D-43CB-980C-805364D04A25} = {F0B8F4BD-955D-43CB-980C-805364D04A25}
+		{2D29D6C9-B4A6-444C-A311-106A9C8A986F} = {2D29D6C9-B4A6-444C-A311-106A9C8A986F}
+		{CEE12ACB-20E4-45E4-AD5E-D15D7CFF68C3} = {CEE12ACB-20E4-45E4-AD5E-D15D7CFF68C3}
+		{7A2467D2-B03A-4964-A289-EF233EB39F69} = {7A2467D2-B03A-4964-A289-EF233EB39F69}
+		{AD5ACED4-F6EE-4AC0-B502-23CFD10EF603} = {AD5ACED4-F6EE-4AC0-B502-23CFD10EF603}
+		{D04E36D7-1C68-43E6-BE30-A7793CE3C799} = {D04E36D7-1C68-43E6-BE30-A7793CE3C799}
+		{9F3F86DA-3CC5-481F-8201-166933B5C8FF} = {9F3F86DA-3CC5-481F-8201-166933B5C8FF}
+		{1CD667DD-E7AE-4F36-A1F7-F41FB59786BE} = {1CD667DD-E7AE-4F36-A1F7-F41FB59786BE}
+		{8B25CCE0-0988-4999-AE65-5A5EE31BB44D} = {8B25CCE0-0988-4999-AE65-5A5EE31BB44D}
+		{F658ABE4-7FE1-4404-9B7C-55E0D660F1B3} = {F658ABE4-7FE1-4404-9B7C-55E0D660F1B3}
+		{AA0ED6EA-2DA3-4486-AFBD-76CC9D206A1E} = {AA0ED6EA-2DA3-4486-AFBD-76CC9D206A1E}
+		{122160ED-446E-4B15-8CB4-A2058DC7269A} = {122160ED-446E-4B15-8CB4-A2058DC7269A}
+		{0D1DB0EE-E997-4550-85D4-BDE209B75AD6} = {0D1DB0EE-E997-4550-85D4-BDE209B75AD6}
+		{0BDAEBF1-7A8D-434B-A543-4663464E972D} = {0BDAEBF1-7A8D-434B-A543-4663464E972D}
 		{E070AAFC-9D03-41A3-BC7D-30887EA0D50F} = {E070AAFC-9D03-41A3-BC7D-30887EA0D50F}
+		{BDACB9FC-6769-4A2D-A636-36CC25E3AC75} = {BDACB9FC-6769-4A2D-A636-36CC25E3AC75}
+		{2147B9FD-7D65-4854-9770-D7B8767DB9AE} = {2147B9FD-7D65-4854-9770-D7B8767DB9AE}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "doublebuffer", "doublebuffer.vcproj", "{EDDBF169-77C1-496E-9EFE-E500107E6E97}"
@@ -161,12 +164,15 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "editor", "editor.vcproj", "
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "fast_slow", "fast_slow.vcproj", "{2D29D6C9-B4A6-444C-A311-106A9C8A986F}"
 	ProjectSection(ProjectDependencies) = postProject
-		{E070AAFC-9D03-41A3-BC7D-30887EA0D50F} = {E070AAFC-9D03-41A3-BC7D-30887EA0D50F}
 		{8AED3078-8CD8-40C9-A8FF-46080024F1EB} = {8AED3078-8CD8-40C9-A8FF-46080024F1EB}
+		{E070AAFC-9D03-41A3-BC7D-30887EA0D50F} = {E070AAFC-9D03-41A3-BC7D-30887EA0D50F}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "file_chooser", "file_chooser.vcproj", "{6927F349-29DF-4D60-BC8F-5A3F5E133735}"
 	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}
 		{6E8E1663-B88D-4454-ADF2-279666A93306} = {6E8E1663-B88D-4454-ADF2-279666A93306}
 		{E070AAFC-9D03-41A3-BC7D-30887EA0D50F} = {E070AAFC-9D03-41A3-BC7D-30887EA0D50F}
 	EndProjectSection
@@ -177,6 +183,9 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "fltk", "fltk.lib.vcproj", "
 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}
+		{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}") = "fltkforms", "fltkforms.vcproj", "{C17BAB42-F00B-4F71-9DF6-A921511C89EE}"
@@ -193,8 +202,11 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "fltkimages", "fltkimages.vc
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "fluid", "fluid.vcproj", "{8AED3078-8CD8-40C9-A8FF-46080024F1EB}"
 	ProjectSection(ProjectDependencies) = postProject
-		{6E8E1663-B88D-4454-ADF2-279666A93306} = {6E8E1663-B88D-4454-ADF2-279666A93306}
+		{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}
 		{E070AAFC-9D03-41A3-BC7D-30887EA0D50F} = {E070AAFC-9D03-41A3-BC7D-30887EA0D50F}
 	EndProjectSection
 EndProject
@@ -330,6 +342,9 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pixmap", "pixmap.vcproj", "
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pixmap_browser", "pixmap_browser.vcproj", "{289C605C-94CC-437F-836B-2FE41528EEEC}"
 	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}
 		{6E8E1663-B88D-4454-ADF2-279666A93306} = {6E8E1663-B88D-4454-ADF2-279666A93306}
 		{E070AAFC-9D03-41A3-BC7D-30887EA0D50F} = {E070AAFC-9D03-41A3-BC7D-30887EA0D50F}
 	EndProjectSection
@@ -405,6 +420,18 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "valuators", "valuators.vcpr
 		{E070AAFC-9D03-41A3-BC7D-30887EA0D50F} = {E070AAFC-9D03-41A3-BC7D-30887EA0D50F}
 	EndProjectSection
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "jpeg", "jpeg.vcproj", "{08B82852-90B3-4767-A5D2-F0A4FCCB2377}"
+	ProjectSection(ProjectDependencies) = postProject
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zlib", "zlib.vcproj", "{E1D9CE3F-400D-40E8-AD0D-61C29B1847FF}"
+	ProjectSection(ProjectDependencies) = postProject
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libpng", "libpng.vcproj", "{D640A221-F95A-40FF-AC0E-0E8B615C7681}"
+	ProjectSection(ProjectDependencies) = postProject
+	EndProjectSection
+EndProject
 Global
 	GlobalSection(SolutionConfiguration) = preSolution
 		Debug = Debug
@@ -671,6 +698,18 @@ Global
 		{CEE12ACB-20E4-45E4-AD5E-D15D7CFF68C3}.Debug.Build.0 = Debug|Win32
 		{CEE12ACB-20E4-45E4-AD5E-D15D7CFF68C3}.Release.ActiveCfg = Release|Win32
 		{CEE12ACB-20E4-45E4-AD5E-D15D7CFF68C3}.Release.Build.0 = Release|Win32
+		{08B82852-90B3-4767-A5D2-F0A4FCCB2377}.Debug.ActiveCfg = Debug|Win32
+		{08B82852-90B3-4767-A5D2-F0A4FCCB2377}.Debug.Build.0 = Debug|Win32
+		{08B82852-90B3-4767-A5D2-F0A4FCCB2377}.Release.ActiveCfg = Release|Win32
+		{08B82852-90B3-4767-A5D2-F0A4FCCB2377}.Release.Build.0 = Release|Win32
+		{E1D9CE3F-400D-40E8-AD0D-61C29B1847FF}.Debug.ActiveCfg = Debug|Win32
+		{E1D9CE3F-400D-40E8-AD0D-61C29B1847FF}.Debug.Build.0 = Debug|Win32
+		{E1D9CE3F-400D-40E8-AD0D-61C29B1847FF}.Release.ActiveCfg = Release|Win32
+		{E1D9CE3F-400D-40E8-AD0D-61C29B1847FF}.Release.Build.0 = Release|Win32
+		{D640A221-F95A-40FF-AC0E-0E8B615C7681}.Debug.ActiveCfg = Debug|Win32
+		{D640A221-F95A-40FF-AC0E-0E8B615C7681}.Debug.Build.0 = Debug|Win32
+		{D640A221-F95A-40FF-AC0E-0E8B615C7681}.Release.ActiveCfg = Release|Win32
+		{D640A221-F95A-40FF-AC0E-0E8B615C7681}.Release.Build.0 = Release|Win32
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 	EndGlobalSection
diff --git a/vcnet/fltkimages.vcproj b/vcnet/fltkimages.vcproj
index 53fc6d062..76d4b04d4 100644
--- a/vcnet/fltkimages.vcproj
+++ b/vcnet/fltkimages.vcproj
@@ -3,6 +3,7 @@
 	ProjectType="Visual C++"
 	Version="7.10"
 	Name="fltkimages"
+	ProjectGUID="{50D3FAA9-C1AF-48E6-BCCB-5FED0610BF99}"
 	SccProjectName=""
 	SccLocalPath="">
 	<Platforms>
diff --git a/vcnet/jpeg.vcproj b/vcnet/jpeg.vcproj
index d67d3f76f..f477f424d 100644
--- a/vcnet/jpeg.vcproj
+++ b/vcnet/jpeg.vcproj
@@ -3,6 +3,7 @@
 	ProjectType="Visual C++"
 	Version="7.10"
 	Name="jpeg"
+	ProjectGUID="{08B82852-90B3-4767-A5D2-F0A4FCCB2377}"
 	SccProjectName=""
 	SccLocalPath="">
 	<Platforms>
@@ -931,25 +932,6 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\jpeg\jpegtran.c">
-			<FileConfiguration
-				Name="Debug|Win32">
-				<Tool
-					Name="VCCLCompilerTool"
-					Optimization="0"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Release|Win32">
-				<Tool
-					Name="VCCLCompilerTool"
-					FavorSizeOrSpeed="0"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""/>
-			</FileConfiguration>
-		</File>
-		<File
 			RelativePath="..\jpeg\jquant1.c">
 			<FileConfiguration
 				Name="Debug|Win32">
diff --git a/vcnet/libpng.vcproj b/vcnet/libpng.vcproj
index 6ee9094bd..dd9e85ffa 100644
--- a/vcnet/libpng.vcproj
+++ b/vcnet/libpng.vcproj
@@ -3,6 +3,7 @@
 	ProjectType="Visual C++"
 	Version="7.10"
 	Name="libpng"
+	ProjectGUID="{D640A221-F95A-40FF-AC0E-0E8B615C7681}"
 	SccProjectName=""
 	SccLocalPath="">
 	<Platforms>
@@ -302,25 +303,6 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\png\pngtest.c">
-			<FileConfiguration
-				Name="Release|Win32">
-				<Tool
-					Name="VCCLCompilerTool"
-					FavorSizeOrSpeed="0"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Debug|Win32">
-				<Tool
-					Name="VCCLCompilerTool"
-					Optimization="0"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""/>
-			</FileConfiguration>
-		</File>
-		<File
 			RelativePath="..\png\pngtrans.c">
 			<FileConfiguration
 				Name="Release|Win32">
diff --git a/vcnet/zlib.vcproj b/vcnet/zlib.vcproj
index 92c8ab9b5..294fb2acd 100644
--- a/vcnet/zlib.vcproj
+++ b/vcnet/zlib.vcproj
@@ -3,6 +3,7 @@
 	ProjectType="Visual C++"
 	Version="7.10"
 	Name="zlib"
+	ProjectGUID="{E1D9CE3F-400D-40E8-AD0D-61C29B1847FF}"
 	SccProjectName=""
 	SccLocalPath="">
 	<Platforms>
diff --git a/visualc/fltk.dsw b/visualc/fltk.dsw
index 314d4fede..dd218cf26 100644
--- a/visualc/fltk.dsw
+++ b/visualc/fltk.dsw
@@ -449,6 +449,15 @@ Package=<4>
     Begin Project Dependency
     Project_Dep_Name preferences
     End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name jpeg
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name libpng
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name zlib
+    End Project Dependency
 }}}
 
 ###############################################################################
@@ -515,6 +524,15 @@ Package=<4>
     Begin Project Dependency
     Project_Dep_Name fltkimages
     End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name jpeg
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name libpng
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name zlib
+    End Project Dependency
 }}}
 
 ###############################################################################
@@ -539,6 +557,15 @@ Package=<5>
 
 Package=<4>
 {{{
+    Begin Project Dependency
+    Project_Dep_Name jpeg
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name libpng
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name zlib
+    End Project Dependency
 }}}
 
 ###############################################################################
@@ -596,6 +623,15 @@ Package=<4>
     Begin Project Dependency
     Project_Dep_Name fltkimages
     End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name jpeg
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name libpng
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name zlib
+    End Project Dependency
 }}}
 
 ###############################################################################
@@ -801,6 +837,18 @@ Package=<4>
 
 ###############################################################################
 
+Project: "jpeg"=".\jpeg.dsp" - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
 Project: "keyboard"=".\keyboard.dsp" - Package Owner=<4>
 
 Package=<5>
@@ -837,6 +885,18 @@ Package=<4>
 
 ###############################################################################
 
+Project: "libpng"=".\libpng.dsp" - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
 Project: "line_style"=".\line_style.dsp" - Package Owner=<4>
 
 Package=<5>
@@ -1004,6 +1064,15 @@ Package=<4>
     Begin Project Dependency
     Project_Dep_Name fltkimages
     End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name jpeg
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name libpng
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name zlib
+    End Project Dependency
 }}}
 
 ###############################################################################
@@ -1221,6 +1290,18 @@ Package=<4>
 
 ###############################################################################
 
+Project: "zlib"=".\zlib.dsp" - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
 Global:
 
 Package=<5>
diff --git a/visualc/jpeg.dsp b/visualc/jpeg.dsp
index 605098f10..e04b3f7a0 100644
--- a/visualc/jpeg.dsp
+++ b/visualc/jpeg.dsp
@@ -1,284 +1,280 @@
-# Microsoft Developer Studio Project File - Name="jpeg" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Static Library" 0x0104
-
-CFG=jpeg - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "jpeg.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "jpeg.mak" CFG="jpeg - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "jpeg - Win32 Release" (based on "Win32 (x86) Static Library")
-!MESSAGE "jpeg - Win32 Debug" (based on "Win32 (x86) Static Library")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "jpeg - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /Ot /Op /Ob2 /I "../visualc" /I "../zlib" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
-# SUBTRACT CPP /Os
-# ADD BASE RSC /l 0x409
-# ADD RSC /l 0x409
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo /out:"jpeg.lib"
-
-!ELSEIF  "$(CFG)" == "jpeg - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "Debug"
-# PROP Intermediate_Dir "Debug"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /GX /Z7 /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /MDd /GX /Zi /Od /I "../visualc" /I "../zlib" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
-# ADD BASE RSC /l 0x409
-# ADD RSC /l 0x409
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo /out:"jpegd.lib"
-
-!ENDIF 
-
-# Begin Target
-
-# Name "jpeg - Win32 Release"
-# Name "jpeg - Win32 Debug"
-# Begin Source File
-
-SOURCE=..\jpeg\jcapimin.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\jpeg\jcapistd.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\jpeg\jccoefct.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\jpeg\jccolor.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\jpeg\jcdctmgr.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\jpeg\jchuff.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\jpeg\jcinit.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\jpeg\jcmainct.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\jpeg\jcmarker.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\jpeg\jcmaster.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\jpeg\jcomapi.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\jpeg\jcparam.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\jpeg\jcphuff.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\jpeg\jcprepct.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\jpeg\jcsample.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\jpeg\jctrans.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\jpeg\jdapimin.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\jpeg\jdapistd.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\jpeg\jdatadst.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\jpeg\jdatasrc.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\jpeg\jdcoefct.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\jpeg\jdcolor.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\jpeg\jddctmgr.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\jpeg\jdhuff.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\jpeg\jdinput.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\jpeg\jdmainct.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\jpeg\jdmarker.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\jpeg\jdmaster.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\jpeg\jdmerge.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\jpeg\jdphuff.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\jpeg\jdpostct.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\jpeg\jdsample.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\jpeg\jdtrans.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\jpeg\jerror.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\jpeg\jfdctflt.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\jpeg\jfdctfst.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\jpeg\jfdctint.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\jpeg\jidctflt.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\jpeg\jidctfst.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\jpeg\jidctint.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\jpeg\jidctred.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\jpeg\jmemmgr.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\jpeg\jmemnobs.c
-
-!IF  "$(CFG)" == "jpeg - Win32 Release"
-
-# ADD CPP /MT
-
-!ELSEIF  "$(CFG)" == "jpeg - Win32 Debug"
-
-# ADD CPP /MTd
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\jpeg\jpegtran.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\jpeg\jquant1.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\jpeg\jquant2.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\jpeg\jutils.c
-# End Source File
-# End Target
-# End Project
+# Microsoft Developer Studio Project File - Name="jpeg" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Static Library" 0x0104
+
+CFG=jpeg - Win32 Debug
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE 
+!MESSAGE NMAKE /f "jpeg.mak".
+!MESSAGE 
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE 
+!MESSAGE NMAKE /f "jpeg.mak" CFG="jpeg - Win32 Debug"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "jpeg - Win32 Release" (based on "Win32 (x86) Static Library")
+!MESSAGE "jpeg - Win32 Debug" (based on "Win32 (x86) Static Library")
+!MESSAGE 
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+RSC=rc.exe
+
+!IF  "$(CFG)" == "jpeg - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "Release"
+# PROP Intermediate_Dir "Release"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /Ot /Op /Ob2 /I "../visualc" /I "../zlib" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
+# SUBTRACT CPP /Os
+# ADD BASE RSC /l 0x409
+# ADD RSC /l 0x409
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo
+# ADD LIB32 /nologo /out:"jpeg.lib"
+
+!ELSEIF  "$(CFG)" == "jpeg - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "Debug"
+# PROP Intermediate_Dir "Debug"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /GX /Z7 /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
+# ADD CPP /nologo /MDd /GX /Zi /Od /I "../visualc" /I "../zlib" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
+# ADD BASE RSC /l 0x409
+# ADD RSC /l 0x409
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo
+# ADD LIB32 /nologo /out:"jpegd.lib"
+
+!ENDIF 
+
+# Begin Target
+
+# Name "jpeg - Win32 Release"
+# Name "jpeg - Win32 Debug"
+# Begin Source File
+
+SOURCE=..\jpeg\jcapimin.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\jpeg\jcapistd.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\jpeg\jccoefct.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\jpeg\jccolor.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\jpeg\jcdctmgr.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\jpeg\jchuff.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\jpeg\jcinit.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\jpeg\jcmainct.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\jpeg\jcmarker.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\jpeg\jcmaster.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\jpeg\jcomapi.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\jpeg\jcparam.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\jpeg\jcphuff.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\jpeg\jcprepct.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\jpeg\jcsample.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\jpeg\jctrans.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\jpeg\jdapimin.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\jpeg\jdapistd.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\jpeg\jdatadst.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\jpeg\jdatasrc.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\jpeg\jdcoefct.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\jpeg\jdcolor.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\jpeg\jddctmgr.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\jpeg\jdhuff.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\jpeg\jdinput.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\jpeg\jdmainct.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\jpeg\jdmarker.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\jpeg\jdmaster.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\jpeg\jdmerge.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\jpeg\jdphuff.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\jpeg\jdpostct.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\jpeg\jdsample.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\jpeg\jdtrans.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\jpeg\jerror.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\jpeg\jfdctflt.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\jpeg\jfdctfst.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\jpeg\jfdctint.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\jpeg\jidctflt.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\jpeg\jidctfst.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\jpeg\jidctint.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\jpeg\jidctred.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\jpeg\jmemmgr.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\jpeg\jmemnobs.c
+
+!IF  "$(CFG)" == "jpeg - Win32 Release"
+
+# ADD CPP /MT
+
+!ELSEIF  "$(CFG)" == "jpeg - Win32 Debug"
+
+# ADD CPP /MTd
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=..\jpeg\jquant1.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\jpeg\jquant2.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\jpeg\jutils.c
+# End Source File
+# End Target
+# End Project
diff --git a/visualc/libpng.dsp b/visualc/libpng.dsp
index 39be89426..6be205027 100644
--- a/visualc/libpng.dsp
+++ b/visualc/libpng.dsp
@@ -1,149 +1,145 @@
-# Microsoft Developer Studio Project File - Name="libpng" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Static Library" 0x0104
-
-CFG=libpng - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "libpng.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "libpng.mak" CFG="libpng - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "libpng - Win32 Release" (based on "Win32 (x86) Static Library")
-!MESSAGE "libpng - Win32 Debug" (based on "Win32 (x86) Static Library")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "libpng - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /Ot /Op /Ob2 /I "..\zlib-1.1.3" /I "../visualc" /I "../zlib" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
-# SUBTRACT CPP /Os
-# ADD BASE RSC /l 0x409
-# ADD RSC /l 0x409
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo /out:"png.lib"
-
-!ELSEIF  "$(CFG)" == "libpng - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "Debug"
-# PROP Intermediate_Dir "Debug"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /GX /Z7 /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /MDd /GX /Zi /Od /I "..\zlib-1.1.3" /I "../visualc" /I "../zlib" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
-# ADD BASE RSC /l 0x409
-# ADD RSC /l 0x409
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo /out:"pngd.lib"
-
-!ENDIF 
-
-# Begin Target
-
-# Name "libpng - Win32 Release"
-# Name "libpng - Win32 Debug"
-# Begin Source File
-
-SOURCE=..\png\png.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\png\pngerror.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\png\pngget.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\png\pngmem.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\png\pngpread.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\png\pngread.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\png\pngrio.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\png\pngrtran.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\png\pngrutil.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\png\pngset.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\png\pngtest.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\png\pngtrans.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\png\pngwio.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\png\pngwrite.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\png\pngwtran.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\png\pngwutil.c
-# End Source File
-# End Target
-# End Project
+# Microsoft Developer Studio Project File - Name="libpng" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Static Library" 0x0104
+
+CFG=libpng - Win32 Debug
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE 
+!MESSAGE NMAKE /f "libpng.mak".
+!MESSAGE 
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE 
+!MESSAGE NMAKE /f "libpng.mak" CFG="libpng - Win32 Debug"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "libpng - Win32 Release" (based on "Win32 (x86) Static Library")
+!MESSAGE "libpng - Win32 Debug" (based on "Win32 (x86) Static Library")
+!MESSAGE 
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+RSC=rc.exe
+
+!IF  "$(CFG)" == "libpng - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "Release"
+# PROP Intermediate_Dir "Release"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /Ot /Op /Ob2 /I "..\zlib-1.1.3" /I "../visualc" /I "../zlib" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
+# SUBTRACT CPP /Os
+# ADD BASE RSC /l 0x409
+# ADD RSC /l 0x409
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo
+# ADD LIB32 /nologo /out:"png.lib"
+
+!ELSEIF  "$(CFG)" == "libpng - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "Debug"
+# PROP Intermediate_Dir "Debug"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /GX /Z7 /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
+# ADD CPP /nologo /MDd /GX /Zi /Od /I "..\zlib-1.1.3" /I "../visualc" /I "../zlib" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
+# ADD BASE RSC /l 0x409
+# ADD RSC /l 0x409
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo
+# ADD LIB32 /nologo /out:"pngd.lib"
+
+!ENDIF 
+
+# Begin Target
+
+# Name "libpng - Win32 Release"
+# Name "libpng - Win32 Debug"
+# Begin Source File
+
+SOURCE=..\png\png.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\png\pngerror.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\png\pngget.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\png\pngmem.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\png\pngpread.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\png\pngread.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\png\pngrio.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\png\pngrtran.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\png\pngrutil.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\png\pngset.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\png\pngtrans.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\png\pngwio.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\png\pngwrite.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\png\pngwtran.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\png\pngwutil.c
+# End Source File
+# End Target
+# End Project