X-Git-Url: http://git.droids-corp.org/?a=blobdiff_plain;f=lib%2Fmeson.build;h=1bb019720c6a89997a4eba5ff57af226ef01ca92;hb=5b38d8cd4663;hp=40a8a822f27415bfb19edeaa42f36f81fb66aa2a;hpb=841dfdd06d37cb00a49a56a180c287efc021a842;p=dpdk.git

diff --git a/lib/meson.build b/lib/meson.build
index 40a8a822f2..1bb019720c 100644
--- a/lib/meson.build
+++ b/lib/meson.build
@@ -41,6 +41,7 @@ if is_windows
 		'telemetry',
 		'eal',
 		'ring',
+		'rcu',
 		'mempool', 'mbuf', 'net', 'meter', 'ethdev', 'pci',
 		'cmdline',
 		'hash',
@@ -74,7 +75,7 @@ foreach l:libraries
 	ext_deps = []
 	deps = []
 	# eal is standard dependency once built
-	if dpdk_conf.has('RTE_LIBRTE_EAL')
+	if dpdk_conf.has('RTE_LIB_EAL')
 		deps += ['eal']
 	endif
 
@@ -99,7 +100,8 @@ foreach l:libraries
 		set_variable(name.underscorify() + '_disable_reason', reason)
 	else
 		enabled_libs += name
-		dpdk_conf.set('RTE_LIBRTE_' + name.to_upper(), 1)
+		dpdk_conf.set('RTE_LIBRTE_' + name.to_upper(), 1) #old macro
+		dpdk_conf.set('RTE_LIB_' + name.to_upper(), 1) # new macro
 		install_headers(headers)
 
 		libname = 'rte_' + name
@@ -140,8 +142,8 @@ foreach l:libraries
 				# RTE_BUILD_SHARED_LIB defined
 				cflags += '-DRTE_BUILD_SHARED_LIB'
 			endif
-			version_map = '@0@/@1@/rte_@2@_version.map'.format(
-					meson.current_source_dir(), dir_name, name)
+			version_map = '@0@/@1@/version.map'.format(
+					meson.current_source_dir(), dir_name)
 			implib = dir_name + '.dll.a'
 
 			def_file = custom_target(libname + '_def',