From 560d1cd273e0a158e9f32fe6d63c6ec4bcc607c2 Mon Sep 17 00:00:00 2001
From: kramo <93832451+kra-mo@users.noreply.github.com>
Date: Wed, 5 Jul 2023 22:28:02 +0200
Subject: [PATCH] Properly configure Windows with meson

---
 .github/workflows/ci.yml               | 2 +-
 flatpak/hu.kramo.Cartridges.Devel.json | 3 +--
 meson.build                            | 9 ++-------
 windows/meson.build                    | 7 +++++++
 4 files changed, 11 insertions(+), 10 deletions(-)
 create mode 100644 windows/meson.build

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index c7eca48..0fdbee7 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -51,7 +51,7 @@ jobs:
           timeout 2 cartridges; [ "$?" -eq "124" ]
 
       - name: Inno Setup
-        run: iscc ".\_build\Cartridges.iss"
+        run: iscc ".\_build\windows\Cartridges.iss"
 
       - name: Upload Artifact
         uses: actions/upload-artifact@v3
diff --git a/flatpak/hu.kramo.Cartridges.Devel.json b/flatpak/hu.kramo.Cartridges.Devel.json
index 1c984ab..1c2ecea 100644
--- a/flatpak/hu.kramo.Cartridges.Devel.json
+++ b/flatpak/hu.kramo.Cartridges.Devel.json
@@ -28,8 +28,7 @@
         "/share/man",
         "/share/pkgconfig",
         "*.la",
-        "*.a",
-        "Cartridges.iss"
+        "*.a"
     ],
     "modules" : [
         {
diff --git a/meson.build b/meson.build
index 832c807..437c77f 100644
--- a/meson.build
+++ b/meson.build
@@ -33,13 +33,8 @@ subdir('data')
 subdir('src')
 subdir('po')
 
-configure_file(
-  input: './windows/Cartridges.iss.in',
-  output: 'Cartridges.iss',
-  configuration: conf,
-  install: true,
-  install_dir: '.'
-)
+if host_machine.system() == 'windows'
+  subdir('windows')
 
 gnome.post_install(
      glib_compile_schemas: true,
diff --git a/windows/meson.build b/windows/meson.build
new file mode 100644
index 0000000..959e7ff
--- /dev/null
+++ b/windows/meson.build
@@ -0,0 +1,7 @@
+configure_file(
+  input: './Cartridges.iss.in',
+  output: 'Cartridges.iss',
+  configuration: conf,
+  install: true,
+  install_dir: '.'
+)
\ No newline at end of file