diff options
| author | fcolin | 2009-09-22 09:00:57 +0000 |
|---|---|---|
| committer | fcolin | 2009-09-22 09:00:57 +0000 |
| commit | 0d1b9c6063805958e075b1121227d985a065c6d6 (patch) | |
| tree | 58ca3dd5b0d87f6155b1ef797fe5a0667b3f160b | |
| parent | 99092eb2616a5e88144f64f56dd01c53c50e9563 (diff) | |
| download | ivy-cplusplus-0d1b9c6063805958e075b1121227d985a065c6d6.zip ivy-cplusplus-0d1b9c6063805958e075b1121227d985a065c6d6.tar.gz ivy-cplusplus-0d1b9c6063805958e075b1121227d985a065c6d6.tar.bz2 ivy-cplusplus-0d1b9c6063805958e075b1121227d985a065c6d6.tar.xz | |
mise a jour des projets
| -rw-r--r-- | Horloge/Horloge.vcproj | 4 | ||||
| -rw-r--r-- | Ivy/InstIvyDev/InstIvyDev.vdproj | 58 | ||||
| -rw-r--r-- | Ivy/Ivy.vcproj | 1 | ||||
| -rw-r--r-- | Ivy/IvyLib/IvyLib.vdproj | 6 | ||||
| -rw-r--r-- | IvyCursor/InstIvyCursor/InstIvyCursor.vdproj | 134 | ||||
| -rw-r--r-- | IvyCursor/IvyCursor.cpp | 167 | ||||
| -rw-r--r-- | IvyCursor/IvyCursor.sln | 33 | ||||
| -rw-r--r-- | IvyCursor/IvyCursor.vcproj | 196 | ||||
| -rw-r--r-- | IvyProbe/IvyProbe.vcproj | 2 | ||||
| -rw-r--r-- | UpdateIvyWeb.bat | 2 |
10 files changed, 509 insertions, 94 deletions
diff --git a/Horloge/Horloge.vcproj b/Horloge/Horloge.vcproj index 83d018b..70fed68 100644 --- a/Horloge/Horloge.vcproj +++ b/Horloge/Horloge.vcproj @@ -231,7 +231,7 @@ <Tool
Name="VCCLCompilerTool"
InlineFunctionExpansion="1"
- AdditionalIncludeDirectories="..\Ivy;"..\..\..\pcre-7.5""
+ AdditionalIncludeDirectories="..\Ivy;"..\..\..\pcre-7.9""
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS"
StringPooling="true"
RuntimeLibrary="2"
@@ -316,7 +316,7 @@ <Tool
Name="VCCLCompilerTool"
InlineFunctionExpansion="1"
- AdditionalIncludeDirectories="..\Ivy;"..\..\..\pcre-7.5""
+ AdditionalIncludeDirectories="..\Ivy;"..\..\..\pcre-7.9""
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS"
StringPooling="true"
RuntimeLibrary="2"
diff --git a/Ivy/InstIvyDev/InstIvyDev.vdproj b/Ivy/InstIvyDev/InstIvyDev.vdproj index 930587c..7d9a8e5 100644 --- a/Ivy/InstIvyDev/InstIvyDev.vdproj +++ b/Ivy/InstIvyDev/InstIvyDev.vdproj @@ -15,14 +15,14 @@ {
"Entry"
{
- "MsmKey" = "8:_32C90C9C8FC242AE9C65DA1C92DA2700"
- "OwnerKey" = "8:_UNDEFINED"
+ "MsmKey" = "8:_1AF7586332934A1D8068AF6C422CC2DD"
+ "OwnerKey" = "8:_E8DA4E6514774E88A3E16EC00C9A093D"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_34B995BB34324AD4A1FFA79365EDDA41"
- "OwnerKey" = "8:_C943180E14D2401283428900C39E38A6"
+ "MsmKey" = "8:_32C90C9C8FC242AE9C65DA1C92DA2700"
+ "OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
@@ -33,14 +33,14 @@ }
"Entry"
{
- "MsmKey" = "8:_46277ABBD7FF4829BC70CD9150B7547C"
- "OwnerKey" = "8:_C0D675730DD44E9DBDA0BAC5EEC423A5"
+ "MsmKey" = "8:_587183B52DD64752997FFA522BC57D0A"
+ "OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_587183B52DD64752997FFA522BC57D0A"
- "OwnerKey" = "8:_UNDEFINED"
+ "MsmKey" = "8:_6ACC064FA1FC418FAB2B122A5F09BAB0"
+ "OwnerKey" = "8:_A83C290CFE914EFBBD8EBED57EFBE505"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
@@ -51,34 +51,34 @@ }
"Entry"
{
+ "MsmKey" = "8:_A83C290CFE914EFBBD8EBED57EFBE505"
+ "OwnerKey" = "8:_587183B52DD64752997FFA522BC57D0A"
+ "MsmSig" = "8:_UNDEFINED"
+ }
+ "Entry"
+ {
"MsmKey" = "8:_B656C8E7B4C5444BB7CAA2BB82B22DEB"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_C0D675730DD44E9DBDA0BAC5EEC423A5"
+ "MsmKey" = "8:_E8DA4E6514774E88A3E16EC00C9A093D"
"OwnerKey" = "8:_32C90C9C8FC242AE9C65DA1C92DA2700"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_C0D675730DD44E9DBDA0BAC5EEC423A5"
+ "MsmKey" = "8:_E8DA4E6514774E88A3E16EC00C9A093D"
"OwnerKey" = "8:_587183B52DD64752997FFA522BC57D0A"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_C0D675730DD44E9DBDA0BAC5EEC423A5"
+ "MsmKey" = "8:_E8DA4E6514774E88A3E16EC00C9A093D"
"OwnerKey" = "8:_3B5C053C16CE42B2810E6471B5EBFDBD"
"MsmSig" = "8:_UNDEFINED"
}
- "Entry"
- {
- "MsmKey" = "8:_C943180E14D2401283428900C39E38A6"
- "OwnerKey" = "8:_587183B52DD64752997FFA522BC57D0A"
- "MsmSig" = "8:_UNDEFINED"
- }
}
"Configurations"
{
@@ -285,15 +285,15 @@ {
"Name" = "8:Microsoft Visual Studio"
"ProductName" = "8:InstIvyDev"
- "ProductCode" = "8:{D651E6A4-ED73-447B-A2D9-4081D13E27DC}"
- "PackageCode" = "8:{81856041-B01B-4760-982C-9B1B8626ED92}"
+ "ProductCode" = "8:{3534F30C-6A33-4023-9256-1A889832F9A5}"
+ "PackageCode" = "8:{7205FDA9-231D-4053-9135-0FCA66792070}"
"UpgradeCode" = "8:{B61AA283-78E2-443D-A093-4D5D6C0B779A}"
"RestartWWWService" = "11:FALSE"
"RemovePreviousVersions" = "11:TRUE"
"DetectNewerInstalledVersion" = "11:TRUE"
"InstallAllUsers" = "11:TRUE"
- "ProductVersion" = "8:1.0.1"
- "Manufacturer" = "8:SDER PII"
+ "ProductVersion" = "8:1.3.1"
+ "Manufacturer" = "8:DTI/R&D"
"ARPHELPTELEPHONE" = "8:"
"ARPHELPLINK" = "8:http://www.tls.cena.fr/products/ivy"
"Title" = "8:InstIvyDev"
@@ -801,11 +801,11 @@ }
"MergeModule"
{
- "{CEE29DC0-9FBA-4B99-8D47-5BC643D9B626}:_34B995BB34324AD4A1FFA79365EDDA41"
+ "{CEE29DC0-9FBA-4B99-8D47-5BC643D9B626}:_1AF7586332934A1D8068AF6C422CC2DD"
{
"UseDynamicProperties" = "11:TRUE"
"IsDependency" = "11:TRUE"
- "SourcePath" = "8:microsoft_vc90_mfc_x86.msm"
+ "SourcePath" = "8:microsoft_vc90_crt_x86_x64.msm"
"Properties"
{
}
@@ -815,11 +815,11 @@ "Feature" = "8:"
"IsolateTo" = "8:"
}
- "{CEE29DC0-9FBA-4B99-8D47-5BC643D9B626}:_46277ABBD7FF4829BC70CD9150B7547C"
+ "{CEE29DC0-9FBA-4B99-8D47-5BC643D9B626}:_6ACC064FA1FC418FAB2B122A5F09BAB0"
{
"UseDynamicProperties" = "11:TRUE"
"IsDependency" = "11:TRUE"
- "SourcePath" = "8:microsoft_vc90_crt_x86.msm"
+ "SourcePath" = "8:microsoft_vc90_mfc_x86_x64.msm"
"Properties"
{
}
@@ -829,11 +829,11 @@ "Feature" = "8:"
"IsolateTo" = "8:"
}
- "{CEE29DC0-9FBA-4B99-8D47-5BC643D9B626}:_C0D675730DD44E9DBDA0BAC5EEC423A5"
+ "{CEE29DC0-9FBA-4B99-8D47-5BC643D9B626}:_A83C290CFE914EFBBD8EBED57EFBE505"
{
"UseDynamicProperties" = "11:TRUE"
"IsDependency" = "11:TRUE"
- "SourcePath" = "8:policy_9_0_Microsoft_VC90_CRT_x86.msm"
+ "SourcePath" = "8:policy_9_0_Microsoft_VC90_MFC_x86_x64.msm"
"Properties"
{
}
@@ -843,11 +843,11 @@ "Feature" = "8:"
"IsolateTo" = "8:"
}
- "{CEE29DC0-9FBA-4B99-8D47-5BC643D9B626}:_C943180E14D2401283428900C39E38A6"
+ "{CEE29DC0-9FBA-4B99-8D47-5BC643D9B626}:_E8DA4E6514774E88A3E16EC00C9A093D"
{
"UseDynamicProperties" = "11:TRUE"
"IsDependency" = "11:TRUE"
- "SourcePath" = "8:policy_9_0_Microsoft_VC90_MFC_x86.msm"
+ "SourcePath" = "8:policy_9_0_Microsoft_VC90_CRT_x86_x64.msm"
"Properties"
{
}
diff --git a/Ivy/Ivy.vcproj b/Ivy/Ivy.vcproj index 9c765fb..a0c9f94 100644 --- a/Ivy/Ivy.vcproj +++ b/Ivy/Ivy.vcproj @@ -8,6 +8,7 @@ SccProjectName=""$/Bus/Ivy", QPEAAAAA"
SccLocalPath="."
SccProvider="MSSCCI:Microsoft Visual SourceSafe"
+ AssemblyReferenceSearchPaths=""..\..\..\pcre";"C:\Users\fcolin\Documents\Projects Visual Studio\pcre""
TargetFrameworkVersion="131072"
>
<Platforms>
diff --git a/Ivy/IvyLib/IvyLib.vdproj b/Ivy/IvyLib/IvyLib.vdproj index 7729f40..7058349 100644 --- a/Ivy/IvyLib/IvyLib.vdproj +++ b/Ivy/IvyLib/IvyLib.vdproj @@ -152,7 +152,7 @@ "Module"
{
"ModuleSignature" = "8:MergeModule.B704211C29924E868D1D16832CA83D91"
- "Version" = "8:1.0.0.0"
+ "Version" = "8:1.3.1.0"
"Title" = "8:IvyLib"
"Subject" = "8:"
"Author" = "8:DTI/R&D"
@@ -169,7 +169,7 @@ {
"{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_800E481F824E4563B3647395936B79A9"
{
- "SourcePath" = "8:..\\..\\release\\Ivy.dll"
+ "SourcePath" = "8:..\\..\\x64\\release\\Ivy.dll"
"TargetName" = "8:"
"Tag" = "8:"
"Folder" = "8:_E128D81775304F09A5707F244264031A"
@@ -197,7 +197,7 @@ }
"{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_EF9BC5D6F4274E54867D4FB7F7A33653"
{
- "SourcePath" = "8:..\\..\\release\\pcre.dll"
+ "SourcePath" = "8:..\\..\\x64\\release\\pcre.dll"
"TargetName" = "8:"
"Tag" = "8:"
"Folder" = "8:_E128D81775304F09A5707F244264031A"
diff --git a/IvyCursor/InstIvyCursor/InstIvyCursor.vdproj b/IvyCursor/InstIvyCursor/InstIvyCursor.vdproj index 1046fce..d631359 100644 --- a/IvyCursor/InstIvyCursor/InstIvyCursor.vdproj +++ b/IvyCursor/InstIvyCursor/InstIvyCursor.vdproj @@ -15,7 +15,25 @@ {
"Entry"
{
- "MsmKey" = "8:_4E16B1233013473896B5B14884B766C6"
+ "MsmKey" = "8:_06E53427C4BC415290A766A51B2907B5"
+ "OwnerKey" = "8:_3B23F7E390FC40EA8E3083AFEBCFC095"
+ "MsmSig" = "8:_UNDEFINED"
+ }
+ "Entry"
+ {
+ "MsmKey" = "8:_06E53427C4BC415290A766A51B2907B5"
+ "OwnerKey" = "8:_522624C883B2416AAD0D345280C2CB97"
+ "MsmSig" = "8:_UNDEFINED"
+ }
+ "Entry"
+ {
+ "MsmKey" = "8:_3B23F7E390FC40EA8E3083AFEBCFC095"
+ "OwnerKey" = "8:_UNDEFINED"
+ "MsmSig" = "8:_UNDEFINED"
+ }
+ "Entry"
+ {
+ "MsmKey" = "8:_522624C883B2416AAD0D345280C2CB97"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
}
@@ -25,6 +43,12 @@ "OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
}
+ "Entry"
+ {
+ "MsmKey" = "8:_C0801FE614764695905B7F25FB8EF372"
+ "OwnerKey" = "8:_06E53427C4BC415290A766A51B2907B5"
+ "MsmSig" = "8:_UNDEFINED"
+ }
}
"Configurations"
{
@@ -60,7 +84,7 @@ "DisplayName" = "8:Release"
"IsDebugOnly" = "11:FALSE"
"IsReleaseOnly" = "11:TRUE"
- "OutputFilename" = "8:..\\..\\..\\..\\Install\\IvyCursor.msi"
+ "OutputFilename" = "8:Release\\IvyCursor.msi"
"PackageFilesAs" = "3:2"
"PackageFileSize" = "3:-2147483648"
"CabType" = "3:1"
@@ -110,7 +134,7 @@ {
"{3C67513D-01DD-4637-8A68-80971EB9504F}:_4032CB2519934BECBD77C58A883B04AC"
{
- "DefaultLocation" = "8:[ProgramFilesFolder][Manufacturer]\\[ProductName]"
+ "DefaultLocation" = "8:[ProgramFiles64Folder][Manufacturer]\\[ProductName]"
"Name" = "8:#1925"
"AlwaysCreate" = "11:FALSE"
"Condition" = "8:"
@@ -152,25 +176,26 @@ "MsiBootstrapper"
{
"LangId" = "3:1036"
+ "RequiresElevation" = "11:FALSE"
}
"Product"
{
"Name" = "8:Microsoft Visual Studio"
"ProductName" = "8:IvyCursor"
- "ProductCode" = "8:{0A313183-7BCE-4AD0-B5BB-FD4A32104B32}"
- "PackageCode" = "8:{60E055D3-3D7E-4515-9203-37EB79A12EF3}"
+ "ProductCode" = "8:{6C5CA5FC-4F8A-4DB9-AD00-0871F9AD932D}"
+ "PackageCode" = "8:{4851B959-19BA-4D9F-9B7C-B94874DF18BC}"
"UpgradeCode" = "8:{B9048C4D-4B78-4498-8634-FA5726303A10}"
"RestartWWWService" = "11:FALSE"
- "RemovePreviousVersions" = "11:FALSE"
+ "RemovePreviousVersions" = "11:TRUE"
"DetectNewerInstalledVersion" = "11:TRUE"
"InstallAllUsers" = "11:FALSE"
- "ProductVersion" = "8:1.0.0"
- "Manufacturer" = "8:CENA PII"
+ "ProductVersion" = "8:2.2.0"
+ "Manufacturer" = "8:DTI R&D"
"ARPHELPTELEPHONE" = "8:"
"ARPHELPLINK" = "8:"
"Title" = "8:IvyCursor"
"Subject" = "8:"
- "ARPCONTACT" = "8:CENA PII"
+ "ARPCONTACT" = "8:DTI R&D"
"Keywords" = "8:"
"ARPCOMMENTS" = "8:"
"ARPURLINFOABOUT" = "8:"
@@ -178,9 +203,9 @@ "ARPIconIndex" = "3:0"
"SearchPath" = "8:"
"UseSystemSearchPath" = "11:TRUE"
- "TargetPlatform" = "3:0"
+ "TargetPlatform" = "3:1"
"PreBuildEvent" = "8:"
- "PostBuildEvent" = "8:"
+ "PostBuildEvent" = "8:copy \"$(BuiltOuputPath)\" \"C:\\Users\\Public\\Install PII\""
"RunPostBuildEvent" = "3:0"
}
"Registry"
@@ -318,7 +343,7 @@ "{688940B3-5CA9-4162-8DEE-2993FA9D8CBC}:_9DF06B29188C410D86056403380FE6D0"
{
"Sequence" = "3:100"
- "DisplayName" = "8:Progress"
+ "DisplayName" = "8:Progression"
"UseDynamicProperties" = "11:TRUE"
"IsDependency" = "11:FALSE"
"SourcePath" = "8:<VsdDialogDir>\\VsdAdminProgressDlg.wid"
@@ -362,7 +387,7 @@ "{688940B3-5CA9-4162-8DEE-2993FA9D8CBC}:_4BBF6ECCF3FF4CCE9DF57D69257EACFE"
{
"Sequence" = "3:100"
- "DisplayName" = "8:Finished"
+ "DisplayName" = "8:Terminé"
"UseDynamicProperties" = "11:TRUE"
"IsDependency" = "11:FALSE"
"SourcePath" = "8:<VsdDialogDir>\\VsdAdminFinishedDlg.wid"
@@ -393,7 +418,7 @@ "{688940B3-5CA9-4162-8DEE-2993FA9D8CBC}:_BA40ECBCA4F74472B6B4A2B850EF0B58"
{
"Sequence" = "3:200"
- "DisplayName" = "8:Installation Folder"
+ "DisplayName" = "8:Dossier d'installation"
"UseDynamicProperties" = "11:TRUE"
"IsDependency" = "11:FALSE"
"SourcePath" = "8:<VsdDialogDir>\\VsdFolderDlg.wid"
@@ -428,7 +453,7 @@ "{688940B3-5CA9-4162-8DEE-2993FA9D8CBC}:_CA4454662068449AB70A51A0D6B62F45"
{
"Sequence" = "3:300"
- "DisplayName" = "8:Confirm Installation"
+ "DisplayName" = "8:Confirmer l'installation"
"UseDynamicProperties" = "11:TRUE"
"IsDependency" = "11:FALSE"
"SourcePath" = "8:<VsdDialogDir>\\VsdConfirmDlg.wid"
@@ -450,7 +475,7 @@ "{688940B3-5CA9-4162-8DEE-2993FA9D8CBC}:_D88802A5F2B14E358204211F16EB4FAE"
{
"Sequence" = "3:100"
- "DisplayName" = "8:Welcome"
+ "DisplayName" = "8:Bienvenue"
"UseDynamicProperties" = "11:TRUE"
"IsDependency" = "11:FALSE"
"SourcePath" = "8:<VsdDialogDir>\\VsdWelcomeDlg.wid"
@@ -507,7 +532,7 @@ "{688940B3-5CA9-4162-8DEE-2993FA9D8CBC}:_0B3BD974222A492098588B27DB307CDA"
{
"Sequence" = "3:100"
- "DisplayName" = "8:Finished"
+ "DisplayName" = "8:Terminé"
"UseDynamicProperties" = "11:TRUE"
"IsDependency" = "11:FALSE"
"SourcePath" = "8:<VsdDialogDir>\\VsdFinishedDlg.wid"
@@ -563,7 +588,7 @@ "{688940B3-5CA9-4162-8DEE-2993FA9D8CBC}:_F15ADAF16F724C85916FA31593F72F8D"
{
"Sequence" = "3:100"
- "DisplayName" = "8:Progress"
+ "DisplayName" = "8:Progression"
"UseDynamicProperties" = "11:TRUE"
"IsDependency" = "11:FALSE"
"SourcePath" = "8:<VsdDialogDir>\\VsdProgressDlg.wid"
@@ -607,7 +632,7 @@ "{688940B3-5CA9-4162-8DEE-2993FA9D8CBC}:_30F0F9F2A1834E0BA3D83DBD6F9BFAE9"
{
"Sequence" = "3:200"
- "DisplayName" = "8:Installation Folder"
+ "DisplayName" = "8:Dossier d'installation"
"UseDynamicProperties" = "11:TRUE"
"IsDependency" = "11:FALSE"
"SourcePath" = "8:<VsdDialogDir>\\VsdAdminFolderDlg.wid"
@@ -629,7 +654,7 @@ "{688940B3-5CA9-4162-8DEE-2993FA9D8CBC}:_53970AAC5A024A3681F861F4BE2D650B"
{
"Sequence" = "3:100"
- "DisplayName" = "8:Welcome"
+ "DisplayName" = "8:Bienvenue"
"UseDynamicProperties" = "11:TRUE"
"IsDependency" = "11:FALSE"
"SourcePath" = "8:<VsdDialogDir>\\VsdAdminWelcomeDlg.wid"
@@ -677,7 +702,7 @@ "{688940B3-5CA9-4162-8DEE-2993FA9D8CBC}:_A92D8986A08B4691BE0869927B5BCF43"
{
"Sequence" = "3:300"
- "DisplayName" = "8:Confirm Installation"
+ "DisplayName" = "8:Confirmer l'installation"
"UseDynamicProperties" = "11:TRUE"
"IsDependency" = "11:FALSE"
"SourcePath" = "8:<VsdDialogDir>\\VsdAdminConfirmDlg.wid"
@@ -701,12 +726,40 @@ }
"MergeModule"
{
+ "{CEE29DC0-9FBA-4B99-8D47-5BC643D9B626}:_06E53427C4BC415290A766A51B2907B5"
+ {
+ "UseDynamicProperties" = "11:TRUE"
+ "IsDependency" = "11:TRUE"
+ "SourcePath" = "8:policy_9_0_Microsoft_VC90_DebugCRT_x86_x64.msm"
+ "Properties"
+ {
+ }
+ "LanguageId" = "3:0"
+ "Exclude" = "11:FALSE"
+ "Folder" = "8:"
+ "Feature" = "8:"
+ "IsolateTo" = "8:"
+ }
+ "{CEE29DC0-9FBA-4B99-8D47-5BC643D9B626}:_C0801FE614764695905B7F25FB8EF372"
+ {
+ "UseDynamicProperties" = "11:TRUE"
+ "IsDependency" = "11:TRUE"
+ "SourcePath" = "8:microsoft_vc90_debugcrt_x86_x64.msm"
+ "Properties"
+ {
+ }
+ "LanguageId" = "3:0"
+ "Exclude" = "11:FALSE"
+ "Folder" = "8:"
+ "Feature" = "8:"
+ "IsolateTo" = "8:"
+ }
}
"ProjectOutput"
{
- "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_4E16B1233013473896B5B14884B766C6"
+ "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_3B23F7E390FC40EA8E3083AFEBCFC095"
{
- "SourcePath" = "8:..\\Release\\Ivy.dll"
+ "SourcePath" = "8:..\\x64\\Debug\\pcre.dll"
"TargetName" = "8:"
"Tag" = "8:"
"Folder" = "8:_4032CB2519934BECBD77C58A883B04AC"
@@ -726,7 +779,35 @@ "ProjectOutputGroupRegister" = "3:1"
"OutputConfiguration" = "8:"
"OutputGroupCanonicalName" = "8:Built"
- "OutputProjectGuid" = "8:{84E0039A-6721-4B18-9792-E9AE4274AC0E}"
+ "OutputProjectGuid" = "8:{D79FC143-498E-4342-B2C7-BDAD1B8D0E6B}"
+ "ShowKeyOutput" = "11:TRUE"
+ "ExcludeFilters"
+ {
+ }
+ }
+ "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_522624C883B2416AAD0D345280C2CB97"
+ {
+ "SourcePath" = "8:..\\x64\\Debug\\Ivy.dll"
+ "TargetName" = "8:"
+ "Tag" = "8:"
+ "Folder" = "8:_4032CB2519934BECBD77C58A883B04AC"
+ "Condition" = "8:"
+ "Transitive" = "11:FALSE"
+ "Vital" = "11:TRUE"
+ "ReadOnly" = "11:FALSE"
+ "Hidden" = "11:FALSE"
+ "System" = "11:FALSE"
+ "Permanent" = "11:FALSE"
+ "SharedLegacy" = "11:FALSE"
+ "PackageAs" = "3:1"
+ "Register" = "3:1"
+ "Exclude" = "11:FALSE"
+ "IsDependency" = "11:FALSE"
+ "IsolateTo" = "8:"
+ "ProjectOutputGroupRegister" = "3:1"
+ "OutputConfiguration" = "8:"
+ "OutputGroupCanonicalName" = "8:Built"
+ "OutputProjectGuid" = "8:{9818D652-CC05-463E-880D-AFCA2C7BFABE}"
"ShowKeyOutput" = "11:TRUE"
"ExcludeFilters"
{
@@ -734,7 +815,7 @@ }
"{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_5A688E16C8FB4F969BAAF36ACF9DE131"
{
- "SourcePath" = "8:..\\Release\\IvyCursor.exe"
+ "SourcePath" = "8:..\\x64\\Debug\\IvyCursor.exe"
"TargetName" = "8:"
"Tag" = "8:"
"Folder" = "8:_4032CB2519934BECBD77C58A883B04AC"
@@ -761,8 +842,5 @@ }
}
}
- "VJSharpPlugin"
- {
- }
}
}
diff --git a/IvyCursor/IvyCursor.cpp b/IvyCursor/IvyCursor.cpp index 558d074..cb91542 100644 --- a/IvyCursor/IvyCursor.cpp +++ b/IvyCursor/IvyCursor.cpp @@ -6,6 +6,9 @@ #include <winuser.h>
#include <crtdbg.h>
#include <shellapi.h>
+#include <ostream>
+
+#include "options.h"
#include "IvyCursor.h"
#define MAX_LOADSTRING 100
@@ -75,12 +78,168 @@ void ivyCursorClick(IvyApplication *app, void *user_data, int argc, const char * _RPT3(_CRT_WARN,"ivyCursorClick can click to x=%d y=%d error=%d\n",x,y,GetLastError());
}
}
+void SendInput ( DWORD flags, float x, float y , int wheel )
+{
+ UINT nb;
+ INPUT Inputs;
+
+ Inputs.type = INPUT_MOUSE;
+ Inputs.mi.dwFlags = flags;
+ Inputs.mi.mouseData = wheel;
+ Inputs.mi.time = 0; // system provide it
+ Inputs.mi.dx = (int)(65535 * x );
+ Inputs.mi.dy = (int)(65535 * y );
+
+ nb = SendInput( 1, &Inputs, sizeof(INPUT));
+
+ if ( nb != 1 )
+ {
+ _RPT3(_CRT_WARN,"ivyPointerEvent can move to x=%d y=%d error=%d\n",x,y,GetLastError());
+ }
+}
+void ivyPointerEvent(IvyApplication *app, void *user_data, int argc, const char **argv)
+{
+ int x = atoi(*argv++);
+ int y = atoi(*argv++);
+ int presure = atoi(*argv++);
+ int tilt_x = atoi(*argv++);
+ int tilt_y = atoi(*argv++);
+ int wheel = atoi(*argv++);
+ int predicted_x = atoi(*argv++);
+ int predicted_y = atoi(*argv++);
+ const char *type = *argv++;
+ int serial_number = atoi(*argv++);
+ float time = atof(*argv++);
+ float hires_x = atof(*argv++);
+ float hires_y = atof(*argv++);
+ const char *proximity = *argv++; // (In|Out|unchanged)
+
+ // hack for tablet PC
+ if ( serial_number ==0 )
+ {
+ hires_x *= 86800 / 1400;
+ hires_y *= 65000 / 1050;
+ }
+
+ SendInput ( MOUSEEVENTF_WHEEL | MOUSEEVENTF_MOVE | MOUSEEVENTF_ABSOLUTE, hires_x, hires_y , wheel );
+
+
+
+}
+void ivyButtonEvent(IvyApplication *app, void *user_data, int argc, const char **argv)
+{
+ static int bt_down = 0;
+ int button = atoi(*argv++);
+ const char *status = *argv++ ; //(up|down)
+ int x = atoi(*argv++);
+ int y = atoi(*argv++);
+ int presure = atoi(*argv++);
+ int tilt_x = atoi(*argv++);
+ int tilt_y = atoi(*argv++);
+ int wheel = atoi(*argv++);
+ int predicted_x = atoi(*argv++);
+ int predicted_y = atoi(*argv++);
+ const char *type = *argv++;
+ int serial_number = atoi(*argv++);
+ float time = atof(*argv++);
+ float hires_x = atof(*argv++);
+ float hires_y = atof(*argv++);
+ const char *proximity = *argv++; // (In|Out|unchanged)
+
+ // hack for tablet PC
+ if ( serial_number ==0 )
+ {
+ hires_x *= 86800 / 1400;
+ hires_y *= 65000 / 1050;
+ }
+ if ( hires_x < 0 || hires_y < 0 )
+ {
+ if ( *status == 'u' && bt_down )
+ {
+ SendInput ( MOUSEEVENTF_LEFTUP, hires_x, hires_y , wheel );
+ bt_down = 0;
+ }
+
+ }
+ else
+ {
+ if ( (*status) == 'd' )
+ {
+ SendInput ( MOUSEEVENTF_WHEEL | MOUSEEVENTF_MOVE | MOUSEEVENTF_ABSOLUTE | MOUSEEVENTF_LEFTDOWN , hires_x, hires_y , wheel );
+ bt_down = 1;
+ }
+ else
+ {
+ SendInput ( MOUSEEVENTF_WHEEL | MOUSEEVENTF_MOVE | MOUSEEVENTF_ABSOLUTE | MOUSEEVENTF_LEFTUP , hires_x, hires_y , wheel );
+ bt_down = 0;
+ }
+ }
+
+}
+void ivyPadEvent(IvyApplication *app, void *user_data, int argc, const char **argv)
+{
+ int button = atoi(*argv++);
+ const char *status = *argv++ ; //(up|down)
+ int time = atoi(*argv++);
+
+}
+void ivySliderEvent(IvyApplication *app, void *user_data, int argc, const char **argv)
+{
+ int value = atoi(*argv++);
+ const char* side = *argv++ ; // (left|right)
+ int time = atoi(*argv++);
+}
+
int APIENTRY _tWinMain(HINSTANCE hInstance,
HINSTANCE hPrevInstance,
LPTSTR lpCmdLine,
int nCmdShow)
{
MSG msg;
+ int optchar;
+ const char * optarg;
+ const char * ivybus = NULL;
+ const char * acc = "bordeaux";
+ const char * wp = "WP1";
+ const char * role = "TC";
+
+ int errors = 0, ngroups = 0;
+ // read command line
+
+ static const char * optv[] = {
+ "H|help",
+ "a:acc <string>",
+ "w:wp <string>",
+ "r:role <string>",
+ "b:bus <string>",
+ NULL
+ } ;
+ Options opts("ivycursor", optv);
+ OptStrTokIter iter(lpCmdLine);
+
+ while( optchar = opts(iter, optarg) ) {
+ switch (optchar) {
+ case 'H' :
+ opts.usage(std::cout, "ivycursor ...");
+ exit(0);
+ break;
+ case 'a' :
+ acc = optarg; break;
+ case 'w' :
+ wp = optarg; break;
+ case 'r' :
+ role = optarg; break;
+ case 'b' :
+ ivybus = optarg; break;
+ default : ++errors; break;
+ } //switch
+ }
+
+ if (errors) {
+ opts.usage(std::cerr, "ivycursor ...");
+ exit(1);
+ }
+
// Initialise les chaînes globales
LoadString(hInstance, IDS_APP_TITLE, szTitle, MAX_LOADSTRING);
LoadString(hInstance, IDC_IVYCURSOR, szWindowClass, MAX_LOADSTRING);
@@ -106,7 +265,13 @@ int APIENTRY _tWinMain(HINSTANCE hInstance, bus = new Ivy("IvyCursor", "IvyCursor Ready", 0, FALSE );
bus->BindMsg(BUS_CALLBACK(ivyCursorMouve,0),"^Cigale SetCursorPosition x=([0-9.]+) y=([0-9.]+)");
bus->BindMsg(BUS_CALLBACK(ivyCursorClick,0),"^Cigale CursorSelectEvent x=([0-9.]+) y=([0-9.]+)");
- bus->start( 0 );
+
+ bus->BindMsg(BUS_CALLBACK(ivyPointerEvent,0), "^pointer_event device_id=%s:%s:%s x=([-0-9]+) y=([-0-9]+) presure=([-0-9]+) tilt_x=([-0-9]+) tilt_y=([-0-9]+) wheel=([-0-9]+) predicted_x=([-0-9]+) predicted_y=([-0-9]+) type=(.*) serial_number=([-0-9]+) time=([-.0-9]+) hires_x=([-.0-9]+) hires_y=([-.0-9]+) proximity=(In|Out|unchanged)", acc, wp, role );
+ bus->BindMsg(BUS_CALLBACK(ivyButtonEvent,0), "^button_event device_id=%s:%s:%s button=([-.0-9]+) status=(up|down) x=([-0-9]+) y=([-0-9]+) presure=([-0-9]+) tilt_x=([-0-9]+) tilt_y=([-0-9]+) wheel=([-0-9]+) predicted_x=([-0-9]+) predicted_y=([-0-9]+) type=(.*) serial_number=([-0-9]+) time=([-0-9]+) hires_x=([-.0-9]+) hires_y=([-.0-9]+) proximity=(In|Out|unchanged)", acc, wp, role );
+ bus->BindMsg(BUS_CALLBACK(ivyPadEvent,0), "^pad_event device_id=%s:%s:%s button=([0-9]+) status=(up|down) time=([-0-9]+)", acc, wp, role);
+ bus->BindMsg(BUS_CALLBACK(ivySliderEvent,0), "^slider_event device_id=%s:%s:%s value=([-0-9]+) side=(left|right) time=([-0-9]+)", acc, wp, role);
+
+ bus->start( ivybus );
// Boucle de messages principale :
while (GetMessage(&msg, NULL, 0, 0))
diff --git a/IvyCursor/IvyCursor.sln b/IvyCursor/IvyCursor.sln index 8f2829e..b2d1730 100644 --- a/IvyCursor/IvyCursor.sln +++ b/IvyCursor/IvyCursor.sln @@ -1,11 +1,11 @@ -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("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "IvyCursor", "IvyCursor.vcproj", "{5353F53D-8047-42AB-A3E1-73E6EAAFBBE6}"
ProjectSection(ProjectDependencies) = postProject
- {84E0039A-6721-4B18-9792-E9AE4274AC0E} = {84E0039A-6721-4B18-9792-E9AE4274AC0E}
+ {9818D652-CC05-463E-880D-AFCA2C7BFABE} = {9818D652-CC05-463E-880D-AFCA2C7BFABE}
EndProjectSection
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Ivy", "..\Ivy\Ivy.vcproj", "{84E0039A-6721-4B18-9792-E9AE4274AC0E}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Ivy", "..\Ivy\Ivy.vcproj", "{9818D652-CC05-463E-880D-AFCA2C7BFABE}"
EndProject
Project("{54435603-DBB4-11D2-8724-00A0C9A8B90C}") = "Install", "InstIvyCursor\InstIvyCursor.vdproj", "{465D12EC-FE99-47FE-AF2A-17BB43672F22}"
EndProject
@@ -36,23 +36,22 @@ Global GlobalSection(ProjectConfigurationPlatforms) = postSolution
{5353F53D-8047-42AB-A3E1-73E6EAAFBBE6}.Debug|Win32.ActiveCfg = Debug|Win32
{5353F53D-8047-42AB-A3E1-73E6EAAFBBE6}.Debug|Win32.Build.0 = Debug|Win32
- {5353F53D-8047-42AB-A3E1-73E6EAAFBBE6}.Debug|x64.ActiveCfg = Debug|Win32
- {5353F53D-8047-42AB-A3E1-73E6EAAFBBE6}.Debug|x64.Build.0 = Debug|Win32
+ {5353F53D-8047-42AB-A3E1-73E6EAAFBBE6}.Debug|x64.ActiveCfg = Debug|x64
+ {5353F53D-8047-42AB-A3E1-73E6EAAFBBE6}.Debug|x64.Build.0 = Debug|x64
{5353F53D-8047-42AB-A3E1-73E6EAAFBBE6}.Release|Win32.ActiveCfg = Release|Win32
{5353F53D-8047-42AB-A3E1-73E6EAAFBBE6}.Release|Win32.Build.0 = Release|Win32
- {5353F53D-8047-42AB-A3E1-73E6EAAFBBE6}.Release|x64.ActiveCfg = Release|Win32
- {5353F53D-8047-42AB-A3E1-73E6EAAFBBE6}.Release|x64.Build.0 = Release|Win32
- {84E0039A-6721-4B18-9792-E9AE4274AC0E}.Debug|Win32.ActiveCfg = Debug|Win32
- {84E0039A-6721-4B18-9792-E9AE4274AC0E}.Debug|Win32.Build.0 = Debug|Win32
- {84E0039A-6721-4B18-9792-E9AE4274AC0E}.Debug|x64.ActiveCfg = Debug|x64
- {84E0039A-6721-4B18-9792-E9AE4274AC0E}.Debug|x64.Build.0 = Debug|x64
- {84E0039A-6721-4B18-9792-E9AE4274AC0E}.Release|Win32.ActiveCfg = Release|Win32
- {84E0039A-6721-4B18-9792-E9AE4274AC0E}.Release|Win32.Build.0 = Release|Win32
- {84E0039A-6721-4B18-9792-E9AE4274AC0E}.Release|x64.ActiveCfg = Release|x64
- {84E0039A-6721-4B18-9792-E9AE4274AC0E}.Release|x64.Build.0 = Release|x64
+ {5353F53D-8047-42AB-A3E1-73E6EAAFBBE6}.Release|x64.ActiveCfg = Release|x64
+ {5353F53D-8047-42AB-A3E1-73E6EAAFBBE6}.Release|x64.Build.0 = Release|x64
+ {9818D652-CC05-463E-880D-AFCA2C7BFABE}.Debug|Win32.ActiveCfg = Debug|Win32
+ {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|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
{465D12EC-FE99-47FE-AF2A-17BB43672F22}.Debug|Win32.ActiveCfg = Debug
{465D12EC-FE99-47FE-AF2A-17BB43672F22}.Debug|x64.ActiveCfg = Debug
- {465D12EC-FE99-47FE-AF2A-17BB43672F22}.Debug|x64.Build.0 = Debug
{465D12EC-FE99-47FE-AF2A-17BB43672F22}.Release|Win32.ActiveCfg = Release
{465D12EC-FE99-47FE-AF2A-17BB43672F22}.Release|Win32.Build.0 = Release
{465D12EC-FE99-47FE-AF2A-17BB43672F22}.Release|x64.ActiveCfg = Release
diff --git a/IvyCursor/IvyCursor.vcproj b/IvyCursor/IvyCursor.vcproj index be89ff9..1377519 100644 --- a/IvyCursor/IvyCursor.vcproj +++ b/IvyCursor/IvyCursor.vcproj @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="Windows-1252"?>
<VisualStudioProject
ProjectType="Visual C++"
- Version="8,00"
+ Version="9,00"
Name="IvyCursor"
ProjectGUID="{5353F53D-8047-42AB-A3E1-73E6EAAFBBE6}"
RootNamespace="IvyCursor"
@@ -10,19 +10,23 @@ SccLocalPath="SAK"
SccProvider="SAK"
Keyword="Win32Proj"
+ TargetFrameworkVersion="131072"
>
<Platforms>
<Platform
Name="Win32"
/>
+ <Platform
+ Name="x64"
+ />
</Platforms>
<ToolFiles>
</ToolFiles>
<Configurations>
<Configuration
Name="Debug|Win32"
- OutputDirectory="Debug"
- IntermediateDirectory="Debug"
+ OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)"
ConfigurationType="1"
InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
CharacterSet="2"
@@ -52,7 +56,6 @@ RuntimeLibrary="1"
UsePrecompiledHeader="2"
WarningLevel="3"
- Detect64BitPortabilityProblems="true"
DebugInformationFormat="4"
/>
<Tool
@@ -66,12 +69,10 @@ />
<Tool
Name="VCLinkerTool"
- OutputFile="$(OutDir)/IvyCursor.exe"
LinkIncremental="2"
GenerateDebugInformation="true"
- ProgramDatabaseFile="$(OutDir)/IvyCursor.pdb"
SubSystem="2"
- TargetMachine="1"
+ DataExecutionPrevention="0"
/>
<Tool
Name="VCALinkTool"
@@ -92,9 +93,6 @@ Name="VCAppVerifierTool"
/>
<Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
@@ -148,6 +146,8 @@ SubSystem="2"
OptimizeReferences="2"
EnableCOMDATFolding="2"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
TargetMachine="1"
/>
<Tool
@@ -169,7 +169,156 @@ Name="VCAppVerifierTool"
/>
<Tool
- Name="VCWebDeploymentTool"
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Debug|x64"
+ OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
+ IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+ ConfigurationType="1"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TargetEnvironment="3"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories="..\ivy"
+ PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_WIN32_IE=0x500;_WIN32_WINNT=0x0500"
+ MinimalRebuild="true"
+ BasicRuntimeChecks="3"
+ RuntimeLibrary="1"
+ UsePrecompiledHeader="2"
+ WarningLevel="3"
+ DebugInformationFormat="3"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ LinkIncremental="2"
+ GenerateDebugInformation="true"
+ SubSystem="2"
+ DataExecutionPrevention="0"
+ TargetMachine="17"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Release|x64"
+ OutputDirectory="$(PlatformName)\$(ConfigurationName)"
+ IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+ ConfigurationType="1"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TargetEnvironment="3"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories="..\Ivy"
+ PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_WIN32_IE=0x500;_WIN32_WINNT=0x0500"
+ RuntimeLibrary="0"
+ UsePrecompiledHeader="2"
+ WarningLevel="3"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ OutputFile="$(OutDir)/IvyCursor.exe"
+ LinkIncremental="1"
+ GenerateDebugInformation="true"
+ SubSystem="2"
+ OptimizeReferences="2"
+ EnableCOMDATFolding="2"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ TargetMachine="17"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
/>
<Tool
Name="VCPostBuildEventTool"
@@ -179,7 +328,6 @@ <References>
<ProjectReference
ReferencedProjectIdentifier="{84E0039A-6721-4B18-9792-E9AE4274AC0E}"
- RelativePathToProject="..\Ivy\Ivy.vcproj"
/>
</References>
<Files>
@@ -193,6 +341,10 @@ >
</File>
<File
+ RelativePath=".\options.cxx"
+ >
+ </File>
+ <File
RelativePath=".\stdafx.cpp"
>
<FileConfiguration
@@ -211,6 +363,22 @@ UsePrecompiledHeader="1"
/>
</FileConfiguration>
+ <FileConfiguration
+ Name="Debug|x64"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ UsePrecompiledHeader="1"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release|x64"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ UsePrecompiledHeader="1"
+ />
+ </FileConfiguration>
</File>
</Filter>
<Filter
@@ -223,6 +391,10 @@ >
</File>
<File
+ RelativePath=".\options.h"
+ >
+ </File>
+ <File
RelativePath=".\Resource.h"
>
</File>
diff --git a/IvyProbe/IvyProbe.vcproj b/IvyProbe/IvyProbe.vcproj index d69d4ba..2698f40 100644 --- a/IvyProbe/IvyProbe.vcproj +++ b/IvyProbe/IvyProbe.vcproj @@ -226,7 +226,7 @@ <Tool
Name="VCCLCompilerTool"
InlineFunctionExpansion="1"
- AdditionalIncludeDirectories="..\Ivy;"..\..\..\pcre-7.5""
+ AdditionalIncludeDirectories="..\Ivy;"..\..\..\pcre-7.9""
PreprocessorDefinitions="USE_ETS"
StringPooling="true"
RuntimeLibrary="2"
diff --git a/UpdateIvyWeb.bat b/UpdateIvyWeb.bat index d32f433..662d6c4 100644 --- a/UpdateIvyWeb.bat +++ b/UpdateIvyWeb.bat @@ -3,4 +3,4 @@ echo Web Update %* @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 +copy /b %1 "\\samba\projet\www-sites\www2\products\ivy\download\packages"
\ No newline at end of file |