diff --git a/XSchemWin/XSchemWin.sln b/XSchemWin/XSchemWin.sln
index 3d554ed8..a59876f7 100644
--- a/XSchemWin/XSchemWin.sln
+++ b/XSchemWin/XSchemWin.sln
@@ -11,6 +11,8 @@ Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|x64 = Debug|x64
Debug|x86 = Debug|x86
+ Release_binary|x64 = Release_binary|x64
+ Release_binary|x86 = Release_binary|x86
Release|x64 = Release|x64
Release|x86 = Release|x86
EndGlobalSection
@@ -19,6 +21,10 @@ Global
{22C260FD-DCF7-4ED2-93AD-491F08007584}.Debug|x64.Build.0 = Debug|x64
{22C260FD-DCF7-4ED2-93AD-491F08007584}.Debug|x86.ActiveCfg = Debug|Win32
{22C260FD-DCF7-4ED2-93AD-491F08007584}.Debug|x86.Build.0 = Debug|Win32
+ {22C260FD-DCF7-4ED2-93AD-491F08007584}.Release_binary|x64.ActiveCfg = Release_binary|x64
+ {22C260FD-DCF7-4ED2-93AD-491F08007584}.Release_binary|x64.Build.0 = Release_binary|x64
+ {22C260FD-DCF7-4ED2-93AD-491F08007584}.Release_binary|x86.ActiveCfg = Release_binary|Win32
+ {22C260FD-DCF7-4ED2-93AD-491F08007584}.Release_binary|x86.Build.0 = Release_binary|Win32
{22C260FD-DCF7-4ED2-93AD-491F08007584}.Release|x64.ActiveCfg = Release|x64
{22C260FD-DCF7-4ED2-93AD-491F08007584}.Release|x64.Build.0 = Release|x64
{22C260FD-DCF7-4ED2-93AD-491F08007584}.Release|x86.ActiveCfg = Release|Win32
@@ -26,6 +32,10 @@ Global
{91FBAA21-56D3-42E7-A3E8-DF92C89CD027}.Debug|x64.ActiveCfg = Debug|x86
{91FBAA21-56D3-42E7-A3E8-DF92C89CD027}.Debug|x86.ActiveCfg = Debug|x86
{91FBAA21-56D3-42E7-A3E8-DF92C89CD027}.Debug|x86.Build.0 = Debug|x86
+ {91FBAA21-56D3-42E7-A3E8-DF92C89CD027}.Release_binary|x64.ActiveCfg = Release|x86
+ {91FBAA21-56D3-42E7-A3E8-DF92C89CD027}.Release_binary|x64.Build.0 = Release|x86
+ {91FBAA21-56D3-42E7-A3E8-DF92C89CD027}.Release_binary|x86.ActiveCfg = Release|x86
+ {91FBAA21-56D3-42E7-A3E8-DF92C89CD027}.Release_binary|x86.Build.0 = Release|x86
{91FBAA21-56D3-42E7-A3E8-DF92C89CD027}.Release|x64.ActiveCfg = Release|x86
{91FBAA21-56D3-42E7-A3E8-DF92C89CD027}.Release|x86.ActiveCfg = Release|x86
{91FBAA21-56D3-42E7-A3E8-DF92C89CD027}.Release|x86.Build.0 = Release|x86
diff --git a/XSchemWin/XSchemWin.vcxproj b/XSchemWin/XSchemWin.vcxproj
index fa535711..5d533fbd 100644
--- a/XSchemWin/XSchemWin.vcxproj
+++ b/XSchemWin/XSchemWin.vcxproj
@@ -5,6 +5,14 @@
Debug
Win32
+
+ Release_binary
+ Win32
+
+
+ Release_binary
+ x64
+
Release
Win32
@@ -38,6 +46,13 @@
true
Unicode
+
+ Application
+ false
+ v142
+ true
+ Unicode
+
Application
true
@@ -51,6 +66,13 @@
true
Unicode
+
+ Application
+ false
+ v142
+ true
+ Unicode
+
@@ -62,12 +84,18 @@
+
+
+
+
+
+
true
@@ -82,6 +110,9 @@
false
+
+ false
+
false
$(VC_IncludePath);$(WindowsSDK_IncludePath);C:\ActiveTcl\include
@@ -89,6 +120,13 @@
$(VC_ExecutablePath_x64);$(CommonExecutablePath);D:\GnuWin32\bin
XSchem
+
+ false
+ $(VC_IncludePath);$(WindowsSDK_IncludePath);C:\myTcl86\include
+ $(VC_LibraryPath_x64);$(WindowsSDK_LibraryPath_x64);$(NETFXKitsDir)Lib\um\x64;C:\myTcl86\lib
+ $(VC_ExecutablePath_x64);$(CommonExecutablePath);D:\GnuWin32\bin
+ XSchem
+
Level3
@@ -130,6 +168,22 @@
true
+
+
+ Level3
+ true
+ true
+ true
+ NDEBUG;_CONSOLE;%(PreprocessorDefinitions)
+ true
+
+
+ Console
+ true
+ true
+ true
+
+
Level3
@@ -147,6 +201,23 @@
tcl86t.lib;tk86t.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)
+
+
+ Level3
+ true
+ true
+ true
+ NDEBUG;_CONSOLE;%(PreprocessorDefinitions);_CRT_SECURE_NO_WARNINGS
+ true
+
+
+ Console
+ true
+ true
+ true
+ tcl86t.lib;tk86t.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)
+
+
@@ -193,14 +264,18 @@
bison -d -o expandlabel.c ..\src\expandlabel.y
expandlabel.c
bison -d -o expandlabel.c ..\src\expandlabel.y
+ bison -d -o expandlabel.c ..\src\expandlabel.y
expandlabel.c
+ expandlabel.c
Document
flex -l -oparselabel.c ..\src\parselabel.l
flex -l -oparselabel.c ..\src\parselabel.l
+ flex -l -oparselabel.c ..\src\parselabel.l
parselabel.c
parselabel.c
+ parselabel.c
diff --git a/XSchemWin/XSchemWix/Product.wxs b/XSchemWin/XSchemWix/Product.wxs
index 912983fd..6086941c 100644
--- a/XSchemWin/XSchemWix/Product.wxs
+++ b/XSchemWin/XSchemWix/Product.wxs
@@ -1,6 +1,6 @@
-
+
diff --git a/XSchemWin/XSchemWix/doc.wxs b/XSchemWin/XSchemWix/doc.wxs
index 63398ebf..f0e8dcd6 100644
--- a/XSchemWin/XSchemWix/doc.wxs
+++ b/XSchemWin/XSchemWix/doc.wxs
@@ -34,9 +34,6 @@
-
-
-
@@ -811,7 +808,6 @@
-
diff --git a/XSchemWin/XSchemWix/heat_doc.wxs b/XSchemWin/XSchemWix/heat_doc.wxs
index 73dc5517..eaa8a349 100644
--- a/XSchemWin/XSchemWix/heat_doc.wxs
+++ b/XSchemWin/XSchemWix/heat_doc.wxs
@@ -3,796 +3,793 @@
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
-
-
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+