Skip to content

Commit

Permalink
update windows build
Browse files Browse the repository at this point in the history
  • Loading branch information
admercs committed Feb 20, 2024
1 parent 1b089b9 commit 905a392
Show file tree
Hide file tree
Showing 303 changed files with 190 additions and 275 deletions.
1 change: 1 addition & 0 deletions .clang-format-ignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
# Skip json.hpp since it is copied directly from external repo
AutonomyLib/include/common/utils/json.hpp
AutonomySim/MavLinkCom/common_utils/json.hpp
mkdocs.yml
5 changes: 3 additions & 2 deletions .github/workflows/test_windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ jobs:
runs-on: ${{ matrix.os }} # windows-latest
strategy:
matrix:
# NOTE: windows-2019 comes with Visual Studio Build Tools v142, not v143 (required)
os: [windows-2022] # versions: [2019: 10, 2022: 11];
# NOTE: windows-2019 has Visual Studio Build Tools v142, not v143 (required), and installing it is non-trivial
os: [windows-2022] # versions: [2019: 10, 2022: 11]
arch:
- amd64
# - arm64
Expand Down Expand Up @@ -36,4 +36,5 @@ jobs:
shell: pwsh
run: |
# Set-PSDebug -Trace 1
$CMAKE_GENERATOR_PLATFORM = "Visual Studio 17 2022"
./scripts/build.ps1 -BuildMode "Release" -Deploy
3 changes: 2 additions & 1 deletion AutonomyLib/.gitignore
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
deps/
deps/
temp/
248 changes: 124 additions & 124 deletions AutonomySim.sln

Large diffs are not rendered by default.

8 changes: 4 additions & 4 deletions MavLinkCom/MavLinkMoCap/MavLinkMoCap.vcxproj
Original file line number Diff line number Diff line change
Expand Up @@ -29,26 +29,26 @@
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<PlatformToolset>v141</PlatformToolset>
<PlatformToolset>v143</PlatformToolset>
<CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<PlatformToolset>v141</PlatformToolset>
<PlatformToolset>v143</PlatformToolset>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<PlatformToolset>v141</PlatformToolset>
<PlatformToolset>v143</PlatformToolset>
<CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<PlatformToolset>v141</PlatformToolset>
<PlatformToolset>v143</PlatformToolset>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
Expand Down
2 changes: 1 addition & 1 deletion SemiGlobalMatching/src/sgmstereo/sgmstereo.vcxproj
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
<SccAuxPath>SAK</SccAuxPath>
<SccLocalPath>SAK</SccLocalPath>
<SccProvider>SAK</SccProvider>
<ProjectName>sgmstereo</ProjectName>
<ProjectName>SGMStereo</ProjectName>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
<ProjectGuid>{E512EB59-4EAB-49D1-9174-0CAF1B40CED0}</ProjectGuid>
<Keyword>Win32Proj</Keyword>
<RootNamespace>epnp</RootNamespace>
<ProjectName>stereoPipeline</ProjectName>
<ProjectName>SGMStereoPipeline</ProjectName>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
Expand Down

This file was deleted.

9 changes: 0 additions & 9 deletions Unreal/Environments/Blocks/scripts/archive/clean.cmd

This file was deleted.

64 changes: 0 additions & 64 deletions Unreal/Environments/Blocks/scripts/archive/package.cmd

This file was deleted.

File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@
<ProjectGuid>{39683523-C864-4D47-8350-33FC3EC0F00F}</ProjectGuid>
<Keyword>MakeFileProj</Keyword>
<WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
<ProjectName>Unreal</ProjectName>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
Expand Down Expand Up @@ -99,8 +100,8 @@
</ItemDefinitionGroup>
<ItemGroup>
<ClCompile Include="Unreal\Plugins\AutonomySim\Source\AutonomyBlueprintLib.cpp" />
<ClCompile Include="Unreal\Plugins\AutonomySim\Source\AirSim.cpp" />
<ClCompile Include="Unreal\Plugins\AutonomySim\Source\AirSimGameMode.cpp" />
<ClCompile Include="Unreal\Plugins\AutonomySim\Source\AutonomySim.cpp" />
<ClCompile Include="Unreal\Plugins\AutonomySim\Source\AutonomySimGameMode.cpp" />
<ClCompile Include="Unreal\Plugins\AutonomySim\Source\CameraDirector.cpp" />
<ClCompile Include="Unreal\Plugins\AutonomySim\Source\Car\CarPawn.cpp" />
<ClCompile Include="Unreal\Plugins\AutonomySim\Source\Car\CarWheelFront.cpp" />
Expand Down Expand Up @@ -133,8 +134,8 @@
</ItemGroup>
<ItemGroup>
<ClInclude Include="Unreal\Plugins\AutonomySim\Source\AutonomyBlueprintLib.h" />
<ClInclude Include="Unreal\Plugins\AutonomySim\Source\AirSim.h" />
<ClInclude Include="Unreal\Plugins\AutonomySim\Source\AirSimGameMode.h" />
<ClInclude Include="Unreal\Plugins\AutonomySim\Source\AutonomySim.h" />
<ClInclude Include="Unreal\Plugins\AutonomySim\Source\AutonomySimGameMode.h" />
<ClInclude Include="Unreal\Plugins\AutonomySim\Source\CameraDirector.h" />
<ClInclude Include="Unreal\Plugins\AutonomySim\Source\Car\CarPawn.h" />
<ClInclude Include="Unreal\Plugins\AutonomySim\Source\Car\CarWheelFront.h" />
Expand Down Expand Up @@ -167,8 +168,7 @@
<ClInclude Include="Unreal\Plugins\AutonomySim\Source\WorldSimApi.h" />
</ItemGroup>
<ItemGroup>
<None Include="Unreal\Plugins\AutonomySim\Source\AirSim.Build.4.15.cs" />
<None Include="Unreal\Plugins\AutonomySim\Source\AirSim.Build.cs" />
<None Include="Unreal\Plugins\AutonomySim\Source\AutonomySim.Build.cs" />
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,6 @@
<ClCompile Include="Unreal\Plugins\AutonomySim\Source\AutonomyBlueprintLib.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="Unreal\Plugins\AutonomySim\Source\AutonomySim.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="Unreal\Plugins\AutonomySim\Source\AutonomySimGameMode.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="Unreal\Plugins\AutonomySim\Source\CameraDirector.cpp">
<Filter>Source Files</Filter>
</ClCompile>
Expand Down Expand Up @@ -111,17 +105,17 @@
<ClCompile Include="Unreal\Plugins\AutonomySim\Source\TextureShuffleActor.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="Unreal\Plugins\AutonomySim\Source\AutonomySim.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="Unreal\Plugins\AutonomySim\Source\AutonomySimGameMode.cpp">
<Filter>Source Files</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="Unreal\Plugins\AutonomySim\Source\AutonomyBlueprintLib.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="Unreal\Plugins\AutonomySim\Source\AutonomySim.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="Unreal\Plugins\AutonomySim\Source\AutonomySimGameMode.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="Unreal\Plugins\AutonomySim\Source\CameraDirector.h">
<Filter>Header Files</Filter>
</ClInclude>
Expand Down Expand Up @@ -212,13 +206,14 @@
<ClInclude Include="Unreal\Plugins\AutonomySim\Source\UnrealSensors\UnrealLidarSensor.h">
<Filter>Source Files</Filter>
</ClInclude>
<ClInclude Include="Unreal\Plugins\AutonomySim\Source\AutonomySim.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="Unreal\Plugins\AutonomySim\Source\AutonomySimGameMode.h">
<Filter>Header Files</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<None Include="Unreal\Plugins\AutonomySim\Source\AutonomySim.Build.4.15.cs">
<Filter>Source Files</Filter>
</None>
<None Include="Unreal\Plugins\AutonomySim\Source\AutonomySim.Build.cs">
<Filter>Source Files</Filter>
</None>
<None Include="Unreal\Plugins\AutonomySim\Source\AutonomySim.Build.cs" />
</ItemGroup>
</Project>
2 changes: 0 additions & 2 deletions cmake/cmake-modules/CommonSetup.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,6 @@ macro(CommonSetup)
if(CMAKE_BUILD_TYPE MATCHES Release)
set(CMAKE_CXX_FLAGS "-O3 ${CMAKE_CXX_FLAGS}")
endif()

else()
# WARNING: Windows CMake build is experimental
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -D_WIN32_WINNT=0x0600 /GS /W4 /wd4100 /wd4505 /wd4820 /wd4464 /wd4514 /wd4710 /wd4571 /Zc:wchar_t /ZI /Zc:inline /fp:precise /D_SCL_SECURE_NO_WARNINGS /D_CRT_SECURE_NO_WARNINGS /D_UNICODE /DUNICODE /WX- /Zc:forScope /Gd /EHsc ")
Expand All @@ -83,7 +82,6 @@ macro(CommonSetup)
else()
message(FATAL_ERROR "Please specify -D CMAKE_BUILD_TYPE=Debug or Release on the cmake command line")
endif()

endif()

# TODO: We are not using Boost anymore so the below should not be needed.
Expand Down
Loading

0 comments on commit 905a392

Please sign in to comment.