From: vtn Date: Mon, 17 Jul 2017 17:51:15 +0000 (+0300) Subject: 0003997: External 20806 Windows 64 bits X-Git-Tag: CTH_2_2_0~3 X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=b2f7fd4652021d5233eb2c25576894c9138a30e5;p=modules%2Fgui.git 0003997: External 20806 Windows 64 bits Porting to Windows 64 bit. --- diff --git a/.gitignore b/.gitignore new file mode 100644 index 000000000..39453916c --- /dev/null +++ b/.gitignore @@ -0,0 +1,9 @@ +Release32 +Debug32 +Release64 +Debug64 +moc +qrc +*.user +*.ncb +*.suo diff --git a/adm_local/win32/All.vcproj b/adm_local/win32/All.vcproj index e9e2f8f08..554ed7e62 100644 --- a/adm_local/win32/All.vcproj +++ b/adm_local/win32/All.vcproj @@ -11,14 +11,17 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -218,8 +407,18 @@ + + + + + + @@ -242,47 +451,43 @@ - - - - - - - - - - + + + + + + + + + + - - - - - - + + + + + + - - - - - - diff --git a/adm_local/win32/CAM.vcproj b/adm_local/win32/CAM.vcproj index 15d405d8e..9417b0c49 100644 --- a/adm_local/win32/CAM.vcproj +++ b/adm_local/win32/CAM.vcproj @@ -10,14 +10,17 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -219,8 +410,18 @@ + + + + + + @@ -243,248 +454,243 @@ - - - - - - - - - - - - + + + + + + + + + + + + @@ -497,149 +703,105 @@ - - - - - - + + + + + + - - - - - - - - - - - - diff --git a/adm_local/win32/Event.vcproj b/adm_local/win32/Event.vcproj index 1fd610ec5..f7b5f215f 100644 --- a/adm_local/win32/Event.vcproj +++ b/adm_local/win32/Event.vcproj @@ -10,14 +10,17 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -218,8 +408,18 @@ + + + + + + @@ -242,8 +452,18 @@ + + + + + + diff --git a/adm_local/win32/GLViewer.vcproj b/adm_local/win32/GLViewer.vcproj index 51f8b86f3..2d6c20760 100644 --- a/adm_local/win32/GLViewer.vcproj +++ b/adm_local/win32/GLViewer.vcproj @@ -10,14 +10,17 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -216,47 +406,43 @@ - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - @@ -1553,47 +1880,43 @@ - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + diff --git a/adm_local/win32/GUI_SRC.sln b/adm_local/win32/GUI_SRC.sln index d14257794..ad259a41a 100644 --- a/adm_local/win32/GUI_SRC.sln +++ b/adm_local/win32/GUI_SRC.sln @@ -187,97 +187,187 @@ EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Win32 = Debug|Win32 + Debug|x64 = Debug|x64 Release|Win32 = Release|Win32 + Release|x64 = Release|x64 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution {0D811160-3A03-4C59-9610-498786BAFECE}.Debug|Win32.ActiveCfg = Debug|Win32 {0D811160-3A03-4C59-9610-498786BAFECE}.Debug|Win32.Build.0 = Debug|Win32 + {0D811160-3A03-4C59-9610-498786BAFECE}.Debug|x64.ActiveCfg = Debug|x64 + {0D811160-3A03-4C59-9610-498786BAFECE}.Debug|x64.Build.0 = Debug|x64 {0D811160-3A03-4C59-9610-498786BAFECE}.Release|Win32.ActiveCfg = Release|Win32 {0D811160-3A03-4C59-9610-498786BAFECE}.Release|Win32.Build.0 = Release|Win32 + {0D811160-3A03-4C59-9610-498786BAFECE}.Release|x64.ActiveCfg = Release|x64 + {0D811160-3A03-4C59-9610-498786BAFECE}.Release|x64.Build.0 = Release|x64 {EBCDC006-A873-4DA9-9CA6-B6BE320C0DFD}.Debug|Win32.ActiveCfg = Debug|Win32 {EBCDC006-A873-4DA9-9CA6-B6BE320C0DFD}.Debug|Win32.Build.0 = Debug|Win32 + {EBCDC006-A873-4DA9-9CA6-B6BE320C0DFD}.Debug|x64.ActiveCfg = Debug|x64 + {EBCDC006-A873-4DA9-9CA6-B6BE320C0DFD}.Debug|x64.Build.0 = Debug|x64 {EBCDC006-A873-4DA9-9CA6-B6BE320C0DFD}.Release|Win32.ActiveCfg = Release|Win32 {EBCDC006-A873-4DA9-9CA6-B6BE320C0DFD}.Release|Win32.Build.0 = Release|Win32 + {EBCDC006-A873-4DA9-9CA6-B6BE320C0DFD}.Release|x64.ActiveCfg = Release|x64 + {EBCDC006-A873-4DA9-9CA6-B6BE320C0DFD}.Release|x64.Build.0 = Release|x64 {37FA9C33-4512-4833-A4A7-CCF490ADD732}.Debug|Win32.ActiveCfg = Debug|Win32 {37FA9C33-4512-4833-A4A7-CCF490ADD732}.Debug|Win32.Build.0 = Debug|Win32 + {37FA9C33-4512-4833-A4A7-CCF490ADD732}.Debug|x64.ActiveCfg = Debug|x64 + {37FA9C33-4512-4833-A4A7-CCF490ADD732}.Debug|x64.Build.0 = Debug|x64 {37FA9C33-4512-4833-A4A7-CCF490ADD732}.Release|Win32.ActiveCfg = Release|Win32 {37FA9C33-4512-4833-A4A7-CCF490ADD732}.Release|Win32.Build.0 = Release|Win32 + {37FA9C33-4512-4833-A4A7-CCF490ADD732}.Release|x64.ActiveCfg = Release|x64 + {37FA9C33-4512-4833-A4A7-CCF490ADD732}.Release|x64.Build.0 = Release|x64 {9EA751D5-767C-45CC-AA52-283E69308EB7}.Debug|Win32.ActiveCfg = Debug|Win32 {9EA751D5-767C-45CC-AA52-283E69308EB7}.Debug|Win32.Build.0 = Debug|Win32 + {9EA751D5-767C-45CC-AA52-283E69308EB7}.Debug|x64.ActiveCfg = Debug|x64 + {9EA751D5-767C-45CC-AA52-283E69308EB7}.Debug|x64.Build.0 = Debug|x64 {9EA751D5-767C-45CC-AA52-283E69308EB7}.Release|Win32.ActiveCfg = Release|Win32 {9EA751D5-767C-45CC-AA52-283E69308EB7}.Release|Win32.Build.0 = Release|Win32 + {9EA751D5-767C-45CC-AA52-283E69308EB7}.Release|x64.ActiveCfg = Release|x64 + {9EA751D5-767C-45CC-AA52-283E69308EB7}.Release|x64.Build.0 = Release|x64 {4B9BF133-1E25-4C6E-9233-651833F22313}.Debug|Win32.ActiveCfg = Debug|Win32 {4B9BF133-1E25-4C6E-9233-651833F22313}.Debug|Win32.Build.0 = Debug|Win32 + {4B9BF133-1E25-4C6E-9233-651833F22313}.Debug|x64.ActiveCfg = Debug|x64 + {4B9BF133-1E25-4C6E-9233-651833F22313}.Debug|x64.Build.0 = Debug|x64 {4B9BF133-1E25-4C6E-9233-651833F22313}.Release|Win32.ActiveCfg = Release|Win32 {4B9BF133-1E25-4C6E-9233-651833F22313}.Release|Win32.Build.0 = Release|Win32 + {4B9BF133-1E25-4C6E-9233-651833F22313}.Release|x64.ActiveCfg = Release|x64 + {4B9BF133-1E25-4C6E-9233-651833F22313}.Release|x64.Build.0 = Release|x64 {7DB13706-F0ED-4EA8-BE14-E4D62D500C67}.Debug|Win32.ActiveCfg = Debug|Win32 {7DB13706-F0ED-4EA8-BE14-E4D62D500C67}.Debug|Win32.Build.0 = Debug|Win32 + {7DB13706-F0ED-4EA8-BE14-E4D62D500C67}.Debug|x64.ActiveCfg = Debug|x64 + {7DB13706-F0ED-4EA8-BE14-E4D62D500C67}.Debug|x64.Build.0 = Debug|x64 {7DB13706-F0ED-4EA8-BE14-E4D62D500C67}.Release|Win32.ActiveCfg = Release|Win32 {7DB13706-F0ED-4EA8-BE14-E4D62D500C67}.Release|Win32.Build.0 = Release|Win32 + {7DB13706-F0ED-4EA8-BE14-E4D62D500C67}.Release|x64.ActiveCfg = Release|x64 + {7DB13706-F0ED-4EA8-BE14-E4D62D500C67}.Release|x64.Build.0 = Release|x64 {447B72EF-4B7D-4200-A92E-BDE789576117}.Debug|Win32.ActiveCfg = Debug|Win32 {447B72EF-4B7D-4200-A92E-BDE789576117}.Debug|Win32.Build.0 = Debug|Win32 + {447B72EF-4B7D-4200-A92E-BDE789576117}.Debug|x64.ActiveCfg = Debug|x64 + {447B72EF-4B7D-4200-A92E-BDE789576117}.Debug|x64.Build.0 = Debug|x64 {447B72EF-4B7D-4200-A92E-BDE789576117}.Release|Win32.ActiveCfg = Release|Win32 {447B72EF-4B7D-4200-A92E-BDE789576117}.Release|Win32.Build.0 = Release|Win32 + {447B72EF-4B7D-4200-A92E-BDE789576117}.Release|x64.ActiveCfg = Release|x64 + {447B72EF-4B7D-4200-A92E-BDE789576117}.Release|x64.Build.0 = Release|x64 {D2CA8DB5-A2DE-4EF9-B967-0F639736469F}.Debug|Win32.ActiveCfg = Debug|Win32 {D2CA8DB5-A2DE-4EF9-B967-0F639736469F}.Debug|Win32.Build.0 = Debug|Win32 + {D2CA8DB5-A2DE-4EF9-B967-0F639736469F}.Debug|x64.ActiveCfg = Debug|x64 + {D2CA8DB5-A2DE-4EF9-B967-0F639736469F}.Debug|x64.Build.0 = Debug|x64 {D2CA8DB5-A2DE-4EF9-B967-0F639736469F}.Release|Win32.ActiveCfg = Release|Win32 {D2CA8DB5-A2DE-4EF9-B967-0F639736469F}.Release|Win32.Build.0 = Release|Win32 + {D2CA8DB5-A2DE-4EF9-B967-0F639736469F}.Release|x64.ActiveCfg = Release|x64 + {D2CA8DB5-A2DE-4EF9-B967-0F639736469F}.Release|x64.Build.0 = Release|x64 {D5E571BF-0C2E-4513-8BF0-A7A54E4EA973}.Debug|Win32.ActiveCfg = Debug|Win32 {D5E571BF-0C2E-4513-8BF0-A7A54E4EA973}.Debug|Win32.Build.0 = Debug|Win32 + {D5E571BF-0C2E-4513-8BF0-A7A54E4EA973}.Debug|x64.ActiveCfg = Debug|x64 + {D5E571BF-0C2E-4513-8BF0-A7A54E4EA973}.Debug|x64.Build.0 = Debug|x64 {D5E571BF-0C2E-4513-8BF0-A7A54E4EA973}.Release|Win32.ActiveCfg = Release|Win32 {D5E571BF-0C2E-4513-8BF0-A7A54E4EA973}.Release|Win32.Build.0 = Release|Win32 + {D5E571BF-0C2E-4513-8BF0-A7A54E4EA973}.Release|x64.ActiveCfg = Release|x64 + {D5E571BF-0C2E-4513-8BF0-A7A54E4EA973}.Release|x64.Build.0 = Release|x64 {F33BDEB3-AC58-4A0C-8E4C-3671A9C8F217}.Debug|Win32.ActiveCfg = Debug|Win32 {F33BDEB3-AC58-4A0C-8E4C-3671A9C8F217}.Debug|Win32.Build.0 = Debug|Win32 + {F33BDEB3-AC58-4A0C-8E4C-3671A9C8F217}.Debug|x64.ActiveCfg = Debug|x64 + {F33BDEB3-AC58-4A0C-8E4C-3671A9C8F217}.Debug|x64.Build.0 = Debug|x64 {F33BDEB3-AC58-4A0C-8E4C-3671A9C8F217}.Release|Win32.ActiveCfg = Release|Win32 {F33BDEB3-AC58-4A0C-8E4C-3671A9C8F217}.Release|Win32.Build.0 = Release|Win32 + {F33BDEB3-AC58-4A0C-8E4C-3671A9C8F217}.Release|x64.ActiveCfg = Release|x64 + {F33BDEB3-AC58-4A0C-8E4C-3671A9C8F217}.Release|x64.Build.0 = Release|x64 {961D1F90-2AF9-4D8B-B1D5-061EB3CA4474}.Debug|Win32.ActiveCfg = Debug|Win32 {961D1F90-2AF9-4D8B-B1D5-061EB3CA4474}.Debug|Win32.Build.0 = Debug|Win32 + {961D1F90-2AF9-4D8B-B1D5-061EB3CA4474}.Debug|x64.ActiveCfg = Debug|x64 + {961D1F90-2AF9-4D8B-B1D5-061EB3CA4474}.Debug|x64.Build.0 = Debug|x64 {961D1F90-2AF9-4D8B-B1D5-061EB3CA4474}.Release|Win32.ActiveCfg = Release|Win32 {961D1F90-2AF9-4D8B-B1D5-061EB3CA4474}.Release|Win32.Build.0 = Release|Win32 + {961D1F90-2AF9-4D8B-B1D5-061EB3CA4474}.Release|x64.ActiveCfg = Release|x64 + {961D1F90-2AF9-4D8B-B1D5-061EB3CA4474}.Release|x64.Build.0 = Release|x64 {36CA5C15-A7E6-4451-AE8E-8AD61754F970}.Debug|Win32.ActiveCfg = Debug|Win32 {36CA5C15-A7E6-4451-AE8E-8AD61754F970}.Debug|Win32.Build.0 = Debug|Win32 + {36CA5C15-A7E6-4451-AE8E-8AD61754F970}.Debug|x64.ActiveCfg = Debug|x64 + {36CA5C15-A7E6-4451-AE8E-8AD61754F970}.Debug|x64.Build.0 = Debug|x64 {36CA5C15-A7E6-4451-AE8E-8AD61754F970}.Release|Win32.ActiveCfg = Release|Win32 {36CA5C15-A7E6-4451-AE8E-8AD61754F970}.Release|Win32.Build.0 = Release|Win32 + {36CA5C15-A7E6-4451-AE8E-8AD61754F970}.Release|x64.ActiveCfg = Release|x64 + {36CA5C15-A7E6-4451-AE8E-8AD61754F970}.Release|x64.Build.0 = Release|x64 {29831E95-B38D-4460-A46F-A4A4E1EE3941}.Debug|Win32.ActiveCfg = Debug|Win32 {29831E95-B38D-4460-A46F-A4A4E1EE3941}.Debug|Win32.Build.0 = Debug|Win32 + {29831E95-B38D-4460-A46F-A4A4E1EE3941}.Debug|x64.ActiveCfg = Debug|x64 + {29831E95-B38D-4460-A46F-A4A4E1EE3941}.Debug|x64.Build.0 = Debug|x64 {29831E95-B38D-4460-A46F-A4A4E1EE3941}.Release|Win32.ActiveCfg = Release|Win32 {29831E95-B38D-4460-A46F-A4A4E1EE3941}.Release|Win32.Build.0 = Release|Win32 + {29831E95-B38D-4460-A46F-A4A4E1EE3941}.Release|x64.ActiveCfg = Release|x64 + {29831E95-B38D-4460-A46F-A4A4E1EE3941}.Release|x64.Build.0 = Release|x64 {8512A935-1BBB-4A7B-A552-F50824FDD87F}.Debug|Win32.ActiveCfg = Debug|Win32 {8512A935-1BBB-4A7B-A552-F50824FDD87F}.Debug|Win32.Build.0 = Debug|Win32 + {8512A935-1BBB-4A7B-A552-F50824FDD87F}.Debug|x64.ActiveCfg = Debug|x64 + {8512A935-1BBB-4A7B-A552-F50824FDD87F}.Debug|x64.Build.0 = Debug|x64 {8512A935-1BBB-4A7B-A552-F50824FDD87F}.Release|Win32.ActiveCfg = Release|Win32 {8512A935-1BBB-4A7B-A552-F50824FDD87F}.Release|Win32.Build.0 = Release|Win32 + {8512A935-1BBB-4A7B-A552-F50824FDD87F}.Release|x64.ActiveCfg = Release|x64 + {8512A935-1BBB-4A7B-A552-F50824FDD87F}.Release|x64.Build.0 = Release|x64 {6755FAA7-967A-4D23-966D-DE4F66234913}.Debug|Win32.ActiveCfg = Debug|Win32 {6755FAA7-967A-4D23-966D-DE4F66234913}.Debug|Win32.Build.0 = Debug|Win32 + {6755FAA7-967A-4D23-966D-DE4F66234913}.Debug|x64.ActiveCfg = Debug|x64 + {6755FAA7-967A-4D23-966D-DE4F66234913}.Debug|x64.Build.0 = Debug|x64 {6755FAA7-967A-4D23-966D-DE4F66234913}.Release|Win32.ActiveCfg = Release|Win32 {6755FAA7-967A-4D23-966D-DE4F66234913}.Release|Win32.Build.0 = Release|Win32 + {6755FAA7-967A-4D23-966D-DE4F66234913}.Release|x64.ActiveCfg = Release|x64 + {6755FAA7-967A-4D23-966D-DE4F66234913}.Release|x64.Build.0 = Release|x64 {C3A1EE8B-C548-4A37-B49A-D322128EE161}.Debug|Win32.ActiveCfg = Debug|Win32 {C3A1EE8B-C548-4A37-B49A-D322128EE161}.Debug|Win32.Build.0 = Debug|Win32 + {C3A1EE8B-C548-4A37-B49A-D322128EE161}.Debug|x64.ActiveCfg = Debug|x64 + {C3A1EE8B-C548-4A37-B49A-D322128EE161}.Debug|x64.Build.0 = Debug|x64 {C3A1EE8B-C548-4A37-B49A-D322128EE161}.Release|Win32.ActiveCfg = Release|Win32 {C3A1EE8B-C548-4A37-B49A-D322128EE161}.Release|Win32.Build.0 = Release|Win32 + {C3A1EE8B-C548-4A37-B49A-D322128EE161}.Release|x64.ActiveCfg = Release|x64 + {C3A1EE8B-C548-4A37-B49A-D322128EE161}.Release|x64.Build.0 = Release|x64 {AE9A31F5-1301-4E6D-91A3-E78DF4ABF0EA}.Debug|Win32.ActiveCfg = Debug|Win32 {AE9A31F5-1301-4E6D-91A3-E78DF4ABF0EA}.Debug|Win32.Build.0 = Debug|Win32 + {AE9A31F5-1301-4E6D-91A3-E78DF4ABF0EA}.Debug|x64.ActiveCfg = Debug|x64 + {AE9A31F5-1301-4E6D-91A3-E78DF4ABF0EA}.Debug|x64.Build.0 = Debug|x64 {AE9A31F5-1301-4E6D-91A3-E78DF4ABF0EA}.Release|Win32.ActiveCfg = Release|Win32 {AE9A31F5-1301-4E6D-91A3-E78DF4ABF0EA}.Release|Win32.Build.0 = Release|Win32 + {AE9A31F5-1301-4E6D-91A3-E78DF4ABF0EA}.Release|x64.ActiveCfg = Release|x64 + {AE9A31F5-1301-4E6D-91A3-E78DF4ABF0EA}.Release|x64.Build.0 = Release|x64 {06CA8800-62E7-4FA8-BA7B-3607F27491B8}.Debug|Win32.ActiveCfg = Debug|Win32 {06CA8800-62E7-4FA8-BA7B-3607F27491B8}.Debug|Win32.Build.0 = Debug|Win32 + {06CA8800-62E7-4FA8-BA7B-3607F27491B8}.Debug|x64.ActiveCfg = Debug|x64 + {06CA8800-62E7-4FA8-BA7B-3607F27491B8}.Debug|x64.Build.0 = Debug|x64 {06CA8800-62E7-4FA8-BA7B-3607F27491B8}.Release|Win32.ActiveCfg = Release|Win32 {06CA8800-62E7-4FA8-BA7B-3607F27491B8}.Release|Win32.Build.0 = Release|Win32 + {06CA8800-62E7-4FA8-BA7B-3607F27491B8}.Release|x64.ActiveCfg = Release|x64 + {06CA8800-62E7-4FA8-BA7B-3607F27491B8}.Release|x64.Build.0 = Release|x64 {C8FB7D64-0A82-4588-8D27-2B7CC6C2EA85}.Debug|Win32.ActiveCfg = Debug|Win32 {C8FB7D64-0A82-4588-8D27-2B7CC6C2EA85}.Debug|Win32.Build.0 = Debug|Win32 + {C8FB7D64-0A82-4588-8D27-2B7CC6C2EA85}.Debug|x64.ActiveCfg = Debug|x64 + {C8FB7D64-0A82-4588-8D27-2B7CC6C2EA85}.Debug|x64.Build.0 = Debug|x64 {C8FB7D64-0A82-4588-8D27-2B7CC6C2EA85}.Release|Win32.ActiveCfg = Release|Win32 {C8FB7D64-0A82-4588-8D27-2B7CC6C2EA85}.Release|Win32.Build.0 = Release|Win32 + {C8FB7D64-0A82-4588-8D27-2B7CC6C2EA85}.Release|x64.ActiveCfg = Release|x64 + {C8FB7D64-0A82-4588-8D27-2B7CC6C2EA85}.Release|x64.Build.0 = Release|x64 {DB53E05E-3E2E-460D-8B77-9B339FA3DE59}.Debug|Win32.ActiveCfg = Debug|Win32 {DB53E05E-3E2E-460D-8B77-9B339FA3DE59}.Debug|Win32.Build.0 = Debug|Win32 + {DB53E05E-3E2E-460D-8B77-9B339FA3DE59}.Debug|x64.ActiveCfg = Debug|x64 + {DB53E05E-3E2E-460D-8B77-9B339FA3DE59}.Debug|x64.Build.0 = Debug|x64 {DB53E05E-3E2E-460D-8B77-9B339FA3DE59}.Release|Win32.ActiveCfg = Release|Win32 {DB53E05E-3E2E-460D-8B77-9B339FA3DE59}.Release|Win32.Build.0 = Release|Win32 + {DB53E05E-3E2E-460D-8B77-9B339FA3DE59}.Release|x64.ActiveCfg = Release|x64 + {DB53E05E-3E2E-460D-8B77-9B339FA3DE59}.Release|x64.Build.0 = Release|x64 {1FE6A5B7-9504-4119-BC86-13115BEA326B}.Debug|Win32.ActiveCfg = Debug|Win32 {1FE6A5B7-9504-4119-BC86-13115BEA326B}.Debug|Win32.Build.0 = Debug|Win32 + {1FE6A5B7-9504-4119-BC86-13115BEA326B}.Debug|x64.ActiveCfg = Debug|x64 + {1FE6A5B7-9504-4119-BC86-13115BEA326B}.Debug|x64.Build.0 = Debug|x64 {1FE6A5B7-9504-4119-BC86-13115BEA326B}.Release|Win32.ActiveCfg = Release|Win32 {1FE6A5B7-9504-4119-BC86-13115BEA326B}.Release|Win32.Build.0 = Release|Win32 + {1FE6A5B7-9504-4119-BC86-13115BEA326B}.Release|x64.ActiveCfg = Release|x64 + {1FE6A5B7-9504-4119-BC86-13115BEA326B}.Release|x64.Build.0 = Release|x64 {5C26AD6B-39CE-4B83-BA68-1D5F8B378DB1}.Debug|Win32.ActiveCfg = Debug|Win32 {5C26AD6B-39CE-4B83-BA68-1D5F8B378DB1}.Debug|Win32.Build.0 = Debug|Win32 + {5C26AD6B-39CE-4B83-BA68-1D5F8B378DB1}.Debug|x64.ActiveCfg = Debug|x64 + {5C26AD6B-39CE-4B83-BA68-1D5F8B378DB1}.Debug|x64.Build.0 = Debug|x64 {5C26AD6B-39CE-4B83-BA68-1D5F8B378DB1}.Release|Win32.ActiveCfg = Release|Win32 {5C26AD6B-39CE-4B83-BA68-1D5F8B378DB1}.Release|Win32.Build.0 = Release|Win32 + {5C26AD6B-39CE-4B83-BA68-1D5F8B378DB1}.Release|x64.ActiveCfg = Release|x64 + {5C26AD6B-39CE-4B83-BA68-1D5F8B378DB1}.Release|x64.Build.0 = Release|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/adm_local/win32/GraphicsView.vcproj b/adm_local/win32/GraphicsView.vcproj index c418f1db9..9f0161a10 100644 --- a/adm_local/win32/GraphicsView.vcproj +++ b/adm_local/win32/GraphicsView.vcproj @@ -12,14 +12,17 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -242,8 +419,18 @@ + + + + + + @@ -266,8 +463,18 @@ + + + + + + @@ -290,8 +507,18 @@ + + + + + + @@ -314,8 +551,18 @@ + + + + + + @@ -338,8 +595,18 @@ + + + + + + @@ -362,8 +639,18 @@ + + + + + + @@ -386,8 +683,18 @@ + + + + + + @@ -410,8 +727,18 @@ + + + + + + @@ -434,8 +771,18 @@ + + + + + + @@ -458,8 +815,18 @@ + + + + + + @@ -488,8 +865,18 @@ + + + + + + @@ -512,8 +909,18 @@ + + + + + + @@ -536,8 +953,18 @@ + + + + + + @@ -560,8 +997,18 @@ + + + + + + @@ -584,8 +1041,18 @@ + + + + + + @@ -608,8 +1085,18 @@ + + + + + + @@ -632,8 +1129,18 @@ + + + + + + @@ -656,8 +1173,18 @@ + + + + + + @@ -680,8 +1217,18 @@ + + + + + + @@ -704,8 +1261,18 @@ + + + + + + @@ -728,8 +1305,18 @@ + + + + + + @@ -752,8 +1349,18 @@ + + + + + + diff --git a/adm_local/win32/LightApp.vcproj b/adm_local/win32/LightApp.vcproj index 31da0ad73..84d853f57 100644 --- a/adm_local/win32/LightApp.vcproj +++ b/adm_local/win32/LightApp.vcproj @@ -1,7 +1,7 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -219,47 +410,43 @@ - - - - - - - - - - - - - - - - - - - - - - + + - - - - - - - - - - - - - - - - - - + Name="VCCustomBuildTool" + Description="Generate moc_$(InputName).cxx..." + CommandLine="type $(InputPath) > $(GUI_SRC_DIR)\$(ConfigurationName)64\include\$(InputFileName) $(QTDIR)\bin\moc.exe $(InputPath) -o ..\..\moc\moc_$(InputName).cxx " + Outputs="$(GUI_SRC_DIR)\$(ConfigurationName)64\include\$(InputFileName);..\..\moc\moc_$(InputName).cxx" + /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1130,13 +2167,23 @@ BasicRuntimeChecks="3" /> + + + + + + @@ -1158,13 +2215,63 @@ BasicRuntimeChecks="3" /> + + + + + + + + + + + + + + + + + + @@ -1186,13 +2303,111 @@ BasicRuntimeChecks="3" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1214,9 +2439,19 @@ BasicRuntimeChecks="3" /> + + + + + + @@ -1238,22 +2483,52 @@ BasicRuntimeChecks="3" /> + + + + + + + + + - - - - - - - - - - - - + + + + + + @@ -1545,8 +2816,18 @@ + + + + + + @@ -1569,8 +2860,18 @@ + + + + + + @@ -1593,8 +2904,18 @@ + + + + + + @@ -1617,8 +2948,18 @@ + + + + + + @@ -1641,8 +2992,18 @@ + + + + + + @@ -1665,8 +3036,18 @@ + + + + + + @@ -1689,8 +3080,18 @@ + + + + + + @@ -1713,8 +3124,18 @@ + + + + + + @@ -1737,8 +3168,18 @@ + + + + + + @@ -1761,8 +3212,18 @@ + + + + + + diff --git a/adm_local/win32/LogWindow.vcproj b/adm_local/win32/LogWindow.vcproj index abcdab8ff..753d80455 100644 --- a/adm_local/win32/LogWindow.vcproj +++ b/adm_local/win32/LogWindow.vcproj @@ -10,14 +10,17 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -217,8 +406,18 @@ + + + + + + @@ -248,27 +457,6 @@ - - - - - - diff --git a/adm_local/win32/OBJECT.vcproj b/adm_local/win32/OBJECT.vcproj index 2a5cb637f..5f5de773d 100644 --- a/adm_local/win32/OBJECT.vcproj +++ b/adm_local/win32/OBJECT.vcproj @@ -10,14 +10,17 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -218,8 +408,18 @@ + + + + + + @@ -242,8 +452,18 @@ + + + + + + @@ -266,8 +496,18 @@ + + + + + + @@ -290,8 +540,18 @@ + + + + + + @@ -314,8 +584,18 @@ + + + + + + @@ -338,8 +628,18 @@ + + + + + + @@ -362,8 +672,18 @@ + + + + + + @@ -386,8 +716,18 @@ + + + + + + @@ -410,8 +760,18 @@ + + + + + + @@ -434,8 +804,18 @@ + + + + + + @@ -458,8 +848,18 @@ + + + + + + @@ -482,8 +892,18 @@ + + + + + + @@ -506,8 +936,18 @@ + + + + + + @@ -530,8 +980,18 @@ + + + + + + @@ -554,8 +1024,18 @@ + + + + + + @@ -578,8 +1068,18 @@ + + + + + + @@ -602,8 +1112,18 @@ + + + + + + @@ -626,8 +1156,18 @@ + + + + + + diff --git a/adm_local/win32/ObjBrowser.vcproj b/adm_local/win32/ObjBrowser.vcproj index 7653fb07f..a52c578fc 100644 --- a/adm_local/win32/ObjBrowser.vcproj +++ b/adm_local/win32/ObjBrowser.vcproj @@ -10,14 +10,17 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -217,8 +406,18 @@ + + + + + + @@ -241,8 +450,18 @@ + + + + + + @@ -278,8 +507,18 @@ + + + + + + @@ -302,52 +551,51 @@ - - - - + + + + diff --git a/adm_local/win32/Plot2d.vcproj b/adm_local/win32/Plot2d.vcproj index a577c44dd..3b3051d54 100644 --- a/adm_local/win32/Plot2d.vcproj +++ b/adm_local/win32/Plot2d.vcproj @@ -1,7 +1,7 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -218,95 +408,87 @@ - - - - - - + + + + + + - - - - + + + - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - @@ -876,8 +1566,18 @@ + + + + + + @@ -900,8 +1610,18 @@ + + + + + + @@ -924,47 +1654,43 @@ - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + diff --git a/adm_local/win32/Plot3d.vcproj b/adm_local/win32/Plot3d.vcproj index fcde70d74..1d4c141f4 100644 --- a/adm_local/win32/Plot3d.vcproj +++ b/adm_local/win32/Plot3d.vcproj @@ -1,7 +1,7 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -218,8 +408,18 @@ + + + + + + @@ -242,8 +452,18 @@ + + + + + + @@ -266,8 +496,18 @@ + + + + + + @@ -290,8 +540,18 @@ + + + + + + @@ -314,8 +584,18 @@ + + + + + + @@ -338,8 +628,18 @@ + + + + + + @@ -367,8 +677,18 @@ + + + + + + @@ -391,8 +721,18 @@ + + + + + + @@ -419,8 +769,18 @@ + + + + + + @@ -443,8 +813,18 @@ + + + + + + @@ -467,8 +857,18 @@ + + + + + + @@ -491,8 +901,18 @@ + + + + + + @@ -515,8 +945,18 @@ + + + + + + @@ -539,8 +989,18 @@ + + + + + + @@ -563,8 +1033,18 @@ + + + + + + @@ -587,8 +1077,18 @@ + + + + + + diff --git a/adm_local/win32/Prs.vcproj b/adm_local/win32/Prs.vcproj index 599384771..74246eec4 100644 --- a/adm_local/win32/Prs.vcproj +++ b/adm_local/win32/Prs.vcproj @@ -10,14 +10,17 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -213,8 +398,18 @@ + + + + + + diff --git a/adm_local/win32/Qtx.vcproj b/adm_local/win32/Qtx.vcproj index 4168ae50b..63a83a841 100644 --- a/adm_local/win32/Qtx.vcproj +++ b/adm_local/win32/Qtx.vcproj @@ -10,14 +10,17 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -216,24 +405,1012 @@ > + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1297,8 +2386,18 @@ + + + + + + diff --git a/adm_local/win32/SPlot2d.vcproj b/adm_local/win32/SPlot2d.vcproj index 795daa610..cd4717bc5 100644 --- a/adm_local/win32/SPlot2d.vcproj +++ b/adm_local/win32/SPlot2d.vcproj @@ -10,14 +10,17 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -218,8 +408,18 @@ + + + + + + @@ -242,8 +452,18 @@ + + + + + + @@ -266,8 +496,18 @@ + + + + + + @@ -290,8 +540,18 @@ + + + + + + @@ -314,8 +584,18 @@ + + + + + + diff --git a/adm_local/win32/STD.vcproj b/adm_local/win32/STD.vcproj index ed96638e9..a02d14271 100644 --- a/adm_local/win32/STD.vcproj +++ b/adm_local/win32/STD.vcproj @@ -10,14 +10,17 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -212,150 +401,514 @@ RelativePath="..\..\src\Std\STD.h" > + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -651,8 +1180,18 @@ + + + + + + @@ -675,8 +1224,18 @@ + + + + + + @@ -699,8 +1268,18 @@ + + + + + + @@ -723,199 +1312,195 @@ - - - - - - - - - - + + + + + + + + + + diff --git a/adm_local/win32/SUIT.vcproj b/adm_local/win32/SUIT.vcproj index ba4276037..a87efbeaa 100644 --- a/adm_local/win32/SUIT.vcproj +++ b/adm_local/win32/SUIT.vcproj @@ -10,14 +10,17 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -217,47 +406,43 @@ - - - - - - - - - - - - - - - - + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - + Name="VCCustomBuildTool" + Description="Update $(InputFileName)..." + CommandLine="type $(InputPath) > $(GUI_SRC_DIR)\$(ConfigurationName)64\include\$(InputFileName) " + Outputs="$(GUI_SRC_DIR)\$(ConfigurationName)64\include\$(InputFileName)" + /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - + + + @@ -1268,9 +2143,19 @@ BasicRuntimeChecks="3" /> + + + + + + @@ -1291,9 +2185,19 @@ BasicRuntimeChecks="3" /> + + + + + + @@ -1314,13 +2227,23 @@ BasicRuntimeChecks="3" /> + + + - - - - - - + + + @@ -1479,13 +2399,23 @@ BasicRuntimeChecks="3" /> + + + + + + @@ -1506,9 +2445,19 @@ BasicRuntimeChecks="3" /> + + + + + + @@ -1529,9 +2487,19 @@ BasicRuntimeChecks="3" /> + + + + + + @@ -1552,87 +2529,78 @@ BasicRuntimeChecks="3" /> + + + - - - - - - - - - + + + - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/adm_local/win32/SUITApp.vcproj b/adm_local/win32/SUITApp.vcproj index a28daec57..cb98c2a72 100644 --- a/adm_local/win32/SUITApp.vcproj +++ b/adm_local/win32/SUITApp.vcproj @@ -10,14 +10,17 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -218,8 +408,18 @@ + + + + + + @@ -260,8 +470,18 @@ + + + + + + @@ -284,8 +514,18 @@ + + + + + + @@ -317,6 +567,17 @@ BasicRuntimeChecks="3" /> + + + @@ -327,6 +588,16 @@ PreprocessorDefinitions="" /> + + + diff --git a/adm_local/win32/SUITAppCmd.vcproj b/adm_local/win32/SUITAppCmd.vcproj index 500f1e373..a4aeb8601 100644 --- a/adm_local/win32/SUITAppCmd.vcproj +++ b/adm_local/win32/SUITAppCmd.vcproj @@ -10,14 +10,17 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -218,8 +408,18 @@ + + + + + + @@ -260,8 +470,18 @@ + + + + + + @@ -284,8 +514,18 @@ + + + + + + @@ -317,6 +567,17 @@ BasicRuntimeChecks="3" /> + + + @@ -327,6 +588,16 @@ PreprocessorDefinitions="" /> + + + diff --git a/adm_local/win32/SVTK.vcproj b/adm_local/win32/SVTK.vcproj index 0302bfbf5..784a2aef8 100644 --- a/adm_local/win32/SVTK.vcproj +++ b/adm_local/win32/SVTK.vcproj @@ -1,7 +1,7 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -218,95 +408,87 @@ - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/adm_local/win32/Style.vcproj b/adm_local/win32/Style.vcproj index b19b0f6d6..90fec678a 100644 --- a/adm_local/win32/Style.vcproj +++ b/adm_local/win32/Style.vcproj @@ -10,14 +10,17 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -218,8 +408,18 @@ + + + + + + @@ -242,8 +452,18 @@ + + + + + + @@ -266,8 +496,18 @@ + + + + + + @@ -290,8 +540,18 @@ + + + + + + @@ -347,6 +617,16 @@ Outputs="..\..\qrc\qrc_$(InputName).cxx" /> + + + @@ -357,6 +637,16 @@ Outputs="..\..\qrc\qrc_$(InputName).cxx" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -223,47 +414,43 @@ - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -607,8 +1118,18 @@ + + + + + + @@ -631,8 +1162,18 @@ + + + + + + @@ -655,8 +1206,18 @@ + + + + + + @@ -679,8 +1250,18 @@ + + + + + + @@ -703,8 +1294,18 @@ + + + + + + @@ -727,8 +1338,18 @@ + + + + + + @@ -751,8 +1382,18 @@ + + + + + + @@ -775,8 +1426,18 @@ + + + + + + @@ -897,7 +1568,51 @@ Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" > + + + + + + + + + + + + + + - - @@ -953,8 +1664,18 @@ + + + + + + @@ -977,8 +1708,18 @@ + + + + + + @@ -1001,8 +1752,18 @@ + + + + + + @@ -1025,8 +1796,18 @@ + + + + + + @@ -1049,8 +1840,18 @@ + + + + + + @@ -1073,8 +1884,18 @@ + + + + + + @@ -1097,8 +1928,18 @@ + + + + + + @@ -1121,8 +1972,18 @@ + + + + + + @@ -1145,8 +2016,18 @@ + + + + + + @@ -1169,8 +2060,18 @@ + + + + + + @@ -1193,47 +2104,43 @@ - - - - - - - - - - - - + + + + + + + + + + + +