diff --git a/ms/projects/snap64_install/snap64_install.vdproj b/ms/projects/snap64_install/snap64_install.vdproj index 4d393461..ab0ded8a 100644 --- a/ms/projects/snap64_install/snap64_install.vdproj +++ b/ms/projects/snap64_install/snap64_install.vdproj @@ -561,6 +561,12 @@ } "Entry" { + "MsmKey" = "8:_3F1E9FD84639136661ED393BFED90DF1" + "OwnerKey" = "8:_AA39279D2D5C47D9960AF0B4734A442A" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { "MsmKey" = "8:_3FE1924D72FF4147939194AB8B4A4D58" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" @@ -945,6 +951,12 @@ } "Entry" { + "MsmKey" = "8:_66B01A565B2D48CC18C99DCAB1E2ACC4" + "OwnerKey" = "8:_AA39279D2D5C47D9960AF0B4734A442A" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { "MsmKey" = "8:_66C9FB1AE3E54CE59BBD6D9118D46313" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" @@ -1167,6 +1179,12 @@ } "Entry" { + "MsmKey" = "8:_81D7A693163D0E43C201B424CE755C9B" + "OwnerKey" = "8:_AA39279D2D5C47D9960AF0B4734A442A" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { "MsmKey" = "8:_82D545FDDA834581A67AF0FF2C81D69E" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" @@ -1461,6 +1479,12 @@ } "Entry" { + "MsmKey" = "8:_A2BC34928EF2EC93937E8D9F551D96F1" + "OwnerKey" = "8:_AA39279D2D5C47D9960AF0B4734A442A" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { "MsmKey" = "8:_A2D3AA6E0A6D49508C0B4158552A4596" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" @@ -2199,6 +2223,18 @@ } "Entry" { + "MsmKey" = "8:_FAE8D5D26656B03702615E1C167293D2" + "OwnerKey" = "8:_AA39279D2D5C47D9960AF0B4734A442A" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_FC05F2EBDB0B4B34CB616ECEDC5B492B" + "OwnerKey" = "8:_AA39279D2D5C47D9960AF0B4734A442A" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { "MsmKey" = "8:_FCF9F83168694194BACF7DDAC11DD6DE" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" @@ -4071,6 +4107,26 @@ "IsDependency" = "11:FALSE" "IsolateTo" = "8:" } + "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_3F1E9FD84639136661ED393BFED90DF1" + { + "SourcePath" = "8:RPCRT4.dll" + "TargetName" = "8:RPCRT4.dll" + "Tag" = "8:" + "Folder" = "8:_FC29688196B146DCB8EA9958CD3775F2" + "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:TRUE" + "IsDependency" = "11:TRUE" + "IsolateTo" = "8:" + } "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_3FE1924D72FF4147939194AB8B4A4D58" { "SourcePath" = "8:..\\..\\..\\src\\help\\help\\files\\data\\obs_data_types.html" @@ -5331,6 +5387,26 @@ "IsDependency" = "11:FALSE" "IsolateTo" = "8:" } + "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_66B01A565B2D48CC18C99DCAB1E2ACC4" + { + "SourcePath" = "8:MSIMG32.dll" + "TargetName" = "8:MSIMG32.dll" + "Tag" = "8:" + "Folder" = "8:_FC29688196B146DCB8EA9958CD3775F2" + "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:TRUE" + "IsDependency" = "11:TRUE" + "IsolateTo" = "8:" + } "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_66C9FB1AE3E54CE59BBD6D9118D46313" { "SourcePath" = "8:..\\..\\..\\src\\snap\\config\\format\\stn.dtf" @@ -6051,6 +6127,26 @@ "IsDependency" = "11:FALSE" "IsolateTo" = "8:" } + "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_81D7A693163D0E43C201B424CE755C9B" + { + "SourcePath" = "8:UxTheme.dll" + "TargetName" = "8:UxTheme.dll" + "Tag" = "8:" + "Folder" = "8:_FC29688196B146DCB8EA9958CD3775F2" + "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:4" + "Exclude" = "11:TRUE" + "IsDependency" = "11:TRUE" + "IsolateTo" = "8:" + } "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_82D545FDDA834581A67AF0FF2C81D69E" { "SourcePath" = "8:..\\..\\..\\src\\help\\help\\files\\cmdcfg\\cmd_additional_parameter_commands.html" @@ -6991,6 +7087,26 @@ "IsDependency" = "11:FALSE" "IsolateTo" = "8:" } + "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_A2BC34928EF2EC93937E8D9F551D96F1" + { + "SourcePath" = "8:COMDLG32.dll" + "TargetName" = "8:COMDLG32.dll" + "Tag" = "8:" + "Folder" = "8:_FC29688196B146DCB8EA9958CD3775F2" + "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:TRUE" + "IsDependency" = "11:TRUE" + "IsolateTo" = "8:" + } "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_A2D3AA6E0A6D49508C0B4158552A4596" { "SourcePath" = "8:..\\..\\..\\src\\help\\help\\files\\data\\obs_gps_data.html" @@ -9351,6 +9467,46 @@ "IsDependency" = "11:FALSE" "IsolateTo" = "8:" } + "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_FAE8D5D26656B03702615E1C167293D2" + { + "SourcePath" = "8:OLEACC.dll" + "TargetName" = "8:OLEACC.dll" + "Tag" = "8:" + "Folder" = "8:_FC29688196B146DCB8EA9958CD3775F2" + "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:TRUE" + "IsDependency" = "11:TRUE" + "IsolateTo" = "8:" + } + "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_FC05F2EBDB0B4B34CB616ECEDC5B492B" + { + "SourcePath" = "8:VERSION.dll" + "TargetName" = "8:VERSION.dll" + "Tag" = "8:" + "Folder" = "8:_FC29688196B146DCB8EA9958CD3775F2" + "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:TRUE" + "IsDependency" = "11:TRUE" + "IsolateTo" = "8:" + } "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_FCF9F83168694194BACF7DDAC11DD6DE" { "SourcePath" = "8:..\\..\\..\\src\\help\\help\\programs\\snapplot\\images\\sp_dlg_redundancy_pens.png" diff --git a/wxwidgets/README.md b/wxwidgets/README.md index a6235416..036a75c9 100644 --- a/wxwidgets/README.md +++ b/wxwidgets/README.md @@ -1,12 +1,8 @@ Building wxWidgets for windows compilation ========================================== -1) Download the wxWidgets 3 source file (https://github.com/wxWidgets/wxWidgets/releases/download/v3.1.1/wxWidgets-3.1.1.7z) +1) If upgrading the download the required wxwidgets version (eg: https://github.com/wxWidgets/wxWidgets/releases/download/v3.2.4/wxWidgets-3.2.4.7z) 2) Decompress into a wxwidgets subdirectory of this directory 3) From a VS x64 command window run build_wx64.bat - -4) From a VS x86 commadn window run build_wx.bat - - diff --git a/wxwidgets/build_wx.bat b/wxwidgets/build_wx.bat deleted file mode 100644 index 3b5456f0..00000000 --- a/wxwidgets/build_wx.bat +++ /dev/null @@ -1,9 +0,0 @@ -REM Build wx widgets libraries - -cd wxwidgets\build\msw -nmake -f makefile.vc BUILD=debug SHARED=0 RUNTIME_LIBS=static clean >NULL -nmake -f makefile.vc BUILD=release SHARED=0 RUNTIME_LIBS=static clean >NULL -echo Building wxwidgets 32bit debug version -nmake -f makefile.vc BUILD=debug SHARED=0 RUNTIME_LIBS=static > build_wxd.log 2>&1 -echo Building wxwidgets 32bit release version -nmake -f makefile.vc BUILD=release SHARED=0 RUNTIME_LIBS=static > build_wx.log 2>&1 diff --git a/wxwidgets/wxWidgets-3.2.4.7z b/wxwidgets/wxWidgets-3.2.4.7z new file mode 100644 index 00000000..e6dd36c9 Binary files /dev/null and b/wxwidgets/wxWidgets-3.2.4.7z differ