diff --git a/BuildAllTargets.cmd b/BuildAllTargets.cmd index 591f501..4f85b5f 100644 --- a/BuildAllTargets.cmd +++ b/BuildAllTargets.cmd @@ -8,7 +8,14 @@ rem Remove the output folder for a fresh compile. rd /s /q Output rem Initialize Visual Studio environment -call "%~dp0Mile.Project.Windows\InitializeVisualStudioEnvironment.cmd" +set VisualStudioInstallerFolder="%ProgramFiles(x86)%\Microsoft Visual Studio\Installer" +if %PROCESSOR_ARCHITECTURE%==x86 set VisualStudioInstallerFolder="%ProgramFiles%\Microsoft Visual Studio\Installer" +pushd %VisualStudioInstallerFolder% +for /f "usebackq tokens=*" %%i in (`vswhere -latest -products * -requires Microsoft.VisualStudio.Component.VC.Tools.x86.x64 -property installationPath`) do ( + set VisualStudioInstallDir=%%i +) +popd +call "%VisualStudioInstallDir%\VC\Auxiliary\Build\vcvarsall.bat" x86 rem Build all targets MSBuild -binaryLogger:Output\BuildAllTargets.binlog -m BuildAllTargets.proj diff --git a/Directory.Build.props b/Directory.Build.props index 99158aa..e8bca2f 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -1,4 +1,7 @@  - + + $(MSBuildThisFileDirectory)Output\ + + \ No newline at end of file diff --git a/LvglWindows/LvglWindows.vcxproj b/LvglWindows/LvglWindows.vcxproj index 5732339..80c8469 100644 --- a/LvglWindows/LvglWindows.vcxproj +++ b/LvglWindows/LvglWindows.vcxproj @@ -16,11 +16,11 @@ 9.0.0.0 Alpha 1 - - - - - + + + + + LvglWindows.def @@ -35,5 +35,5 @@ - + \ No newline at end of file diff --git a/LvglWindows/LvglWindowsStatic.vcxproj b/LvglWindows/LvglWindowsStatic.vcxproj index cf27b09..7fac2a4 100644 --- a/LvglWindows/LvglWindowsStatic.vcxproj +++ b/LvglWindows/LvglWindowsStatic.vcxproj @@ -6,11 +6,11 @@ StaticLibrary true - - - - - + + + + + $(MSBuildThisFileDirectory);$(MSBuildThisFileDirectory)..\LvglPlatform\lvgl\;$(MSBuildThisFileDirectory)..\LvglPlatform\;$(IncludePath) @@ -3038,5 +3038,5 @@ - + \ No newline at end of file diff --git a/LvglWindowsDesktopApplication/LvglWindowsDesktopApplication.vcxproj b/LvglWindowsDesktopApplication/LvglWindowsDesktopApplication.vcxproj index 987968b..d7d0149 100644 --- a/LvglWindowsDesktopApplication/LvglWindowsDesktopApplication.vcxproj +++ b/LvglWindowsDesktopApplication/LvglWindowsDesktopApplication.vcxproj @@ -16,11 +16,11 @@ 9.0.0.0 Alpha 1 - - - - - + + + + + $(MSBuildThisFileDirectory);$(MSBuildThisFileDirectory)..\LvglPlatform\lvgl\;$(MSBuildThisFileDirectory)..\LvglPlatform\;$(IncludePath) @@ -3047,5 +3047,5 @@ - + \ No newline at end of file diff --git a/LvglWindowsSimulator/LvglWindowsSimulator.vcxproj b/LvglWindowsSimulator/LvglWindowsSimulator.vcxproj index f022308..7012243 100644 --- a/LvglWindowsSimulator/LvglWindowsSimulator.vcxproj +++ b/LvglWindowsSimulator/LvglWindowsSimulator.vcxproj @@ -1,4 +1,4 @@ - + {3CA6E070-4AC1-475E-BB17-CF29AE4806DF} @@ -19,11 +19,11 @@ false - - - - - + + + + + @@ -3815,5 +3815,5 @@ - + \ No newline at end of file