From 613673587b1cec920f89cec4ea92223aaac7ace5 Mon Sep 17 00:00:00 2001
From: Antoine Van Malleghem <a.vanmalleghem@gmail.com>
Date: Mon, 2 Sep 2024 16:14:33 +0200
Subject: [PATCH 1/2] Fix readme issues (#1051)

Signed-off-by: Van Malleghem Antoine <antoine.vanmalleghem@botronics.be>
---
 README.md | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index 184ba3c80..3e4c28e44 100644
--- a/README.md
+++ b/README.md
@@ -31,9 +31,9 @@ of libraries designed to rapidly develop robot applications.
 
 [Folder Structure](#folder-structure)
 
-[Code of Conduct](#code-of-conduct)
+[Contributing](#contributing)
 
-[Contributing](#code-of-contributing)
+[Code of Conduct](#code-of-conduct)
 
 [Versioning](#versioning)
 
@@ -80,8 +80,8 @@ Rendering engine plugin implementation code is stored in their own folders
 
 # Contributing
 
-Please see
-[CONTRIBUTING.md](https://gazebosim.org/docs/all/contributing).
+Please see the
+[contribution guide](https://gazebosim.org/docs/all/contributing).
 
 # Code of Conduct
 

From 3ba2f1e056381b82679269f2a73cd1efd6301f1f Mon Sep 17 00:00:00 2001
From: "Addisu Z. Taddese" <addisu@openrobotics.org>
Date: Tue, 3 Sep 2024 11:29:51 -0500
Subject: [PATCH 2/2] Add Github Action for Windows and fix build (#1049)

Signed-off-by: Addisu Z. Taddese <addisu@openrobotics.org>
---
 .github/workflows/windows.yaml | 48 ++++++++++++++++++++++++++++++++++
 ogre2/src/Ogre2Scene.cc        |  8 ++++--
 2 files changed, 54 insertions(+), 2 deletions(-)
 create mode 100644 .github/workflows/windows.yaml

diff --git a/.github/workflows/windows.yaml b/.github/workflows/windows.yaml
new file mode 100644
index 000000000..e3ed647a9
--- /dev/null
+++ b/.github/workflows/windows.yaml
@@ -0,0 +1,48 @@
+name: Windows
+on:
+  pull_request:
+
+jobs:
+  build:
+    name: Window CI
+    env:
+      PACKAGE: gz-rendering9
+    runs-on: windows-latest
+    steps:
+    - name: setup-pixi
+      uses: prefix-dev/setup-pixi@v0.8.1
+      with:
+        run-install: false
+
+    - name: Install build tools
+      run: |
+        pixi init
+        pixi add vcstool colcon-common-extensions pkgconfig
+    - name: Setup pixi env variables
+      shell: bash
+      run: |
+        eval "$(pixi shell-hook)"
+        echo CMAKE_PREFIX_PATH=$CONDA_PREFIX/Library >> $GITHUB_ENV
+    - name: Install base dependencies
+      run: |
+        # List adapted from https://github.com/gazebo-tooling/release-tools/blob/f89ac8cafc646260598eb8eb6d94be8093bdc9f7/jenkins-scripts/lib/windows_env_vars.bat#L22
+        pixi add assimp dlfcn-win32 eigen ffmpeg freeimage gdal gflags ogre ogre-next spdlog tinyxml2
+    - name: Clone source dependencies
+      run: |
+        mkdir src
+        cd src
+        pixi run vcs import --input https://raw.githubusercontent.com/gazebo-tooling/gazebodistro/master/${env:PACKAGE}.yaml
+
+    - uses: actions/checkout@v4
+      with:
+        path: src/gz-rendering
+
+    - name: Build Dependencies
+      run: |
+        pixi run colcon build --merge-install --cmake-args -G"Visual Studio 17 2022" -A x64 -DCMAKE_BUILD_TYPE=Release -DBUILD_TESTING=OFF  --event-handlers console_direct+ --packages-up-to ${env:PACKAGE}
+
+    - name: Build Package
+      run: pixi run colcon build --merge-install --cmake-args -G"Visual Studio 17 2022" -A x64 -DCMAKE_BUILD_TYPE=Release -DBUILD_TESTING=ON -DSKIP_ogre=ON --event-handlers console_direct+ --packages-select ${env:PACKAGE}
+
+    - name: Test
+      run: pixi run colcon test --merge-install --event-handlers console_direct+ --packages-select ${env:PACKAGE}
diff --git a/ogre2/src/Ogre2Scene.cc b/ogre2/src/Ogre2Scene.cc
index d7bc1ff91..2d164e235 100644
--- a/ogre2/src/Ogre2Scene.cc
+++ b/ogre2/src/Ogre2Scene.cc
@@ -20,10 +20,14 @@
   #include <OpenGL/gl.h>
   #include <OpenGL/glext.h>
 #else
-#ifndef _WIN32
+  #ifdef _WIN32
+    // windows.h has to be included *before* GL/gl.h
+    // to avoid redefinition errors.
+    #include <windows.h>
+  #endif
+
   #include <GL/gl.h>
 #endif
-#endif
 
 #include <gz/common/Console.hh>