CI: Fix testing for Windows DLL builds + fix broken DLL build. (#3603, #3601)
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index a8db319..dca1be0 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -49,7 +49,8 @@
shell: cmd
run: |
cd examples\example_null
- "%VS_PATH%\VC\Auxiliary\Build\vcvarsall.bat" x64 && .\build_win32.bat /W4
+ call "%VS_PATH%\VC\Auxiliary\Build\vcvars64.bat"
+ .\build_win32.bat /W4
- name: Build example_null (single file build)
shell: bash
@@ -71,14 +72,14 @@
- name: Build example_null (as DLL)
shell: cmd
run: |
- "%VS_PATH%\VC\Auxiliary\Build\vcvarsall.bat" x64
- echo '#ifdef _EXPORT' > example_single_file.cpp
- echo '# define IMGUI_API __declspec(dllexport)' >> example_single_file.cpp
- echo '#else' >> example_single_file.cpp
- echo '# define IMGUI_API __declspec(dllimport)' >> example_single_file.cpp
- echo '#endif' >> example_single_file.cpp
- echo '#define IMGUI_IMPLEMENTATION' >> example_single_file.cpp
- echo '#include "misc/single_file/imgui_single_file.h"' >> example_single_file.cpp
+ call "%VS_PATH%\VC\Auxiliary\Build\vcvars64.bat"
+ echo #ifdef _EXPORT > example_single_file.cpp
+ echo # define IMGUI_API __declspec(dllexport) >> example_single_file.cpp
+ echo #else >> example_single_file.cpp
+ echo # define IMGUI_API __declspec(dllimport) >> example_single_file.cpp
+ echo #endif >> example_single_file.cpp
+ echo #define IMGUI_IMPLEMENTATION >> example_single_file.cpp
+ echo #include "misc/single_file/imgui_single_file.h" >> example_single_file.cpp
cl.exe /D_USRDLL /D_WINDLL /D_EXPORT /I. example_single_file.cpp /LD /FeImGui.dll /link
cl.exe /I. ImGui.lib /Feexample_null.exe examples/example_null/main.cpp
diff --git a/docs/CHANGELOG.txt b/docs/CHANGELOG.txt
index 0098b61..7564fae 100644
--- a/docs/CHANGELOG.txt
+++ b/docs/CHANGELOG.txt
@@ -89,6 +89,7 @@
- Backends: OSX: Fix keypad-enter key not working on MacOS. (#3554) [@rokups, @lfnoise]
- Examples: Apple+Metal: Consolidated/simplified to get closer to other examples. (#3543) [@warrenm]
- Examples: Apple+Metal: Forward events down so OS key combination like Cmd+Q can work. (#3554) [@rokups]
+- CI: Fix testing for Windows DLL builds. (#3603, #3601) [@iboB]
- Docs: Split examples/README.txt into docs/BACKENDS.md and docs/EXAMPLES.md improved them.
- Docs: Consistently renamed all occurences of "binding" and "back-end" to "backend" in comments and docs.
diff --git a/imgui_internal.h b/imgui_internal.h
index 86816c5..afae777 100644
--- a/imgui_internal.h
+++ b/imgui_internal.h
@@ -1127,8 +1127,8 @@
short SizeOfBeginPopupStack;
ImGuiStackSizes() { memset(this, 0, sizeof(*this)); }
- IMGUI_API void SetToCurrentState();
- IMGUI_API void CompareWithCurrentState();
+ void SetToCurrentState();
+ void CompareWithCurrentState();
};
//-----------------------------------------------------------------------------
