From ad9b34e834fc762ca63073e9865526125644edaa Mon Sep 17 00:00:00 2001
From: scuri <scuri>
Date: Tue, 7 Jul 2009 00:13:40 +0000
Subject: *** empty log message ***

---
 mak.vc9/cd.sln              |  15 +-
 mak.vc9/cd_freetype.vcproj  |   6 +-
 mak.vc9/cdgdk.vcproj        | 601 ++++++++++++++++++++++++++++++++++++++++++++
 mak.vc9/cdsimple.vcproj     | 131 ++++++++++
 mak.vc9/cdsimplegdk.vcproj  | 131 ++++++++++
 mak.vc9/cdtestsimple.vcproj | 131 ----------
 mak.vc9/cdx11.vcproj        |   6 +-
 mak.vc9/cdxrender.vcproj    |   6 +-
 8 files changed, 886 insertions(+), 141 deletions(-)
 create mode 100644 mak.vc9/cdgdk.vcproj
 create mode 100644 mak.vc9/cdsimple.vcproj
 create mode 100644 mak.vc9/cdsimplegdk.vcproj
 delete mode 100644 mak.vc9/cdtestsimple.vcproj

(limited to 'mak.vc9')

diff --git a/mak.vc9/cd.sln b/mak.vc9/cd.sln
index aabc2ca..3b8c3a6 100644
--- a/mak.vc9/cd.sln
+++ b/mak.vc9/cd.sln
@@ -65,13 +65,21 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cdtest", "cdtest.vcproj", "
 		{8441F69D-7135-43B2-974F-45C6123C8467} = {8441F69D-7135-43B2-974F-45C6123C8467}
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cdtestsimple", "cdtestsimple.vcproj", "{82BC36B1-9F7A-41D4-A24F-DBE012378CE6}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cdsimple", "cdsimple.vcproj", "{82BC36B1-9F7A-41D4-A24F-DBE012378CE6}"
 	ProjectSection(ProjectDependencies) = postProject
 		{01818D2C-65AF-4D5C-9452-4DFF401C6461} = {01818D2C-65AF-4D5C-9452-4DFF401C6461}
 		{51A96255-7EAB-4F36-A6E5-1BAF6245FA18} = {51A96255-7EAB-4F36-A6E5-1BAF6245FA18}
 		{8441F69D-7135-43B2-974F-45C6123C8467} = {8441F69D-7135-43B2-974F-45C6123C8467}
 	EndProjectSection
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cdgdk", "cdgdk.vcproj", "{01818D2C-AAAA-4D5C-ABCD-1234401C6461}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cdsimplegdk", "cdsimplegdk.vcproj", "{82BC36B1-DDDD-41D4-ABCD-A12312378CE6}"
+	ProjectSection(ProjectDependencies) = postProject
+		{01818D2C-AAAA-4D5C-ABCD-1234401C6461} = {01818D2C-AAAA-4D5C-ABCD-1234401C6461}
+		{8441F69D-7135-43B2-974F-45C6123C8467} = {8441F69D-7135-43B2-974F-45C6123C8467}
+	EndProjectSection
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Win32 = Debug|Win32
@@ -105,6 +113,10 @@ Global
 		{A7E49FB8-700A-45EC-9174-FB1C2C7E83C9}.Debug|Win32.Build.0 = Debug|Win32
 		{82BC36B1-9F7A-41D4-A24F-DBE012378CE6}.Debug|Win32.ActiveCfg = Debug|Win32
 		{82BC36B1-9F7A-41D4-A24F-DBE012378CE6}.Debug|Win32.Build.0 = Debug|Win32
+		{01818D2C-AAAA-4D5C-ABCD-1234401C6461}.Debug|Win32.ActiveCfg = Debug|Win32
+		{01818D2C-AAAA-4D5C-ABCD-1234401C6461}.Debug|Win32.Build.0 = Debug|Win32
+		{82BC36B1-DDDD-41D4-ABCD-A12312378CE6}.Debug|Win32.ActiveCfg = Debug|Win32
+		{82BC36B1-DDDD-41D4-ABCD-A12312378CE6}.Debug|Win32.Build.0 = Debug|Win32
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -118,6 +130,7 @@ Global
 		{53FC9752-81C1-4AA6-B366-A7890A2B81F6} = {EFB1BE3C-2981-456B-8E32-928CBDFF7822}
 		{A7E49FB8-700A-45EC-9174-FB1C2C7E83C9} = {162715BD-4DB3-4007-8B50-725C0BD11878}
 		{82BC36B1-9F7A-41D4-A24F-DBE012378CE6} = {162715BD-4DB3-4007-8B50-725C0BD11878}
+		{82BC36B1-DDDD-41D4-ABCD-A12312378CE6} = {162715BD-4DB3-4007-8B50-725C0BD11878}
 	EndGlobalSection
 	GlobalSection(DevPartner Solution Properties) = postSolution
 	EndGlobalSection
diff --git a/mak.vc9/cd_freetype.vcproj b/mak.vc9/cd_freetype.vcproj
index 2f58074..554b749 100644
--- a/mak.vc9/cd_freetype.vcproj
+++ b/mak.vc9/cd_freetype.vcproj
@@ -17,7 +17,7 @@
 		<Configuration
 			Name="Debug|Win32"
 			OutputDirectory="..\lib"
-			IntermediateDirectory="..\obj"
+			IntermediateDirectory="..\obj\freetype"
 			ConfigurationType="4"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			UseOfMFC="0"
@@ -44,10 +44,10 @@
 				AdditionalIncludeDirectories="..\src\freetype2"
 				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;FT2_BUILD_LIBRARY;_CRT_SECURE_NO_DEPRECATE"
 				RuntimeLibrary="0"
-				PrecompiledHeaderFile=".\..\obj/freetype.pch"
+				PrecompiledHeaderFile=".\..\obj\freetype/freetype.pch"
 				AssemblerListingLocation=""
 				ObjectFile="$(IntDir)/"
-				ProgramDataBaseFileName="..\obj\"
+				ProgramDataBaseFileName="..\obj\freetype\"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="1"
diff --git a/mak.vc9/cdgdk.vcproj b/mak.vc9/cdgdk.vcproj
new file mode 100644
index 0000000..7e48a05
--- /dev/null
+++ b/mak.vc9/cdgdk.vcproj
@@ -0,0 +1,601 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="9,00"
+	Name="cdgdk"
+	ProjectGUID="{01818D2C-AAAA-4D5C-ABCD-1234401C6461}"
+	TargetFrameworkVersion="0"
+	>
+	<Platforms>
+		<Platform
+			Name="Win32"
+		/>
+	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory="..\lib"
+			IntermediateDirectory="..\obj\cdgdk"
+			ConfigurationType="4"
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="..\include;..\src;..\src\drv;..\src\freetype2;..\src\intcgm;..\src\iup;..\src\sim;&quot;d:\lng\gtk\include\atk-1.0&quot;;d:\lng\gtk\include\cairo;&quot;d:\lng\gtk\include\glib-2.0&quot;;&quot;d:\lng\gtk\include\pango-1.0&quot;;&quot;d:\lng\gtk\include\gtk-2.0&quot;;&quot;d:\lng\gtk\lib\glib-2.0\include&quot;;&quot;d:\lng\gtk\lib\gtk-2.0\include&quot;"
+				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;CD_NO_OLD_INTERFACE;FT2_BUILD_LIBRARY;_CRT_SECURE_NO_DEPRECATE"
+				RuntimeLibrary="0"
+				PrecompiledHeaderFile=".\..\obj\cdgdk/cd.pch"
+				AssemblerListingLocation=""
+				ObjectFile="$(IntDir)/"
+				ProgramDataBaseFileName="..\obj\cdgdk\"
+				WarningLevel="4"
+				SuppressStartupBanner="true"
+				DebugInformationFormat="1"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				Culture="1046"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLibrarianTool"
+				OutputFile="..\lib\cdgdk.lib"
+				SuppressStartupBanner="true"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<Filter
+			Name="INTCGM"
+			>
+			<File
+				RelativePath="..\src\intcgm\bparse.c"
+				>
+			</File>
+			<File
+				RelativePath="..\src\intcgm\circle.c"
+				>
+			</File>
+			<File
+				RelativePath="..\src\intcgm\ellipse.c"
+				>
+			</File>
+			<File
+				RelativePath="..\src\intcgm\intcgm1.c"
+				>
+			</File>
+			<File
+				RelativePath="..\src\intcgm\intcgm2.c"
+				>
+			</File>
+			<File
+				RelativePath="..\src\intcgm\intcgm4.c"
+				>
+			</File>
+			<File
+				RelativePath="..\src\intcgm\intcgm6.c"
+				>
+			</File>
+			<File
+				RelativePath="..\src\intcgm\list.c"
+				>
+			</File>
+			<File
+				RelativePath="..\src\intcgm\sism.c"
+				>
+			</File>
+			<File
+				RelativePath="..\src\intcgm\tparse.c"
+				>
+			</File>
+			<Filter
+				Name="INC"
+				>
+				<File
+					RelativePath="..\src\intcgm\bparse.h"
+					>
+				</File>
+				<File
+					RelativePath="..\src\intcgm\circle.h"
+					>
+				</File>
+				<File
+					RelativePath="..\src\intcgm\ellipse.h"
+					>
+				</File>
+				<File
+					RelativePath="..\src\intcgm\intcgm.h"
+					>
+				</File>
+				<File
+					RelativePath="..\src\intcgm\intcgm2.h"
+					>
+				</File>
+				<File
+					RelativePath="..\src\intcgm\intcgm4.h"
+					>
+				</File>
+				<File
+					RelativePath="..\src\intcgm\intcgm6.h"
+					>
+				</File>
+				<File
+					RelativePath="..\src\intcgm\list.h"
+					>
+				</File>
+				<File
+					RelativePath="..\src\intcgm\sism.h"
+					>
+				</File>
+				<File
+					RelativePath="..\src\intcgm\tparse.h"
+					>
+				</File>
+				<File
+					RelativePath="..\src\intcgm\types.h"
+					>
+				</File>
+			</Filter>
+		</Filter>
+		<Filter
+			Name="GDK"
+			>
+			<File
+				RelativePath="..\src\gdk\cdgdk.c"
+				>
+			</File>
+			<File
+				RelativePath="..\src\gdk\cdgdk.h"
+				>
+			</File>
+			<File
+				RelativePath="..\src\gdk\cdgdkclp.c"
+				>
+			</File>
+			<File
+				RelativePath="..\src\gdk\cdgdkdbuf.c"
+				>
+			</File>
+			<File
+				RelativePath="..\src\gdk\cdgdkimg.c"
+				>
+			</File>
+			<File
+				RelativePath="..\src\gdk\cdgdknative.c"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="SIM"
+			>
+			<File
+				RelativePath="..\src\sim\cd_truetype.c"
+				>
+			</File>
+			<File
+				RelativePath="..\src\sim\cdfontex.c"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						WarningLevel="4"
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\src\sim\sim.c"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						WarningLevel="4"
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\src\sim\sim.h"
+				>
+			</File>
+			<File
+				RelativePath="..\src\sim\sim_linepolyfill.c"
+				>
+			</File>
+			<File
+				RelativePath="..\src\sim\sim_other.c"
+				>
+			</File>
+			<File
+				RelativePath="..\src\sim\sim_primitives.c"
+				>
+			</File>
+			<File
+				RelativePath="..\src\sim\sim_text.c"
+				>
+			</File>
+			<File
+				RelativePath="..\src\sim\truetype.h"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="DRV"
+			>
+			<File
+				RelativePath="..\src\drv\cdcgm.c"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						WarningLevel="4"
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\src\drv\cddebug.c"
+				>
+			</File>
+			<File
+				RelativePath="..\src\drv\cddgn.c"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						WarningLevel="4"
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\src\drv\cddxf.c"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						WarningLevel="4"
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\src\drv\cdirgb.c"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						WarningLevel="4"
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\src\drv\cdmf.c"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						WarningLevel="4"
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\src\drv\cdpicture.c"
+				>
+			</File>
+			<File
+				RelativePath="..\src\drv\cdps.c"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						WarningLevel="4"
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\src\drv\cgm.c"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						WarningLevel="4"
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\src\drv\cgm.h"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="include"
+			>
+			<File
+				RelativePath="..\include\cd.h"
+				>
+			</File>
+			<File
+				RelativePath="..\include\cd_old.h"
+				>
+			</File>
+			<File
+				RelativePath="..\include\cd_private.h"
+				>
+			</File>
+			<File
+				RelativePath="..\include\cdcgm.h"
+				>
+			</File>
+			<File
+				RelativePath="..\include\cdclipbd.h"
+				>
+			</File>
+			<File
+				RelativePath="..\include\cddbuf.h"
+				>
+			</File>
+			<File
+				RelativePath="..\include\cddebug.h"
+				>
+			</File>
+			<File
+				RelativePath="..\include\cddgn.h"
+				>
+			</File>
+			<File
+				RelativePath="..\include\cddxf.h"
+				>
+			</File>
+			<File
+				RelativePath="..\include\cdemf.h"
+				>
+			</File>
+			<File
+				RelativePath="..\include\cdimage.h"
+				>
+			</File>
+			<File
+				RelativePath="..\include\cdirgb.h"
+				>
+			</File>
+			<File
+				RelativePath="..\include\cdmf.h"
+				>
+			</File>
+			<File
+				RelativePath="..\include\cdmf_private.h"
+				>
+			</File>
+			<File
+				RelativePath="..\include\cdnative.h"
+				>
+			</File>
+			<File
+				RelativePath="..\include\cdprint.h"
+				>
+			</File>
+			<File
+				RelativePath="..\include\cdps.h"
+				>
+			</File>
+			<File
+				RelativePath="..\include\cdwmf.h"
+				>
+			</File>
+			<File
+				RelativePath="..\include\wd.h"
+				>
+			</File>
+			<File
+				RelativePath="..\include\wd_old.h"
+				>
+			</File>
+		</Filter>
+		<File
+			RelativePath="..\src\cd.c"
+			>
+			<FileConfiguration
+				Name="Debug|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					WarningLevel="4"
+				/>
+			</FileConfiguration>
+		</File>
+		<File
+			RelativePath="..\src\cd.def"
+			>
+		</File>
+		<File
+			RelativePath="..\src\cd_active.c"
+			>
+			<FileConfiguration
+				Name="Debug|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					WarningLevel="4"
+				/>
+			</FileConfiguration>
+		</File>
+		<File
+			RelativePath="..\src\cd_attributes.c"
+			>
+			<FileConfiguration
+				Name="Debug|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					WarningLevel="4"
+				/>
+			</FileConfiguration>
+		</File>
+		<File
+			RelativePath="..\src\cd_bitmap.c"
+			>
+			<FileConfiguration
+				Name="Debug|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					WarningLevel="4"
+				/>
+			</FileConfiguration>
+		</File>
+		<File
+			RelativePath="..\src\cd_image.c"
+			>
+			<FileConfiguration
+				Name="Debug|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					WarningLevel="4"
+				/>
+			</FileConfiguration>
+		</File>
+		<File
+			RelativePath="..\src\cd_primitives.c"
+			>
+			<FileConfiguration
+				Name="Debug|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					WarningLevel="4"
+				/>
+			</FileConfiguration>
+		</File>
+		<File
+			RelativePath="..\src\cd_text.c"
+			>
+			<FileConfiguration
+				Name="Debug|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					WarningLevel="4"
+				/>
+			</FileConfiguration>
+		</File>
+		<File
+			RelativePath="..\src\cd_util.c"
+			>
+			<FileConfiguration
+				Name="Debug|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					WarningLevel="4"
+				/>
+			</FileConfiguration>
+		</File>
+		<File
+			RelativePath="..\src\cd_vectortext.c"
+			>
+			<FileConfiguration
+				Name="Debug|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					WarningLevel="4"
+				/>
+			</FileConfiguration>
+		</File>
+		<File
+			RelativePath="..\src\rgb2map.c"
+			>
+			<FileConfiguration
+				Name="Debug|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					WarningLevel="4"
+				/>
+			</FileConfiguration>
+		</File>
+		<File
+			RelativePath="..\src\wd.c"
+			>
+			<FileConfiguration
+				Name="Debug|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					WarningLevel="4"
+				/>
+			</FileConfiguration>
+		</File>
+		<File
+			RelativePath="..\src\wdhdcpy.c"
+			>
+			<FileConfiguration
+				Name="Debug|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					WarningLevel="4"
+				/>
+			</FileConfiguration>
+		</File>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>
diff --git a/mak.vc9/cdsimple.vcproj b/mak.vc9/cdsimple.vcproj
new file mode 100644
index 0000000..8b5e7a7
--- /dev/null
+++ b/mak.vc9/cdsimple.vcproj
@@ -0,0 +1,131 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="9,00"
+	Name="cdsimple"
+	ProjectGUID="{82BC36B1-9F7A-41D4-A24F-DBE012378CE6}"
+	TargetFrameworkVersion="131072"
+	>
+	<Platforms>
+		<Platform
+			Name="Win32"
+		/>
+	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory="..\bin"
+			IntermediateDirectory="..\obj\cdsimple"
+			ConfigurationType="1"
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				TypeLibraryName=".\..\bin/cdsimple.tlb"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="..\include,..\..\iup\include"
+				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;__CD__;simple;_CRT_SECURE_NO_DEPRECATE"
+				RuntimeLibrary="0"
+				PrecompiledHeaderFile=".\..\obj\cdsimple/cdsimple.pch"
+				AssemblerListingLocation=".\..\obj\cdsimple/"
+				ObjectFile=".\..\obj\cdsimple/"
+				ProgramDataBaseFileName=".\..\obj\cdsimple/"
+				WarningLevel="4"
+				SuppressStartupBanner="true"
+				DebugInformationFormat="1"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="_DEBUG"
+				Culture="1046"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalOptions="/MACHINE:I386"
+				AdditionalDependencies="freetype6.lib cd.lib iupcd.lib iup.lib iupwin.lib comctl32.lib cdcontextplus.lib gdiplus.lib cdpdf.lib pdflib.lib iupcontrols.lib"
+				OutputFile="..\bin/cdsimple.exe"
+				LinkIncremental="2"
+				SuppressStartupBanner="true"
+				AdditionalLibraryDirectories="..\lib,..\..\iup\lib"
+				GenerateDebugInformation="true"
+				ProgramDatabaseFile="..\bin/cdsimple.pdb"
+				SubSystem="1"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<File
+			RelativePath="..\test\simple\iupmain.c"
+			>
+		</File>
+		<File
+			RelativePath="..\test\simple\simple.c"
+			>
+		</File>
+		<File
+			RelativePath="..\test\simple\simple.h"
+			>
+		</File>
+		<File
+			RelativePath="..\test\simple\simple.led"
+			>
+		</File>
+		<File
+			RelativePath="..\test\simple\simple_led.c"
+			>
+		</File>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>
diff --git a/mak.vc9/cdsimplegdk.vcproj b/mak.vc9/cdsimplegdk.vcproj
new file mode 100644
index 0000000..0b3fdee
--- /dev/null
+++ b/mak.vc9/cdsimplegdk.vcproj
@@ -0,0 +1,131 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="9,00"
+	Name="cdsimplegdk"
+	ProjectGUID="{82BC36B1-DDDD-41D4-ABCD-A12312378CE6}"
+	TargetFrameworkVersion="131072"
+	>
+	<Platforms>
+		<Platform
+			Name="Win32"
+		/>
+	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory="..\bin"
+			IntermediateDirectory="..\obj\cdsimplegdk"
+			ConfigurationType="1"
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				TypeLibraryName=".\..\bin/cdsimplegdk.tlb"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="..\include,..\..\iup\include"
+				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;__CD__;simple;_CRT_SECURE_NO_DEPRECATE;USE_GDK"
+				RuntimeLibrary="0"
+				PrecompiledHeaderFile=".\..\obj\cdsimplegdk/cdsimplegdk.pch"
+				AssemblerListingLocation=".\..\obj\cdsimplegdk/"
+				ObjectFile=".\..\obj\cdsimplegdk/"
+				ProgramDataBaseFileName=".\..\obj\cdsimplegdk/"
+				WarningLevel="4"
+				SuppressStartupBanner="true"
+				DebugInformationFormat="1"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="_DEBUG"
+				Culture="1046"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalOptions="/MACHINE:I386"
+				AdditionalDependencies="gtk-win32-2.0.lib gdk-win32-2.0.lib gdk_pixbuf-2.0.lib cairo.lib pango-1.0.lib pangowin32-1.0.lib gobject-2.0.lib gmodule-2.0.lib glib-2.0.lib freetype6.lib cd.lib iupcd.lib iup.lib iupgtk.lib comctl32.lib cdcontextplus.lib gdiplus.lib cdpdf.lib pdflib.lib iupcontrols.lib"
+				OutputFile="..\bin/cdsimplegdk.exe"
+				LinkIncremental="2"
+				SuppressStartupBanner="true"
+				AdditionalLibraryDirectories="..\lib,..\..\iup\lib;d:\lng\gtk\lib"
+				GenerateDebugInformation="true"
+				ProgramDatabaseFile="..\bin/cdsimplegdk.pdb"
+				SubSystem="1"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<File
+			RelativePath="..\test\simple\iupmain.c"
+			>
+		</File>
+		<File
+			RelativePath="..\test\simple\simple.c"
+			>
+		</File>
+		<File
+			RelativePath="..\test\simple\simple.h"
+			>
+		</File>
+		<File
+			RelativePath="..\test\simple\simple.led"
+			>
+		</File>
+		<File
+			RelativePath="..\test\simple\simple_led.c"
+			>
+		</File>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>
diff --git a/mak.vc9/cdtestsimple.vcproj b/mak.vc9/cdtestsimple.vcproj
deleted file mode 100644
index 0131f0f..0000000
--- a/mak.vc9/cdtestsimple.vcproj
+++ /dev/null
@@ -1,131 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9,00"
-	Name="cdtestsimple"
-	ProjectGUID="{82BC36B1-9F7A-41D4-A24F-DBE012378CE6}"
-	TargetFrameworkVersion="131072"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="..\bin"
-			IntermediateDirectory="..\obj\cdtestsimple"
-			ConfigurationType="1"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TypeLibraryName=".\..\bin/cdtestsimple.tlb"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\include,..\..\iup\include"
-				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;__CD__;simple;_CRT_SECURE_NO_DEPRECATE"
-				RuntimeLibrary="0"
-				PrecompiledHeaderFile=".\..\obj\cdtestsimple/cdtestsimple.pch"
-				AssemblerListingLocation=".\..\obj\cdtestsimple/"
-				ObjectFile=".\..\obj\cdtestsimple/"
-				ProgramDataBaseFileName=".\..\obj\cdtestsimple/"
-				WarningLevel="4"
-				SuppressStartupBanner="true"
-				DebugInformationFormat="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1046"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
-				AdditionalDependencies="freetype6.lib cd.lib iupcd.lib iup.lib iupwin.lib comctl32.lib cdcontextplus.lib gdiplus.lib cdpdf.lib pdflib.lib iupcontrols.lib"
-				OutputFile="..\bin/cdtestsimple.exe"
-				LinkIncremental="2"
-				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\lib,..\..\iup\lib"
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile="..\bin/cdtestsimple.pdb"
-				SubSystem="1"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<File
-			RelativePath="..\test\simple\iupmain.c"
-			>
-		</File>
-		<File
-			RelativePath="..\test\simple\simple.c"
-			>
-		</File>
-		<File
-			RelativePath="..\test\simple\simple.h"
-			>
-		</File>
-		<File
-			RelativePath="..\test\simple\simple.led"
-			>
-		</File>
-		<File
-			RelativePath="..\test\simple\simple_led.c"
-			>
-		</File>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/mak.vc9/cdx11.vcproj b/mak.vc9/cdx11.vcproj
index 1518a76..cbd55eb 100644
--- a/mak.vc9/cdx11.vcproj
+++ b/mak.vc9/cdx11.vcproj
@@ -17,7 +17,7 @@
 		<Configuration
 			Name="Debug|Win32"
 			OutputDirectory="..\lib"
-			IntermediateDirectory="..\obj"
+			IntermediateDirectory="..\obj\x11"
 			ConfigurationType="4"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			UseOfMFC="0"
@@ -44,10 +44,10 @@
 				AdditionalIncludeDirectories="..\include;..\src;..\src\drv;..\src\iup;..\src\x11;..\src\sim;D:\LNG\x11inc;..\..\iup\include"
 				PreprocessorDefinitions="WIN32,_DEBUG,_WINDOWS,CD_NO_OLD_INTERFACE,_CRT_SECURE_NO_DEPRECATE"
 				RuntimeLibrary="0"
-				PrecompiledHeaderFile=".\..\obj/cdx11.pch"
+				PrecompiledHeaderFile=".\..\obj\x11/cdx11.pch"
 				AssemblerListingLocation=""
 				ObjectFile="$(IntDir)/"
-				ProgramDataBaseFileName="..\obj\"
+				ProgramDataBaseFileName="..\obj\x11\"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="1"
diff --git a/mak.vc9/cdxrender.vcproj b/mak.vc9/cdxrender.vcproj
index 6c67dd1..d79f0ac 100644
--- a/mak.vc9/cdxrender.vcproj
+++ b/mak.vc9/cdxrender.vcproj
@@ -16,7 +16,7 @@
 		<Configuration
 			Name="Debug|Win32"
 			OutputDirectory="..\lib"
-			IntermediateDirectory="..\obj"
+			IntermediateDirectory="..\obj\xrender"
 			ConfigurationType="4"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			UseOfMFC="0"
@@ -43,10 +43,10 @@
 				AdditionalIncludeDirectories="..\include;..\src;..\src\drv;..\src\iup;..\src\x11;..\src\xrender;..\src\sim;C:\cygwin\usr\X11R6\include\;C:\LNG\x11inc;..\..\iup\include;..\src\freetype2"
 				PreprocessorDefinitions="WIN32,_DEBUG,_WINDOWS,CD_NO_OLD_INTERFACE,_CRT_SECURE_NO_DEPRECATE"
 				RuntimeLibrary="0"
-				PrecompiledHeaderFile=".\..\obj/cdxrender.pch"
+				PrecompiledHeaderFile=".\..\obj\xrender/cdxrender.pch"
 				AssemblerListingLocation=""
 				ObjectFile="$(IntDir)/"
-				ProgramDataBaseFileName="..\obj\"
+				ProgramDataBaseFileName="..\obj\xrender"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="1"
-- 
cgit v1.2.3