From 960af8b1d535ee15c99c11286e0d4cfe82e42973 Mon Sep 17 00:00:00 2001 From: Jim Norman Date: Thu, 5 Apr 2007 16:40:44 +0000 Subject: [PATCH] Windows project file changes for 64 bit sdk msi --- CASA/micasadk/c_micasadk64.vcproj | 4 +-- .../CASA-dev64-msm/CASA-dev64-msm.vdproj | 28 ++++++++++++++++-- .../vs_solutions/CASA64-msi/CASA-64-32.suo | Bin 129606 -> 129606 bytes 3 files changed, 27 insertions(+), 5 deletions(-) diff --git a/CASA/micasadk/c_micasadk64.vcproj b/CASA/micasadk/c_micasadk64.vcproj index 8623a9ec..6f1d2d17 100644 --- a/CASA/micasadk/c_micasadk64.vcproj +++ b/CASA/micasadk/c_micasadk64.vcproj @@ -316,7 +316,7 @@ SubSystem="2" OptimizeReferences="2" EnableCOMDATFolding="2" - ImportLibrary="../lib64/Release/micasa.lib" + ImportLibrary="$(TargetDir)$(TargetName).lib" TargetMachine="17" /> diff --git a/CASA/package/windows/vs_solutions/CASA-dev64-msm/CASA-dev64-msm.vdproj b/CASA/package/windows/vs_solutions/CASA-dev64-msm/CASA-dev64-msm.vdproj index 01adccad..f0d48602 100644 --- a/CASA/package/windows/vs_solutions/CASA-dev64-msm/CASA-dev64-msm.vdproj +++ b/CASA/package/windows/vs_solutions/CASA-dev64-msm/CASA-dev64-msm.vdproj @@ -21,7 +21,7 @@ } "Entry" { - "MsmKey" = "8:_2FDCF36CB948410C8E4FAB03B6896E67" + "MsmKey" = "8:_1BF54BF3466F4215BFF442BF63F8CA8B" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" } @@ -73,6 +73,17 @@ "PrivateKeyFile" = "8:" "TimeStampServer" = "8:" "InstallerBootstrapper" = "3:1" + "BootstrapperCfg:{63ACBE69-63AA-4F98-B2B6-99F9E24495F2}" + { + "Enabled" = "11:FALSE" + "PromptEnabled" = "11:TRUE" + "PrerequisitesLocation" = "2:1" + "Url" = "8:" + "ComponentsUrl" = "8:" + "Items" + { + } + } } "Release" { @@ -89,6 +100,17 @@ "PrivateKeyFile" = "8:" "TimeStampServer" = "8:" "InstallerBootstrapper" = "3:1" + "BootstrapperCfg:{63ACBE69-63AA-4F98-B2B6-99F9E24495F2}" + { + "Enabled" = "11:FALSE" + "PromptEnabled" = "11:TRUE" + "PrerequisitesLocation" = "2:1" + "Url" = "8:" + "ComponentsUrl" = "8:" + "Items" + { + } + } } } "Deployable" @@ -124,9 +146,9 @@ "IsDependency" = "11:FALSE" "IsolateTo" = "8:" } - "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_2FDCF36CB948410C8E4FAB03B6896E67" + "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_1BF54BF3466F4215BFF442BF63F8CA8B" { - "SourcePath" = "8:..\\..\\..\\..\\lib64\\release\\micasa.lib" + "SourcePath" = "8:..\\..\\..\\..\\micasadk\\x64\\Release\\micasa.lib" "TargetName" = "8:micasa.lib" "Tag" = "8:" "Folder" = "8:_7B717E3B84D7465194063D21CBB1A6E8" diff --git a/CASA/package/windows/vs_solutions/CASA64-msi/CASA-64-32.suo b/CASA/package/windows/vs_solutions/CASA64-msi/CASA-64-32.suo index 779e78d3a54bf5161b5eef26cc245251fb32871e..10132d6b54864b9bb5ab43aedef314416ab74c95 100644 GIT binary patch delta 249 zcmX^1h5gtU_6<2KYz)^9GcGLOT*Sg=%NVe^(y^V1kzq2Ui#?EZblE@ofIG`(7FT;- zUPeI%1_m7<{tpC`FS4j?E(z+nynTimV+Ql|08Pdj+q4+f_#~wmTo_Ur3V=9|Aq7k( zGh_nk;_2DejMdX~EEzerM_Dp1W17A~jZtE{gCir$bQv|qnrSwS&XW(b7;Z1IVeDbv zKEr`AfN}C9zP#=G92u?D*ja!U1Ht6NRL|`SOBkD&raQ1PdQ3jmpEUgxKV!=F8`+Et jSQuHhR~9hVGs0CTMruz_kYePSp5VdAwcVkJk*xy&@*GL& delta 265 zcmX^1h5gtU_6<2KYztH+3_?mb7qPI}GQQYc>DbQ1s4My1V+u1>tX z41x>{3_3vk9|$I2WKr2%64Y~fx_}y^#PkMh#)jz;){Gj{A2>3yZP!y{v|`?-#i+)| zxM})F3&!H