Skip to content

Commit 79b0aed

Browse files
kavika-faleumukavika-faleumu
committed
Merge branch 'release/25.0' into release/25.1
2 parents 434bc37 + 6cb2859 commit 79b0aed

2 files changed

Lines changed: 11 additions & 0 deletions

File tree

‎PyConnector/PyConnector.wxs‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,16 @@
4242
<Component Id="PyConnector_311" Guid="397D0487-B658-4DDB-B878-0C0D1FCB4ECD" KeyPath="yes">
4343
<File Name="PyConnector311.dll" Source="$(var.ProjectDir)../out/PyConnector311.dll" />
4444
</Component>
45+
<!--Program GUIDs>
46+
<FlexSim="C6AF33A5-1B01-4AC4-A5AF-E7DA79041C47">
47+
<FlexSimChinese="342BF1E9-1B8F-497E-9A8D-1F3603FC3ABC">
48+
<FlexSimJapanese="42316AF9-7629-4DB8-BCA3-263B87522D17">
49+
<FlexSimChineseTraditional="2A93BC28-48C8-4DF6-AD1A-C44A9E9E4F54">
50+
<FlexSimSpanish="DC381D4E-5765-488D-9372-D8A2609F375A">
51+
</Program GUIDs-->
52+
<Component Id="PyConnector_312" Guid="35ECCF5A-885B-462D-80D0-955DD4DB4472" KeyPath="yes">
53+
<File Name="PyConnector312.dll" Source="$(var.ProjectDir)../out/PyConnector312.dll" />
54+
</Component>
4555
</Directory>
4656
</Directory>
4757
</Module>

‎build_all_configs.bat‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ if "%msbuildpath%"=="" (
55
set msbuildpath="C:\Program Files\Microsoft Visual Studio\2022\Professional\MSBuild\Current\Bin\MSBuild.exe"
66
)
77

8+
%msbuildpath% FlexSimPy.sln /p:Platform=x64;Configuration=Rel_3_12 /t:Rebuild
89
%msbuildpath% FlexSimPy.sln /p:Platform=x64;Configuration=Rel_3_11 /t:Rebuild
910
%msbuildpath% FlexSimPy.sln /p:Platform=x64;Configuration=Rel_3_10 /t:Rebuild
1011
%msbuildpath% FlexSimPy.sln /p:Platform=x64;Configuration=Rel_3_9 /t:Rebuild

0 commit comments

Comments
 (0)