From 55f98b9e8d2b588d1758c8b75e41d7be8292f13c Mon Sep 17 00:00:00 2001
From: Brenden Davidson <brenden@bdavidson.dev>
Date: Sun, 29 Jun 2025 12:54:26 -0500
Subject: [PATCH] Further build cleanup

---
 .github/workflows/release.yml  | 10 ++++------
 packaging/CMakeLists.txt       |  2 +-
 packaging/linux/CMakeLists.txt |  6 ------
 3 files changed, 5 insertions(+), 13 deletions(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 68b1866b..4511bd25 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -4,11 +4,9 @@ on:
   push:
     branches:
       - master
-      - flatpak
 
 env:
   APP_ID: org.legoisland.Isle
-  BUILD_DIR: build
 
 jobs:
   build:
@@ -72,7 +70,7 @@ jobs:
 
       - name: Configure (CMake)
         run: |
-          ${{ matrix.cmake-wrapper || '' }} cmake -S . -B ${{ env.BUILD_DIR }} -GNinja \
+          ${{ matrix.cmake-wrapper || '' }} cmake -S . -B build -GNinja \
             -DCMAKE_BUILD_TYPE=${{ matrix.build-type }} \
             -DISLE_USE_DX5=${{ !!matrix.dx5 }} \
             -DISLE_BUILD_CONFIG=${{ matrix.config }} \
@@ -82,11 +80,11 @@ jobs:
             -Werror=dev
 
       - name: Build (CMake)
-        run: cmake --build ${{ env.BUILD_DIR }} --verbose
+        run: cmake --build build --verbose
 
       - name: Package (CPack)
         run: |
-          cd ${{ env.BUILD_DIR }}
+          cd build
           cpack .
 
       - name: Upload Artifact
@@ -94,7 +92,7 @@ jobs:
         with:
           name: Release-${{ matrix.name }}
           path: |
-            ${{ env.BUILD_DIR }}/dist/isle-*
+            build/dist/isle-*
 
   flatpak:
     name: "Flatpak (${{ matrix.arch }})"
diff --git a/packaging/CMakeLists.txt b/packaging/CMakeLists.txt
index 9586db9d..540065ef 100644
--- a/packaging/CMakeLists.txt
+++ b/packaging/CMakeLists.txt
@@ -16,4 +16,4 @@ endif()
 
 if(LINUX)
     add_subdirectory(linux)
-endif()
\ No newline at end of file
+endif()
diff --git a/packaging/linux/CMakeLists.txt b/packaging/linux/CMakeLists.txt
index 3ff0d713..2ece9db8 100644
--- a/packaging/linux/CMakeLists.txt
+++ b/packaging/linux/CMakeLists.txt
@@ -1,9 +1,3 @@
-if(DEFINED ENV{FLATPAK_DEST})
-    set(FLATPAK TRUE)
-else()
-    set(FLATPAK FALSE)
-endif()
-
 # Injects the required variables into the Desktop and MetaInfo files
 configure_file(isledecomp.desktop.in "${APP_ID}.desktop" @ONLY)
 configure_file(isledecomp.metainfo.xml.in "${APP_ID}.metainfo.xml" @ONLY)