Merge pull request #77 from maximd33/master

Fixing linux build errors
lu-zero · Sep 3, 2020 · f48fb97 · f48fb97
2 parents 79adaf9 + 6e050af
commit f48fb97
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/Makefile.am b/Makefile.am
@@ -34,7 +34,6 @@ else
 libmfx_la_SOURCES += \
     src/mfx_va_glue.c                  \
     src/mfx_critical_section_linux.cpp \
-    src/mfx_library_iterator_linux.cpp \
     src/mfx_load_dll_linux.cpp         \
     src/mfx_plugin_cfg_parser.cpp      \
     src/mfx_plugin_hive_linux.cpp

diff --git a/src/main.cpp b/src/main.cpp
@@ -18,8 +18,10 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 
+#ifndef MFX_HAVE_LINUX
 #include <windows.h>
 #include <stringapiset.h>
+#endif
 
 #include <new>
 #include <memory>