Merge pull request #81 from maximd33/master

API 1.34
lu-zero · Sep 24, 2020 · 2cd279f · 2cd279f
2 parents 3ecc413 + 25bde3f
commit 2cd279f
Show file tree

Hide file tree

Showing 38 changed files with 930 additions and 1,099 deletions.
diff --git a/Makefile.am b/Makefile.am
@@ -26,7 +26,9 @@ libmfx_la_SOURCES = \
     src/mfx_library_iterator.cpp     \
     src/mfx_load_dll.cpp             \
     src/mfx_win_reg_key.cpp          \
-    src/mfx_plugin_hive.cpp
+    src/mfx_plugin_hive.cpp          \
+    src/mfx_driver_store_loader.h    \
+    src/mfx_driver_store_loader.cpp
 else
 libmfx_la_SOURCES = \
     src/mfxloader.cpp                \

diff --git a/configure.ac b/configure.ac
@@ -1,6 +1,6 @@
 AC_PREREQ([2.53])
 
-AC_INIT([libmfx], [1.32])
+AC_INIT([libmfx], [1.34])
 AC_CONFIG_SRCDIR([src/mfx_dispatcher.cpp])
 AM_INIT_AUTOMAKE([foreign subdir-objects])
 
@@ -15,13 +15,13 @@ AS_CASE([${host_os}],
     [*mingw*], [
         AC_DEFINE([MFX_HAVE_WINDOWS])
         AM_CONDITIONAL([WINDOWS], [true])
-        DLLIB=""
+        DLLIB="-lole32 -luuid"
     ],
     [*cygwin*], [
         AC_DEFINE([MFX_HAVE_WINDOWS])
         AC_DEFINE([_MAX_PATH], [MAX_PATH])
         AM_CONDITIONAL([WINDOWS], [true])
-        DLLIB=""
+        DLLIB="-lole32 -luuid"
     ],
     [AC_MSG_ERROR([${host_os} not supported.])]
 )

diff --git a/libmfx.sln b/libmfx.sln