- forgot to update the vcpkg/findzmusic stuff with the new build script

ZDoom · Feb 1, 2024 · fba13f2 · fba13f2
1 parent 8b6010f
commit fba13f2
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 15 deletions.
diff --git a/cmake/FindZMusic.cmake b/cmake/FindZMusic.cmake
@@ -10,9 +10,15 @@ if(ZMUSIC_INCLUDE_DIR AND ZMUSIC_LIBRARIES)
     set(ZMUSIC_FIND_QUIETLY TRUE)
 endif()
 
-find_path(ZMUSIC_INCLUDE_DIR zmusic.h)
+find_path(ZMUSIC_INCLUDE_DIR zmusic.h
+	HINTS
+	${CMAKE_SOURCE_DIR}/build/zmusic/include
+)
 
-find_library(ZMUSIC_LIBRARIES NAMES zmusiclite)
+find_library(ZMUSIC_LIBRARIES NAMES zmusiclite
+	HINTS
+	${CMAKE_SOURCE_DIR}/build/zmusic/build/source
+)
 mark_as_advanced(ZMUSIC_LIBRARIES ZMUSIC_INCLUDE_DIR)
 
 # handle the QUIETLY and REQUIRED arguments and set ZMUSIC_FOUND to TRUE if 

diff --git a/vcpkg.json b/vcpkg.json
@@ -1,6 +1,6 @@
 {
     "$schema": "https://raw.githubusercontent.com/microsoft/vcpkg-tool/main/docs/vcpkg.schema.json",
-    "builtin-baseline": "65c013b9667ff1f58fb8724209227e5a2e761043",
+    "builtin-baseline": "2c401863dd54a640aeb26ed736c55489c079323b",
     "features":
     {
         "vcpkg-libvpx":
@@ -10,7 +10,7 @@
                 {
                     "name": "libvpx",
                     "default-features": false,
-                    "platform": "windows & static & staticcrt"
+                    "platform": "(!windows & static) | (windows & static & staticcrt)"
                 }
             ]
         },
@@ -21,31 +21,35 @@
                 {
                     "name": "openal-soft",
                     "default-features": false,
-                    "platform": "!windows | (windows & static & staticcrt)"
+                    "platform": "(!windows & static) | (windows & static & staticcrt)"
                 }
             ]
         }
     },
     "dependencies": [
-        {
-            "name": "zlib",
-            "platform": "!windows | (windows & static & staticcrt)"
-        },
         {
             "name": "bzip2",
-            "platform": "!windows | (windows & static & staticcrt)"
+            "platform": "(!windows & static) | (windows & static & staticcrt)"
         },
         {
             "name": "sdl2",
-            "platform": "!windows & !osx"
+            "platform": "!windows & !osx & static"
         },
         {
             "name": "libvpx",
-            "platform": "!windows"
+            "platform": "!windows & static"
         },
         {
             "name": "libwebp",
-            "platform": "!windows | (windows & static & staticcrt)"
-        }
+            "platform": "(!windows & static) | (windows & static & staticcrt)"
+        },
+	{
+            "name": "gtk3",
+            "platform": "!windows & !osx & static"
+	},
+	{
+            "name": "glib",
+            "platform": "!windows & !osx & static"
+	}
     ]
-}
+}