summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorfcolin2009-07-06 10:41:04 +0000
committerfcolin2009-07-06 10:41:04 +0000
commit99092eb2616a5e88144f64f56dd01c53c50e9563 (patch)
treea97132b27188f038cb729596b064c13c828112d4
parent879eaf77babef13084b95ef170742958d90389b6 (diff)
downloadivy-cplusplus-99092eb2616a5e88144f64f56dd01c53c50e9563.zip
ivy-cplusplus-99092eb2616a5e88144f64f56dd01c53c50e9563.tar.gz
ivy-cplusplus-99092eb2616a5e88144f64f56dd01c53c50e9563.tar.bz2
ivy-cplusplus-99092eb2616a5e88144f64f56dd01c53c50e9563.tar.xz
-rw-r--r--Bus.sln68
-rw-r--r--Horloge/Horloge.vcproj31
-rw-r--r--Horloge/HorlogeDlg.cpp2
-rw-r--r--IvyProbe/IvyProbe.rc8
-rw-r--r--IvyProbe/IvyProbe.vcproj33
-rw-r--r--UpdateIvyWeb.bat7
6 files changed, 91 insertions, 58 deletions
diff --git a/Bus.sln b/Bus.sln
index 76e6fec..baa17c3 100644
--- a/Bus.sln
+++ b/Bus.sln
@@ -1,5 +1,10 @@
-Microsoft Visual Studio Solution File, Format Version 9.00
-# Visual Studio 2005
+Microsoft Visual Studio Solution File, Format Version 10.00
+# Visual Studio 2008
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{63C59D2C-F649-432C-8A44-969E66BC2C56}"
+ ProjectSection(SolutionItems) = preProject
+ UpdateIvyWeb.bat = UpdateIvyWeb.bat
+ EndProjectSection
+EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Ivy", "Ivy\Ivy.vcproj", "{9818D652-CC05-463E-880D-AFCA2C7BFABE}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "IvyProbe", "IvyProbe\IvyProbe.vcproj", "{B7F7F0F7-9029-4D1A-8CB4-C42DAF86A21C}"
@@ -11,15 +16,24 @@ EndProject
Project("{54435603-DBB4-11D2-8724-00A0C9A8B90C}") = "InstallIvyDev", "Ivy\InstIvyDev\InstIvyDev.vdproj", "{D1E11E12-38DB-4190-AD37-830CF9AD335F}"
EndProject
Project("{54435603-DBB4-11D2-8724-00A0C9A8B90C}") = "InstallIvyLib", "Ivy\IvyLib\IvyLib.vdproj", "{F2DD17AD-A9D0-43B7-92D0-5116560C78B3}"
+ ProjectSection(ProjectDependencies) = postProject
+ {9818D652-CC05-463E-880D-AFCA2C7BFABE} = {9818D652-CC05-463E-880D-AFCA2C7BFABE}
+ EndProjectSection
EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{63C59D2C-F649-432C-8A44-969E66BC2C56}"
- ProjectSection(SolutionItems) = preProject
- UpdateIvyWeb.bat = UpdateIvyWeb.bat
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "IvyThroughput", "IvyThroughput\IvyThroughput.vcproj", "{4E7CA151-4751-4FC3-B76E-4A915329A301}"
+ ProjectSection(ProjectDependencies) = postProject
+ {D79FC143-498E-4342-B2C7-BDAD1B8D0E6B} = {D79FC143-498E-4342-B2C7-BDAD1B8D0E6B}
+ {9818D652-CC05-463E-880D-AFCA2C7BFABE} = {9818D652-CC05-463E-880D-AFCA2C7BFABE}
+ EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "IvyPerf", "IvyPerf\IvyPerf.vcproj", "{26747FB6-EC25-400B-995E-8F6F1AC49734}"
+ ProjectSection(ProjectDependencies) = postProject
+ {9818D652-CC05-463E-880D-AFCA2C7BFABE} = {9818D652-CC05-463E-880D-AFCA2C7BFABE}
EndProjectSection
EndProject
Global
GlobalSection(SourceCodeControl) = preSolution
- SccNumberOfProjects = 7
+ SccNumberOfProjects = 9
SccProjectName0 = \u0022$/Bus\u0022,\u0020ZOBAAAAA
SccLocalPath0 = .
SccProvider0 = MSSCCI:Microsoft\u0020Visual\u0020SourceSafe
@@ -48,6 +62,14 @@ Global
SccLocalPath6 = .
CanCheckoutShared = false
SccProjectFilePathRelativizedFromConnection6 = Ivy\\IvyLib\\
+ SccProjectUniqueName7 = IvyPerf\\IvyPerf.vcproj
+ SccLocalPath7 = .
+ CanCheckoutShared = false
+ SccProjectFilePathRelativizedFromConnection7 = IvyPerf\\
+ SccProjectUniqueName8 = IvyThroughput\\IvyThroughput.vcproj
+ SccLocalPath8 = .
+ CanCheckoutShared = false
+ SccProjectFilePathRelativizedFromConnection8 = IvyThroughput\\
EndGlobalSection
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Win32 = Debug|Win32
@@ -60,41 +82,57 @@ Global
{9818D652-CC05-463E-880D-AFCA2C7BFABE}.Debug|Win32.Build.0 = Debug|Win32
{9818D652-CC05-463E-880D-AFCA2C7BFABE}.Debug|x64.ActiveCfg = Debug|x64
{9818D652-CC05-463E-880D-AFCA2C7BFABE}.Debug|x64.Build.0 = Debug|x64
- {9818D652-CC05-463E-880D-AFCA2C7BFABE}.Release|Win32.ActiveCfg = Release|x64
- {9818D652-CC05-463E-880D-AFCA2C7BFABE}.Release|Win32.Build.0 = Release|x64
+ {9818D652-CC05-463E-880D-AFCA2C7BFABE}.Release|Win32.ActiveCfg = Release|Win32
+ {9818D652-CC05-463E-880D-AFCA2C7BFABE}.Release|Win32.Build.0 = Release|Win32
{9818D652-CC05-463E-880D-AFCA2C7BFABE}.Release|x64.ActiveCfg = Release|x64
{9818D652-CC05-463E-880D-AFCA2C7BFABE}.Release|x64.Build.0 = Release|x64
{B7F7F0F7-9029-4D1A-8CB4-C42DAF86A21C}.Debug|Win32.ActiveCfg = Debug|Win32
{B7F7F0F7-9029-4D1A-8CB4-C42DAF86A21C}.Debug|Win32.Build.0 = Debug|Win32
{B7F7F0F7-9029-4D1A-8CB4-C42DAF86A21C}.Debug|x64.ActiveCfg = Debug|x64
{B7F7F0F7-9029-4D1A-8CB4-C42DAF86A21C}.Debug|x64.Build.0 = Debug|x64
- {B7F7F0F7-9029-4D1A-8CB4-C42DAF86A21C}.Release|Win32.ActiveCfg = Release|x64
- {B7F7F0F7-9029-4D1A-8CB4-C42DAF86A21C}.Release|Win32.Build.0 = Release|x64
+ {B7F7F0F7-9029-4D1A-8CB4-C42DAF86A21C}.Release|Win32.ActiveCfg = Release|Win32
+ {B7F7F0F7-9029-4D1A-8CB4-C42DAF86A21C}.Release|Win32.Build.0 = Release|Win32
{B7F7F0F7-9029-4D1A-8CB4-C42DAF86A21C}.Release|x64.ActiveCfg = Release|x64
{B7F7F0F7-9029-4D1A-8CB4-C42DAF86A21C}.Release|x64.Build.0 = Release|x64
{72D0A567-E63F-4B6B-9F4D-9C9CC2B5E6E5}.Debug|Win32.ActiveCfg = Debug
{72D0A567-E63F-4B6B-9F4D-9C9CC2B5E6E5}.Debug|x64.ActiveCfg = Debug
{72D0A567-E63F-4B6B-9F4D-9C9CC2B5E6E5}.Release|Win32.ActiveCfg = Release
+ {72D0A567-E63F-4B6B-9F4D-9C9CC2B5E6E5}.Release|Win32.Build.0 = Release
{72D0A567-E63F-4B6B-9F4D-9C9CC2B5E6E5}.Release|x64.ActiveCfg = Release
- {72D0A567-E63F-4B6B-9F4D-9C9CC2B5E6E5}.Release|x64.Build.0 = Release
{D79FC143-498E-4342-B2C7-BDAD1B8D0E6B}.Debug|Win32.ActiveCfg = Debug|Win32
{D79FC143-498E-4342-B2C7-BDAD1B8D0E6B}.Debug|Win32.Build.0 = Debug|Win32
{D79FC143-498E-4342-B2C7-BDAD1B8D0E6B}.Debug|x64.ActiveCfg = Debug|x64
{D79FC143-498E-4342-B2C7-BDAD1B8D0E6B}.Debug|x64.Build.0 = Debug|x64
- {D79FC143-498E-4342-B2C7-BDAD1B8D0E6B}.Release|Win32.ActiveCfg = Release|x64
- {D79FC143-498E-4342-B2C7-BDAD1B8D0E6B}.Release|Win32.Build.0 = Release|x64
+ {D79FC143-498E-4342-B2C7-BDAD1B8D0E6B}.Release|Win32.ActiveCfg = Release|Win32
+ {D79FC143-498E-4342-B2C7-BDAD1B8D0E6B}.Release|Win32.Build.0 = Release|Win32
{D79FC143-498E-4342-B2C7-BDAD1B8D0E6B}.Release|x64.ActiveCfg = Release|x64
{D79FC143-498E-4342-B2C7-BDAD1B8D0E6B}.Release|x64.Build.0 = Release|x64
{D1E11E12-38DB-4190-AD37-830CF9AD335F}.Debug|Win32.ActiveCfg = Debug
{D1E11E12-38DB-4190-AD37-830CF9AD335F}.Debug|x64.ActiveCfg = Debug
{D1E11E12-38DB-4190-AD37-830CF9AD335F}.Release|Win32.ActiveCfg = Release
+ {D1E11E12-38DB-4190-AD37-830CF9AD335F}.Release|Win32.Build.0 = Release
{D1E11E12-38DB-4190-AD37-830CF9AD335F}.Release|x64.ActiveCfg = Release
- {D1E11E12-38DB-4190-AD37-830CF9AD335F}.Release|x64.Build.0 = Release
{F2DD17AD-A9D0-43B7-92D0-5116560C78B3}.Debug|Win32.ActiveCfg = Debug
{F2DD17AD-A9D0-43B7-92D0-5116560C78B3}.Debug|x64.ActiveCfg = Debug
{F2DD17AD-A9D0-43B7-92D0-5116560C78B3}.Release|Win32.ActiveCfg = Release
+ {F2DD17AD-A9D0-43B7-92D0-5116560C78B3}.Release|Win32.Build.0 = Release
{F2DD17AD-A9D0-43B7-92D0-5116560C78B3}.Release|x64.ActiveCfg = Release
- {F2DD17AD-A9D0-43B7-92D0-5116560C78B3}.Release|x64.Build.0 = Release
+ {4E7CA151-4751-4FC3-B76E-4A915329A301}.Debug|Win32.ActiveCfg = Debug|Win32
+ {4E7CA151-4751-4FC3-B76E-4A915329A301}.Debug|Win32.Build.0 = Debug|Win32
+ {4E7CA151-4751-4FC3-B76E-4A915329A301}.Debug|x64.ActiveCfg = Debug|x64
+ {4E7CA151-4751-4FC3-B76E-4A915329A301}.Debug|x64.Build.0 = Debug|x64
+ {4E7CA151-4751-4FC3-B76E-4A915329A301}.Release|Win32.ActiveCfg = Release|Win32
+ {4E7CA151-4751-4FC3-B76E-4A915329A301}.Release|Win32.Build.0 = Release|Win32
+ {4E7CA151-4751-4FC3-B76E-4A915329A301}.Release|x64.ActiveCfg = Release|x64
+ {4E7CA151-4751-4FC3-B76E-4A915329A301}.Release|x64.Build.0 = Release|x64
+ {26747FB6-EC25-400B-995E-8F6F1AC49734}.Debug|Win32.ActiveCfg = Debug|Win32
+ {26747FB6-EC25-400B-995E-8F6F1AC49734}.Debug|Win32.Build.0 = Debug|Win32
+ {26747FB6-EC25-400B-995E-8F6F1AC49734}.Debug|x64.ActiveCfg = Debug|x64
+ {26747FB6-EC25-400B-995E-8F6F1AC49734}.Debug|x64.Build.0 = Debug|x64
+ {26747FB6-EC25-400B-995E-8F6F1AC49734}.Release|Win32.ActiveCfg = Release|Win32
+ {26747FB6-EC25-400B-995E-8F6F1AC49734}.Release|Win32.Build.0 = Release|Win32
+ {26747FB6-EC25-400B-995E-8F6F1AC49734}.Release|x64.ActiveCfg = Release|x64
+ {26747FB6-EC25-400B-995E-8F6F1AC49734}.Release|x64.Build.0 = Release|x64
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
diff --git a/Horloge/Horloge.vcproj b/Horloge/Horloge.vcproj
index 9c9c9cd..83d018b 100644
--- a/Horloge/Horloge.vcproj
+++ b/Horloge/Horloge.vcproj
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="Windows-1252"?>
<VisualStudioProject
ProjectType="Visual C++"
- Version="8,00"
+ Version="9,00"
Name="Horloge"
ProjectGUID="{79A52956-E5E0-46FF-9EB7-112ED0CD5315}"
RootNamespace="Horloge"
@@ -9,6 +9,7 @@
SccLocalPath="."
SccProvider="MSSCCI:Microsoft Visual SourceSafe"
Keyword="MFCProj"
+ TargetFrameworkVersion="131072"
>
<Platforms>
<Platform
@@ -54,7 +55,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories="..\Ivy;&quot;..\..\..\pcre-6.4&quot;"
+ AdditionalIncludeDirectories="..\Ivy;&quot;..\..\..\pcre-7.5&quot;"
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS"
BasicRuntimeChecks="3"
RuntimeLibrary="3"
@@ -82,6 +83,8 @@
SuppressStartupBanner="true"
GenerateDebugInformation="true"
SubSystem="2"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
Profile="true"
/>
<Tool
@@ -103,9 +106,6 @@
Name="VCAppVerifierTool"
/>
<Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
@@ -142,7 +142,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories="..\Ivy;&quot;..\..\..\pcre-6.4&quot;"
+ AdditionalIncludeDirectories="..\Ivy;&quot;..\..\..\pcre-7.5&quot;"
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS"
BasicRuntimeChecks="3"
RuntimeLibrary="3"
@@ -171,6 +171,8 @@
SuppressStartupBanner="true"
GenerateDebugInformation="true"
SubSystem="2"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
TargetMachine="17"
Profile="true"
/>
@@ -193,9 +195,6 @@
Name="VCAppVerifierTool"
/>
<Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
@@ -232,7 +231,7 @@
<Tool
Name="VCCLCompilerTool"
InlineFunctionExpansion="1"
- AdditionalIncludeDirectories="..\Ivy;&quot;..\..\..\pcre-6.4&quot;"
+ AdditionalIncludeDirectories="..\Ivy;&quot;..\..\..\pcre-7.5&quot;"
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS"
StringPooling="true"
RuntimeLibrary="2"
@@ -258,6 +257,8 @@
LinkIncremental="1"
SuppressStartupBanner="true"
SubSystem="2"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
/>
<Tool
Name="VCALinkTool"
@@ -278,9 +279,6 @@
Name="VCAppVerifierTool"
/>
<Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
Name="VCPostBuildEventTool"
CommandLine="rem copy &quot;$(TargetPath)&quot; &quot;C:\users\fcolin\Program Files\$(OutDir)&quot;"
/>
@@ -318,7 +316,7 @@
<Tool
Name="VCCLCompilerTool"
InlineFunctionExpansion="1"
- AdditionalIncludeDirectories="..\Ivy;&quot;..\..\..\pcre-6.4&quot;"
+ AdditionalIncludeDirectories="..\Ivy;&quot;..\..\..\pcre-7.5&quot;"
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS"
StringPooling="true"
RuntimeLibrary="2"
@@ -344,6 +342,8 @@
LinkIncremental="1"
SuppressStartupBanner="true"
SubSystem="2"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
TargetMachine="17"
/>
<Tool
@@ -365,9 +365,6 @@
Name="VCAppVerifierTool"
/>
<Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
Name="VCPostBuildEventTool"
CommandLine="rem copy &quot;$(TargetPath)&quot; &quot;C:\users\fcolin\Program Files\$(OutDir)&quot;"
/>
diff --git a/Horloge/HorlogeDlg.cpp b/Horloge/HorlogeDlg.cpp
index b6ac3d9..5ec075a 100644
--- a/Horloge/HorlogeDlg.cpp
+++ b/Horloge/HorlogeDlg.cpp
@@ -338,7 +338,7 @@ void CHorlogeDlg::OnForw5()
void CHorlogeDlg::OnFile()
{
- CFileDialog file(TRUE,TEXT(".rej"),NULL, OFN_FILEMUSTEXIST,TEXT("Rejeu Files (*.rej)|*.rej|All Files (*.*)|*.*||"));
+ CFileDialog file(TRUE,TEXT(".rej"),NULL, OFN_FILEMUSTEXIST,TEXT("Rejeu Files (*.rej;*.txt)|*.rej; *.txt|All Files (*.*)|*.*||"));
if ( file.DoModal() == IDOK )
{
bus->SendMsg( "FileRead Type=rejeu Name=%S", file.GetPathName() );
diff --git a/IvyProbe/IvyProbe.rc b/IvyProbe/IvyProbe.rc
index 6896394..8fc9923 100644
--- a/IvyProbe/IvyProbe.rc
+++ b/IvyProbe/IvyProbe.rc
@@ -13,7 +13,7 @@
#undef APSTUDIO_READONLY_SYMBOLS
/////////////////////////////////////////////////////////////////////////////
-// French (France) resources
+// Français (France) resources
#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_FRA)
#ifdef _WIN32
@@ -94,10 +94,10 @@ BEGIN
PUSHBUTTON "Start",IDC_START,130,15,25,14
LTEXT "Bind:",IDC_STATIC_BIND,4,135,17,8
LTEXT "Msg:",IDC_STATIC_MSG,4,117,17,12
- COMBOBOX IDC_MSG,27,117,100,82,CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP
+ COMBOBOX IDC_MSG,27,117,100,82,CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP
DEFPUSHBUTTON "Send",IDC_SEND,128,116,27,14
PUSHBUTTON "Bind",IDC_BIND,128,132,27,14
- COMBOBOX IDC_REGEXP,27,133,100,66,CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP
+ COMBOBOX IDC_REGEXP,27,133,100,66,CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP
EDITTEXT IDC_TEXT,4,31,151,82,ES_MULTILINE | ES_AUTOVSCROLL | ES_AUTOHSCROLL | ES_NOHIDESEL | ES_READONLY | WS_VSCROLL
END
@@ -215,7 +215,7 @@ BEGIN
CG_IDS_SOCKETS_INIT_FAILED "Windows sockets initialization failed."
END
-#endif // French (France) resources
+#endif // Français (France) resources
/////////////////////////////////////////////////////////////////////////////
diff --git a/IvyProbe/IvyProbe.vcproj b/IvyProbe/IvyProbe.vcproj
index cdf5dda..d69d4ba 100644
--- a/IvyProbe/IvyProbe.vcproj
+++ b/IvyProbe/IvyProbe.vcproj
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="Windows-1252"?>
<VisualStudioProject
ProjectType="Visual C++"
- Version="8,00"
+ Version="9,00"
Name="IvyProbe"
ProjectGUID="{B7F7F0F7-9029-4D1A-8CB4-C42DAF86A21C}"
RootNamespace="IvyProbe"
@@ -9,6 +9,7 @@
SccLocalPath="."
SccProvider="MSSCCI:Microsoft Visual SourceSafe"
Keyword="MFCProj"
+ TargetFrameworkVersion="131072"
>
<Platforms>
<Platform
@@ -53,7 +54,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories="..\Ivy;&quot;..\..\..\pcre-6.4&quot;"
+ AdditionalIncludeDirectories="..\Ivy;&quot;..\..\..\pcre-7.9&quot;"
PreprocessorDefinitions="USE_ETS"
RuntimeLibrary="3"
UsePrecompiledHeader="2"
@@ -81,6 +82,8 @@
AdditionalLibraryDirectories=""
GenerateDebugInformation="true"
SubSystem="2"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
/>
<Tool
Name="VCALinkTool"
@@ -101,9 +104,6 @@
Name="VCAppVerifierTool"
/>
<Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
@@ -139,7 +139,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories="..\Ivy;&quot;..\..\..\pcre-6.4&quot;"
+ AdditionalIncludeDirectories="..\Ivy;&quot;..\..\..\pcre-7.9&quot;"
PreprocessorDefinitions="USE_ETS"
BasicRuntimeChecks="3"
RuntimeLibrary="3"
@@ -168,6 +168,8 @@
AdditionalLibraryDirectories=""
GenerateDebugInformation="true"
SubSystem="2"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
TargetMachine="17"
/>
<Tool
@@ -189,9 +191,6 @@
Name="VCAppVerifierTool"
/>
<Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
@@ -227,7 +226,7 @@
<Tool
Name="VCCLCompilerTool"
InlineFunctionExpansion="1"
- AdditionalIncludeDirectories="..\Ivy;&quot;..\..\..\pcre-6.4&quot;"
+ AdditionalIncludeDirectories="..\Ivy;&quot;..\..\..\pcre-7.5&quot;"
PreprocessorDefinitions="USE_ETS"
StringPooling="true"
RuntimeLibrary="2"
@@ -254,6 +253,8 @@
SuppressStartupBanner="true"
AdditionalLibraryDirectories=""
SubSystem="2"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
/>
<Tool
Name="VCALinkTool"
@@ -274,9 +275,6 @@
Name="VCAppVerifierTool"
/>
<Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
@@ -312,7 +310,7 @@
<Tool
Name="VCCLCompilerTool"
InlineFunctionExpansion="1"
- AdditionalIncludeDirectories="..\Ivy;&quot;..\..\..\pcre-6.4&quot;"
+ AdditionalIncludeDirectories="..\Ivy;&quot;..\..\..\pcre-7.9&quot;"
PreprocessorDefinitions="USE_ETS"
StringPooling="true"
RuntimeLibrary="2"
@@ -339,6 +337,8 @@
SuppressStartupBanner="true"
AdditionalLibraryDirectories=""
SubSystem="2"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
TargetMachine="17"
/>
<Tool
@@ -360,16 +360,13 @@
Name="VCAppVerifierTool"
/>
<Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
</Configurations>
<References>
<ProjectReference
- ReferencedProjectIdentifier="{9BD87B7A-517E-4900-B3EA-A358885CD876}"
+ ReferencedProjectIdentifier="{9818D652-CC05-463E-880D-AFCA2C7BFABE}"
RelativePathToProject=".\Ivy\Ivy.vcproj"
/>
</References>
diff --git a/UpdateIvyWeb.bat b/UpdateIvyWeb.bat
index b7e1ca9..d32f433 100644
--- a/UpdateIvyWeb.bat
+++ b/UpdateIvyWeb.bat
@@ -1,5 +1,6 @@
@echo On
echo Web Update %*
-copy /b %1 "C:\Documents and Settings\fcolin\My Documents\IvyCVSWWW\WWW\download\packages"
-cd "C:\Documents and Settings\fcolin\My Documents\IvyCVSWWW\WWW\download\packages"
-"c:\Program Files (x86)\TortoiseCVS\cvs.exe" -d ":pserver:pii:/projet/ivy/cvsroot" ci -m "Automatic IDE rebuild " .
+@rem copy /b %1 "C:\Documents and Settings\fcolin\My Documents\IvyCVSWWW\WWW\download\packages"
+@rem cd "C:\Documents and Settings\fcolin\My Documents\IvyCVSWWW\WWW\download\packages"
+@rem "c:\Program Files (x86)\TortoiseCVS\cvs.exe" -d ":pserver:pii:/projet/ivy/cvsroot" ci -m "Automatic IDE rebuild " .
+copy /b %1 "\\samba\projet\WEB\www2\products\ivy\download\packages" \ No newline at end of file