From 05183ae6a9b5c33802795744d701a6642a18a961 Mon Sep 17 00:00:00 2001
From: Phil Cowans <pcowans@src.gnome.org>
Date: Tue, 16 May 2006 20:43:06 +0000
Subject: [PATCH] Fixing up some build issues

* Fixing up some build issues
---
 Src/Common/Expat/Expat_vc71.vcproj      |  2 +-
 Src/DasherCore/CircleStartHandler.cpp   |  2 +-
 Src/DasherCore/DasherCore_vc71.vcproj   |  2 +-
 Src/Win32/Common/WinCommon.h            |  9 ++++--
 Src/Win32/Dasher.cpp                    |  5 +++-
 Src/Win32/Dasher.rc                     | 10 +++----
 Src/Win32/DasherControl.vcproj          | 51 ++++++++++++++++++++++++++++++++-
 Src/Win32/Dasher_vc71.sln               | 10 +++----
 Src/Win32/Dasher_vc71.vcproj            |  8 ++++--
 Utils/Win32/Inno Setup/DasherWinUni.iss |  4 +--
 10 files changed, 80 insertions(+), 23 deletions(-)

diff --git a/Src/Common/Expat/Expat_vc71.vcproj b/Src/Common/Expat/Expat_vc71.vcproj
index a6a03826..03974aed 100644
--- a/Src/Common/Expat/Expat_vc71.vcproj
+++ b/Src/Common/Expat/Expat_vc71.vcproj
@@ -164,7 +164,7 @@
 			ConfigurationType="4"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="FALSE"
-			CharacterSet="2">
+			CharacterSet="1">
 			<Tool
 				Name="VCCLCompilerTool"
 				InlineFunctionExpansion="1"
diff --git a/Src/DasherCore/CircleStartHandler.cpp b/Src/DasherCore/CircleStartHandler.cpp
index 37b61b73..ad0d623c 100644
--- a/Src/DasherCore/CircleStartHandler.cpp
+++ b/Src/DasherCore/CircleStartHandler.cpp
@@ -38,7 +38,7 @@ void CCircleStartHandler::Timer(int iTime, CDasherView *m_pDasherView, CDasherMo
 
   double dR;
 
-  dR = sqrt(pow(iCX - iCursorX, 2.0) + pow(iCY - iCursorY, 2.0));
+  dR = sqrt(pow(static_cast<double>(iCX - iCursorX), 2.0) + pow(static_cast<double>(iCY - iCursorY), 2.0));
 
   int iNewStatus;
 
diff --git a/Src/DasherCore/DasherCore_vc71.vcproj b/Src/DasherCore/DasherCore_vc71.vcproj
index e42dd845..abeb0aa2 100644
--- a/Src/DasherCore/DasherCore_vc71.vcproj
+++ b/Src/DasherCore/DasherCore_vc71.vcproj
@@ -36,7 +36,7 @@
 				ProgramDataBaseFileName=".\Target/Win32 Unicode Release/Intermediate/"
 				WarningLevel="3"
 				SuppressStartupBanner="TRUE"
-				DebugInformationFormat="3"/>
+				DebugInformationFormat="0"/>
 			<Tool
 				Name="VCCustomBuildTool"/>
 			<Tool
diff --git a/Src/Win32/Common/WinCommon.h b/Src/Win32/Common/WinCommon.h
index 471d26bf..2b53865e 100644
--- a/Src/Win32/Common/WinCommon.h
+++ b/Src/Win32/Common/WinCommon.h
@@ -13,6 +13,12 @@
 
 #define NOMINMAX
 #define WIN32_LEAN_AND_MEAN     // Excludes rarely-used stuff from the Windows headers
+
+
+#include <atlbase.h>
+#include <atlwin.h>
+
+
 #include <windows.h>
 #include <winbase.h>
 #include <Commdlg.h>
@@ -40,8 +46,5 @@ typedef std::basic_string < TCHAR > Tstring;
 namespace stdext = std;
 #endif
 
-#include <atlbase.h>
-#include <atlwin.h>
-
 
 #endif /* #ifndef __WinHelper_h__ */
diff --git a/Src/Win32/Dasher.cpp b/Src/Win32/Dasher.cpp
index 12141a2d..492880c3 100644
--- a/Src/Win32/Dasher.cpp
+++ b/Src/Win32/Dasher.cpp
@@ -12,6 +12,7 @@
 #include "DasherMouseInput.h"
 #include "Sockets/SocketInput.h"
 
+#include <sys/stat.h>
 
 using namespace std;
 using namespace Dasher;
@@ -363,5 +364,7 @@ void CDasher::SetupUI() {
 }
 
 int CDasher::GetFileSize(const std::string &strFileName) {
-  return 0;
+  struct _stat sStatInfo;
+  _stat(strFileName.c_str(), &sStatInfo);
+  return sStatInfo.st_size;
 }
diff --git a/Src/Win32/Dasher.rc b/Src/Win32/Dasher.rc
index 562f9e9f..b7c0579c 100644
--- a/Src/Win32/Dasher.rc
+++ b/Src/Win32/Dasher.rc
@@ -199,7 +199,7 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
     DEFPUSHBUTTON   "OK",IDOK,185,130,50,14
     ICON            IDI_DASHER,IDC_MYICON,23,18,20,20
-    LTEXT           "Dasher 4.1.0",IDC_STATIC,67,18,168,10,SS_NOPREFIX
+    LTEXT           "Dasher 4.1.1",IDC_STATIC,67,18,168,10,SS_NOPREFIX
     LTEXT           "Copyright (C) 1998-2006 The Dasher Project",IDC_STATIC,
                     67,30,168,10
     LTEXT           "dasher@mrao.cam.ac.uk",IDC_STATIC,67,63,168,10
@@ -815,8 +815,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 4,1,0,0
- PRODUCTVERSION 4,1,0,0
+ FILEVERSION 4,1,1,0
+ PRODUCTVERSION 4,1,1,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x3L
@@ -834,12 +834,12 @@ BEGIN
             VALUE "Comments", "Dasher is an information efficient text-entry system controlled by a pointer. It is licensed under the GPL."
             VALUE "CompanyName", "Inference Group, Cavendish Laboratory, University of Cambridge"
             VALUE "FileDescription", "Dasher"
-            VALUE "FileVersion", "4, 1, 0, 0"
+            VALUE "FileVersion", "4, 1, 1, 0"
             VALUE "InternalName", "Dasher"
             VALUE "LegalCopyright", "Copyright © 1998-2006 The Dasher Project"
             VALUE "OriginalFilename", "dasher.exe"
             VALUE "ProductName", "Dasher"
-            VALUE "ProductVersion", "4, 1, 0, 0"
+            VALUE "ProductVersion", "4, 1, 1, 0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/Src/Win32/DasherControl.vcproj b/Src/Win32/DasherControl.vcproj
index 79c1e2de..efd74495 100644
--- a/Src/Win32/DasherControl.vcproj
+++ b/Src/Win32/DasherControl.vcproj
@@ -61,7 +61,8 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				PreprocessorDefinitions="WIN32;NDEBUG;_LIB"
-				RuntimeLibrary="4"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="0"
 				UsePrecompiledHeader="3"
 				WarningLevel="3"
 				Detect64BitPortabilityProblems="TRUE"
@@ -90,6 +91,54 @@
 			<Tool
 				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
 		</Configuration>
+		<Configuration
+			Name="Unicode Release|Win32"
+			OutputDirectory=".\Target/Win32 Unicode Release"
+			IntermediateDirectory=".\Target/Win32 Unicode Release/Intermediate"
+			ConfigurationType="4"
+			CharacterSet="1">
+			<Tool
+				Name="VCCLCompilerTool"
+				GlobalOptimizations="TRUE"
+				InlineFunctionExpansion="2"
+				EnableIntrinsicFunctions="TRUE"
+				FavorSizeOrSpeed="1"
+				OptimizeForWindowsApplication="TRUE"
+				AdditionalIncludeDirectories="&quot;C:\Documents and Settings\Philip Cowans\My Documents\dasher\dasher\Src\Win32\Common&quot;;&quot;C:\Documents and Settings\Philip Cowans\My Documents\dasher\dasher\Src\Win32&quot;;&quot;C:\Program Files\Microsoft Tablet PC Platform SDK\Include&quot;"
+				PreprocessorDefinitions="WIN32,_WINDOWS,NDEBUG,_LIB,_STATIC,_UNICODE"
+				StringPooling="TRUE"
+				RuntimeLibrary="0"
+				EnableFunctionLevelLinking="TRUE"
+				UsePrecompiledHeader="2"
+				PrecompiledHeaderThrough="WinCommon.h"
+				PrecompiledHeaderFile=".\Target/Win32 Unicode Release/Intermediate/DasherControl.pch"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="FALSE"
+				DebugInformationFormat="0"/>
+			<Tool
+				Name="VCCustomBuildTool"/>
+			<Tool
+				Name="VCLibrarianTool"
+				OutputFile="$(OutDir)/DasherControl.lib"/>
+			<Tool
+				Name="VCMIDLTool"/>
+			<Tool
+				Name="VCPostBuildEventTool"/>
+			<Tool
+				Name="VCPreBuildEventTool"/>
+			<Tool
+				Name="VCPreLinkEventTool"/>
+			<Tool
+				Name="VCResourceCompilerTool"/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"/>
+			<Tool
+				Name="VCManagedWrapperGeneratorTool"/>
+			<Tool
+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+		</Configuration>
 	</Configurations>
 	<References>
 	</References>
diff --git a/Src/Win32/Dasher_vc71.sln b/Src/Win32/Dasher_vc71.sln
index 442bb0a8..4b03b421 100644
--- a/Src/Win32/Dasher_vc71.sln
+++ b/Src/Win32/Dasher_vc71.sln
@@ -5,14 +5,13 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Common", "..\Common\Common_
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DasherCore", "..\DasherCore\DasherCore_vc71.vcproj", "{192C1E5C-2D1E-4AA3-91C3-FF2D7ABD67F8}"
 	ProjectSection(ProjectDependencies) = postProject
+		{0BCE9A66-5ECF-416A-AE25-29E8FDB65A05} = {0BCE9A66-5ECF-416A-AE25-29E8FDB65A05}
+		{4A4CEB83-FBC8-4E93-831E-009875E54794} = {4A4CEB83-FBC8-4E93-831E-009875E54794}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Dasher", "Dasher_vc71.vcproj", "{752501D3-5B04-4F3C-A141-DE426E354D23}"
 	ProjectSection(ProjectDependencies) = postProject
-		{192C1E5C-2D1E-4AA3-91C3-FF2D7ABD67F8} = {192C1E5C-2D1E-4AA3-91C3-FF2D7ABD67F8}
-		{0BCE9A66-5ECF-416A-AE25-29E8FDB65A05} = {0BCE9A66-5ECF-416A-AE25-29E8FDB65A05}
 		{3998D966-9B9E-4214-ACEA-B777985AF4DD} = {3998D966-9B9E-4214-ACEA-B777985AF4DD}
-		{4A4CEB83-FBC8-4E93-831E-009875E54794} = {4A4CEB83-FBC8-4E93-831E-009875E54794}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Expat", "..\Common\Expat\Expat_vc71.vcproj", "{0BCE9A66-5ECF-416A-AE25-29E8FDB65A05}"
@@ -21,6 +20,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Expat", "..\Common\Expat\Ex
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DasherControl", "DasherControl.vcproj", "{3998D966-9B9E-4214-ACEA-B777985AF4DD}"
 	ProjectSection(ProjectDependencies) = postProject
+		{192C1E5C-2D1E-4AA3-91C3-FF2D7ABD67F8} = {192C1E5C-2D1E-4AA3-91C3-FF2D7ABD67F8}
 	EndProjectSection
 EndProject
 Global
@@ -80,8 +80,8 @@ Global
 		{3998D966-9B9E-4214-ACEA-B777985AF4DD}.Release.Build.0 = Release|Win32
 		{3998D966-9B9E-4214-ACEA-B777985AF4DD}.Unicode Debug.ActiveCfg = Debug|Win32
 		{3998D966-9B9E-4214-ACEA-B777985AF4DD}.Unicode Debug.Build.0 = Debug|Win32
-		{3998D966-9B9E-4214-ACEA-B777985AF4DD}.Unicode Release.ActiveCfg = Release|Win32
-		{3998D966-9B9E-4214-ACEA-B777985AF4DD}.Unicode Release.Build.0 = Release|Win32
+		{3998D966-9B9E-4214-ACEA-B777985AF4DD}.Unicode Release.ActiveCfg = Unicode Release|Win32
+		{3998D966-9B9E-4214-ACEA-B777985AF4DD}.Unicode Release.Build.0 = Unicode Release|Win32
 	EndGlobalSection
 	GlobalSection(SolutionItems) = postSolution
 		..\..\ChangeLog = ..\..\ChangeLog
diff --git a/Src/Win32/Dasher_vc71.vcproj b/Src/Win32/Dasher_vc71.vcproj
index 4cb7229a..1786866d 100644
--- a/Src/Win32/Dasher_vc71.vcproj
+++ b/Src/Win32/Dasher_vc71.vcproj
@@ -106,17 +106,19 @@
 				ProgramDataBaseFileName=".\Target/Win32 Unicode Release/Intermediate/"
 				WarningLevel="3"
 				SuppressStartupBanner="TRUE"
-				DebugInformationFormat="3"/>
+				DebugInformationFormat="0"/>
 			<Tool
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalOptions="/MACHINE:I386"
-				AdditionalDependencies="odbc32.lib odbccp32.lib comctl32.lib WS2_32.lib"
+				AdditionalDependencies="odbc32.lib odbccp32.lib comctl32.lib WS2_32.lib Oleacc.lib"
 				OutputFile=".\Target/Win32 Unicode Release/Dasher.exe"
-				LinkIncremental="1"
+				LinkIncremental="2"
 				SuppressStartupBanner="TRUE"
 				AdditionalLibraryDirectories="&quot;C:\Program Files\Microsoft Speech SDK 5.1\Lib\i386&quot;"
+				IgnoreAllDefaultLibraries="FALSE"
+				IgnoreDefaultLibraryNames=""
 				GenerateDebugInformation="TRUE"
 				ProgramDatabaseFile=".\Target/Win32 Unicode Release/Dasher.pdb"
 				SubSystem="2"/>
diff --git a/Utils/Win32/Inno Setup/DasherWinUni.iss b/Utils/Win32/Inno Setup/DasherWinUni.iss
index 6a02f341..1957e811 100755
--- a/Utils/Win32/Inno Setup/DasherWinUni.iss	
+++ b/Utils/Win32/Inno Setup/DasherWinUni.iss	
@@ -3,8 +3,8 @@
 
 [Setup]
 AppName=Dasher
-OutputBaseFilename=Dasher 3.99.3
-AppVerName=Dasher 3.99.3
+OutputBaseFilename=Dasher 4.1.1
+AppVerName=Dasher 4.1.1
 AppPublisher=Dasher Project
 AppPublisherURL=http://www.dasher.org.uk/
 AppSupportURL=http://www.dasher.org.uk/
-- 
2.11.4.GIT