Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 8 additions & 2 deletions .github/workflows/compile.yml
Original file line number Diff line number Diff line change
Expand Up @@ -173,8 +173,14 @@ jobs:
foreach ($Example in @('glfw_vulkan', 'widget_gallery', 'implot_dashboard')) {
$Source = if ($Example -eq 'glfw_vulkan') { 'source/demo' } else { "source/demo/examples/$Example" }
$Executable = Join-Path $Output "$Example.exe"
v -no-memory-limit -path $ModulePath -cc msvc -o $Executable $Source
if ($LASTEXITCODE -ne 0) { throw "The Windows $Example did not compile" }
if ($Example -eq 'glfw_vulkan') {
v run source/demo/setup.vsh --build-only --example glfw_vulkan
if ($LASTEXITCODE -ne 0) { throw 'The Windows guided setup build failed' }
Copy-Item (Join-Path $ImguiRoot 'build\windows-demo\glfw_vulkan.exe') $Executable
} else {
v -no-memory-limit -path $ModulePath -cc msvc -o $Executable $Source
if ($LASTEXITCODE -ne 0) { throw "The Windows $Example did not compile" }
}
}
Copy-Item $GlfwDll.FullName, $VimguiDll.FullName $Output -Force
foreach ($Artifact in @($Executable, $GlfwDll.FullName, $VimguiDll.FullName)) {
Expand Down
11 changes: 6 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -47,11 +47,12 @@ Install V and Git, then run this command from the checkout:
Use the official V compiler. The tested compiler revisions are recorded in
[the CI compiler setup](.github/actions/setup-v/action.yml).
The direct executable script commands below apply to Linux and macOS.
The Windows branch of this checkout's guided runner still refers to the removed
`run_demo_windows.ps1`. Until that entry point is updated, use the shared
`v run scripts/run_demo.vsh` runner from the pinned ImGui checkout as described
in its `QUICKSTART.md`; pass `--demo-directory` with this checkout's absolute
path and `--demo-source` with the desired example's absolute path.
On Windows, run `v run setup.vsh` from a Developer PowerShell. The guided
runner delegates native-library preparation and the selected example build to
the pinned ImGui checkout's shared `scripts/run_demo.vsh` entry point, then
keeps the named example executable beside its runtime DLLs. For a direct build,
that upstream runner accepts `--build-only`, `--demo-directory` with this
checkout's absolute path, and `--demo-source` with the example's absolute path.

The guided runner lets you choose an example, explains setup changes, builds it
and opens it. It streams build progress and offers to run an existing desktop
Expand Down
4 changes: 2 additions & 2 deletions setup.vsh
Original file line number Diff line number Diff line change
Expand Up @@ -275,8 +275,8 @@ fn guided_main() ! {
if vulkan_sdk.exit_code == 0 && vulkan_sdk.output.trim_space() != '' {
os.setenv('VULKAN_SDK', vulkan_sdk.output.trim_space(), true)
}
runner := os.join_path(imgui_root, 'scripts', 'run_demo_windows.ps1')
run('powershell -NoProfile -ExecutionPolicy Bypass -File ${os.quoted_path(runner)} -BuildOnly -DemoDirectory ${os.quoted_path(project_dir)} -DemoSource ${os.quoted_path(source)}') or {
runner := os.join_path(imgui_root, 'scripts', 'run_demo.vsh')
run('v run ${os.quoted_path(runner)} --build-only --demo-directory ${os.quoted_path(project_dir)} --demo-source ${os.quoted_path(source)}') or {
return err
}
os.cp(os.join_path(imgui_root, 'build', 'windows-demo', 'v_imgui_demo.exe'), example_binary)!
Expand Down
1 change: 1 addition & 0 deletions tests/desktop/accessibility.cpp
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
// Launches the gallery and checks named controls, states and actions through Linux AT-SPI.
#include <atspi/atspi.h>
#include <gio/gio.h>
#include <algorithm>
Expand Down
Loading