Update CMakeLists.txt for STEAMDECK_NATIVE dependencies.

streetpea · Oct 20, 2023 · 686053c · 686053c
1 parent dd4bbc1
commit 686053c
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 10 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -76,6 +76,17 @@ jobs:
           Expand-Archive -LiteralPath "fftw-3.3.5-dll64.zip" -DestinationPath "./fftw"
           Write-Output "${{ github.workspace }}\fftw" | Out-File -FilePath $Env:GITHUB_PATH -Encoding utf8 -Append
 
+      - name: Setup MSVC
+        uses: ilammy/msvc-dev-cmd@v1
+        with:
+          arch: "x86_64"
+          toolset: "14"
+
+      - name: fftw libs
+        run: |
+          cd ${{ github.workspace }}\fftw
+          lib /def:libfftw3-3.def
+
       - name: Setup SDL2
         run: |
           $ProgressPreference = 'SilentlyContinue'
@@ -116,12 +127,6 @@ jobs:
           arch: 'win64_msvc2019_64'
           modules: 'qtmultimedia'
 
-      - name: Setup MSVC
-        uses: ilammy/msvc-dev-cmd@v1
-        with:
-          arch: "x86_64"
-          toolset: "14"
-
       - name: Configure & Build Opus
         run: |
           git clone https://github.com/xiph/opus.git -b v1.4
@@ -172,8 +177,6 @@ jobs:
           cp "${{ github.workspace }}\ffmpeg\bin\avutil-58.dll" Chiaki4deck-VC
           cp "${{ github.workspace }}\hidapi-x64\hidapi.dll" Chiaki4deck-VC
           cp "${{ github.workspace }}\fftw\libfftw3-3.dll" Chiaki4deck-VC
-          cp "${{ github.workspace }}\fftw\libfftw3f-3.dll" Chiaki4deck-VC
-          cp "${{ github.workspace }}\fftw\libfftw3l-3.dll" Chiaki4deck-VC
           windeployqt.exe --no-translations Chiaki4deck-VC\chiaki.exe
 
       - name: Package Chiaki4deck
@@ -193,3 +196,4 @@ jobs:
           name: Chiaki4deck-win_x64-VC-Release
           path: ${{ env.RELEASE_PACKAGE_PATH }}
           if-no-files-found: error
+          retention-days: 1
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -171,8 +171,18 @@ if(CHIAKI_ENABLE_STEAMDECK_NATIVE)
 		set(CHIAKI_ENABLE_STEAMDECK_NATIVE ON)
 	else()
 		if(NOT CHIAKI_ENABLE_STEAMDECK_NATIVE STREQUAL AUTO)
-			message(FATAL_ERROR "
-CHIAKI_ENABLE_STEAMDECK_NATIVE is set to ON, but its dependency (HIDAPI) could not be resolved.")
+			if(NOT HIDAPI_FOUND AND NOT FFTW_FOUND)
+				message(FATAL_ERROR "
+				CHIAKI_ENABLE_STEAMDECK_NATIVE is set to ON, but its dependencies (HIDAPI & FFTW3) could not be resolved.")
+			endif()
+			if(NOT HIDAPI_FOUND)
+				message(FATAL_ERROR "
+				CHIAKI_ENABLE_STEAMDECK_NATIVE is set to ON, but its dependency (HIDAPI) could not be resolved.")
+			endif()
+			if(NOT FFTW_FOUND)
+				message(FATAL_ERROR "
+				CHIAKI_ENABLE_STEAMDECK_NATIVE is set to ON, but its dependency (FFTW3) could not be resolved.")
+			endif()
 		endif()
 		set(CHIAKI_ENABLE_STEAMDECK_NATIVE OFF)
 	endif()