full linux dispatcher update

Author: maximd33i

Makefile.am

@@ -1,11 +1,12 @@
 ACLOCAL_AMFLAGS = -I m4
 
-AM_CPPFLAGS = -I$(top_srcdir)/include -DMINGW_HAS_SECURE_API=1
+AM_CPPFLAGS = -I$(top_srcdir)/include -DMINGW_HAS_SECURE_API=1 -DMFX_MODULES_DIR=\".\" -DMFX_PLUGINS_CONF_DIR=\".\"
 
 dist_doc_DATA =
 
 lib_LTLIBRARIES = libmfx.la
 
+if WINDOWS
 libmfx_la_SOURCES = \
     src/mfx_critical_section.h       \
     src/mfx_exposed_functions_list.h \
@@ -18,11 +19,7 @@ libmfx_la_SOURCES = \
     src/mfx_dispatcher.cpp           \
     src/mfx_dispatcher_log.cpp       \
     src/mfx_load_plugin.cpp          \
-    src/mfx_function_table.cpp
-
-
-if WINDOWS
-libmfx_la_SOURCES += \
+    src/mfx_function_table.cpp       \
     src/mfx_dxva2_device.h           \
     src/mfx_win_reg_key.h            \
     src/mfx_dxva2_device.cpp         \
@@ -31,12 +28,9 @@ libmfx_la_SOURCES += \
     src/mfx_win_reg_key.cpp          \
     src/mfx_plugin_hive.cpp
 else
-libmfx_la_SOURCES += \
-    src/mfx_va_glue.c                  \
-    src/mfx_critical_section_linux.cpp \
-    src/mfx_load_dll_linux.cpp         \
-    src/mfx_plugin_cfg_parser.cpp      \
-    src/mfx_plugin_hive_linux.cpp
+libmfx_la_SOURCES = \
+    src/mfxloader.cpp                \
+    src/mfxparser.cpp
 endif
 
 

src/main.cpp

@@ -18,10 +18,8 @@
 // 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>