xaudio2: Prefer native for x3daudio and xapofx, built-in for xaudio a…

…nd xactengine
ValveSoftware · Mar 22, 2021 · 96acc67 · 96acc67
1 parent c05a35b
commit 96acc67
Show file tree

Hide file tree

Showing 34 changed files with 70 additions and 0 deletions.
diff --git a/Makefile.in b/Makefile.in
@@ -86,6 +86,7 @@ DISABLED_SUBDIRS    = @DISABLED_SUBDIRS@
 CONFIGURE_TARGETS   = @CONFIGURE_TARGETS@
 TOP_INSTALL_LIB     = @TOP_INSTALL_LIB@
 TOP_INSTALL_DEV     = @TOP_INSTALL_DEV@
+XAUDIO_NATIVE_SWITCH = @XAUDIO_NATIVE_SWITCH@
 @ALL_VARS_RULES@
 @SET_MAKE@
 

diff --git a/configure b/configure
@@ -777,6 +777,7 @@ AR
 BISON
 FLEX
 TOOLSDIR
+XAUDIO_NATIVE_SWITCH
 TARGETFLAGS
 LD
 CPPBIN
@@ -5689,6 +5690,8 @@ $as_echo "$wine_cv_cc_m32" >&6; }
       export PKG_CONFIG_PATH
       enable_win16=${enable_win16:-yes}
       with_unwind=${with_unwind:-no}
+      XAUDIO_NATIVE_SWITCH="-Wb,--prefer-native"
+
     else
       if test "x${GCC}" = "xyes"
       then
@@ -5724,6 +5727,8 @@ $as_echo "$wine_cv_builtin_ms_va_list" >&6; }
       host_cpu="x86_64"
       notice_platform="64-bit "
       TARGETFLAGS="-m64"
+      XAUDIO_NATIVE_SWITCH=""
+
     fi
     ;;
   arm*)

diff --git a/configure.ac b/configure.ac
@@ -157,6 +157,7 @@ case $host in
       export PKG_CONFIG_PATH
       enable_win16=${enable_win16:-yes}
       with_unwind=${with_unwind:-no}
+      AC_SUBST(XAUDIO_NATIVE_SWITCH,["-Wb,--prefer-native"])
     else
       if test "x${GCC}" = "xyes"
       then
@@ -170,6 +171,7 @@ case $host in
       host_cpu="x86_64"
       notice_platform="64-bit "
       TARGETFLAGS="-m64"
+      AC_SUBST(XAUDIO_NATIVE_SWITCH,"")
     fi
     ;;
   arm*)

diff --git a/dlls/x3daudio1_0/Makefile.in b/dlls/x3daudio1_0/Makefile.in
@@ -4,5 +4,7 @@ PARENTSRC = ../xaudio2_7
 EXTRALIBS = $(FAUDIO_LIBS)
 EXTRAINCL = $(FAUDIO_CFLAGS)
 
+EXTRADLLFLAGS = -Wb,--prefer-native
+
 C_SRCS = \
 	x3daudio.c
diff --git a/dlls/x3daudio1_1/Makefile.in b/dlls/x3daudio1_1/Makefile.in
@@ -4,5 +4,7 @@ PARENTSRC = ../xaudio2_7
 EXTRALIBS = $(FAUDIO_LIBS)
 EXTRAINCL = $(FAUDIO_CFLAGS)
 
+EXTRADLLFLAGS = -Wb,--prefer-native
+
 C_SRCS = \
 	x3daudio.c
diff --git a/dlls/x3daudio1_2/Makefile.in b/dlls/x3daudio1_2/Makefile.in
@@ -4,5 +4,7 @@ PARENTSRC = ../xaudio2_7
 EXTRALIBS = $(FAUDIO_LIBS)
 EXTRAINCL = $(FAUDIO_CFLAGS)
 
+EXTRADLLFLAGS = -Wb,--prefer-native
+
 C_SRCS = \
 	x3daudio.c
diff --git a/dlls/x3daudio1_3/Makefile.in b/dlls/x3daudio1_3/Makefile.in
@@ -4,5 +4,7 @@ PARENTSRC = ../xaudio2_7
 EXTRALIBS = $(FAUDIO_LIBS)
 EXTRAINCL = $(FAUDIO_CFLAGS)
 
+EXTRADLLFLAGS = -Wb,--prefer-native
+
 C_SRCS = \
 	x3daudio.c
diff --git a/dlls/x3daudio1_4/Makefile.in b/dlls/x3daudio1_4/Makefile.in
@@ -4,5 +4,7 @@ PARENTSRC = ../xaudio2_7
 EXTRALIBS = $(FAUDIO_LIBS)
 EXTRAINCL = $(FAUDIO_CFLAGS)
 
+EXTRADLLFLAGS = -Wb,--prefer-native
+
 C_SRCS = \
 	x3daudio.c
diff --git a/dlls/x3daudio1_5/Makefile.in b/dlls/x3daudio1_5/Makefile.in
@@ -4,5 +4,7 @@ PARENTSRC = ../xaudio2_7
 EXTRALIBS = $(FAUDIO_LIBS)
 EXTRAINCL = $(FAUDIO_CFLAGS)
 
+EXTRADLLFLAGS = -Wb,--prefer-native
+
 C_SRCS = \
 	x3daudio.c
diff --git a/dlls/x3daudio1_6/Makefile.in b/dlls/x3daudio1_6/Makefile.in
@@ -4,5 +4,7 @@ PARENTSRC = ../xaudio2_7
 EXTRALIBS = $(FAUDIO_LIBS)
 EXTRAINCL = $(FAUDIO_CFLAGS)
 
+EXTRADLLFLAGS = -Wb,--prefer-native
+
 C_SRCS = \
 	x3daudio.c
diff --git a/dlls/x3daudio1_7/Makefile.in b/dlls/x3daudio1_7/Makefile.in
@@ -4,5 +4,7 @@ PARENTSRC = ../xaudio2_7
 EXTRALIBS = $(FAUDIO_LIBS)
 EXTRAINCL = $(FAUDIO_CFLAGS)
 
+EXTRADLLFLAGS = -Wb,--prefer-native
+
 C_SRCS = \
 	x3daudio.c
diff --git a/dlls/xactengine3_0/Makefile.in b/dlls/xactengine3_0/Makefile.in
@@ -5,6 +5,8 @@ PARENTSRC = ../xactengine3_7
 EXTRALIBS = $(FAUDIO_LIBS)
 EXTRAINCL = $(FAUDIO_CFLAGS)
 
+EXTRADLLFLAGS = $(XAUDIO_NATIVE_SWITCH)
+
 C_SRCS = \
 	xact_dll.c
 

diff --git a/dlls/xactengine3_1/Makefile.in b/dlls/xactengine3_1/Makefile.in
@@ -5,6 +5,8 @@ PARENTSRC = ../xactengine3_7
 EXTRALIBS = $(FAUDIO_LIBS)
 EXTRAINCL = $(FAUDIO_CFLAGS)
 
+EXTRADLLFLAGS = $(XAUDIO_NATIVE_SWITCH)
+
 C_SRCS = \
 	xact_dll.c
 

diff --git a/dlls/xactengine3_2/Makefile.in b/dlls/xactengine3_2/Makefile.in
@@ -5,6 +5,8 @@ PARENTSRC = ../xactengine3_7
 EXTRALIBS = $(FAUDIO_LIBS)
 EXTRAINCL = $(FAUDIO_CFLAGS)
 
+EXTRADLLFLAGS = $(XAUDIO_NATIVE_SWITCH)
+
 C_SRCS = \
 	xact_dll.c
 

diff --git a/dlls/xactengine3_3/Makefile.in b/dlls/xactengine3_3/Makefile.in
@@ -5,6 +5,8 @@ PARENTSRC = ../xactengine3_7
 EXTRALIBS = $(FAUDIO_LIBS)
 EXTRAINCL = $(FAUDIO_CFLAGS)
 
+EXTRADLLFLAGS = $(XAUDIO_NATIVE_SWITCH)
+
 C_SRCS = \
 	xact_dll.c
 

diff --git a/dlls/xactengine3_4/Makefile.in b/dlls/xactengine3_4/Makefile.in
@@ -5,6 +5,8 @@ PARENTSRC = ../xactengine3_7
 EXTRALIBS = $(FAUDIO_LIBS)
 EXTRAINCL = $(FAUDIO_CFLAGS)
 
+EXTRADLLFLAGS = $(XAUDIO_NATIVE_SWITCH)
+
 C_SRCS = \
 	xact_dll.c
 

diff --git a/dlls/xactengine3_5/Makefile.in b/dlls/xactengine3_5/Makefile.in
@@ -5,6 +5,8 @@ PARENTSRC = ../xactengine3_7
 EXTRALIBS = $(FAUDIO_LIBS)
 EXTRAINCL = $(FAUDIO_CFLAGS)
 
+EXTRADLLFLAGS = $(XAUDIO_NATIVE_SWITCH)
+
 C_SRCS = \
 	xact_dll.c
 

diff --git a/dlls/xactengine3_6/Makefile.in b/dlls/xactengine3_6/Makefile.in
@@ -5,6 +5,8 @@ PARENTSRC = ../xactengine3_7
 EXTRALIBS = $(FAUDIO_LIBS)
 EXTRAINCL = $(FAUDIO_CFLAGS)
 
+EXTRADLLFLAGS = $(XAUDIO_NATIVE_SWITCH)
+
 C_SRCS = \
 	xact_dll.c
 

diff --git a/dlls/xactengine3_7/Makefile.in b/dlls/xactengine3_7/Makefile.in
@@ -4,6 +4,8 @@ EXTRADEFS = -DXACT3_VER=0x0307
 EXTRALIBS = $(FAUDIO_LIBS)
 EXTRAINCL = $(FAUDIO_CFLAGS)
 
+EXTRADLLFLAGS = $(XAUDIO_NATIVE_SWITCH)
+
 C_SRCS = \
 	xact_dll.c
 

diff --git a/dlls/xapofx1_1/Makefile.in b/dlls/xapofx1_1/Makefile.in
@@ -5,6 +5,8 @@ PARENTSRC = ../xaudio2_7
 EXTRALIBS = $(FAUDIO_LIBS)
 EXTRAINCL = $(FAUDIO_CFLAGS)
 
+EXTRADLLFLAGS = -Wb,--prefer-native
+
 C_SRCS = \
 	xapo.c \
 	xapofx.c \

diff --git a/dlls/xapofx1_2/Makefile.in b/dlls/xapofx1_2/Makefile.in
@@ -5,6 +5,8 @@ PARENTSRC = ../xaudio2_7
 EXTRALIBS = $(FAUDIO_LIBS)
 EXTRAINCL = $(FAUDIO_CFLAGS)
 
+EXTRADLLFLAGS = -Wb,--prefer-native
+
 C_SRCS = \
 	xapo.c \
 	xapofx.c \

diff --git a/dlls/xapofx1_3/Makefile.in b/dlls/xapofx1_3/Makefile.in
@@ -5,6 +5,8 @@ PARENTSRC = ../xaudio2_7
 EXTRALIBS = $(FAUDIO_LIBS)
 EXTRAINCL = $(FAUDIO_CFLAGS)
 
+EXTRADLLFLAGS = -Wb,--prefer-native
+
 C_SRCS = \
 	xapo.c \
 	xapofx.c \

diff --git a/dlls/xapofx1_4/Makefile.in b/dlls/xapofx1_4/Makefile.in
@@ -5,6 +5,8 @@ PARENTSRC = ../xaudio2_7
 EXTRALIBS = $(FAUDIO_LIBS)
 EXTRAINCL = $(FAUDIO_CFLAGS)
 
+EXTRADLLFLAGS = -Wb,--prefer-native
+
 C_SRCS = \
 	xapo.c \
 	xapofx.c \

diff --git a/dlls/xapofx1_5/Makefile.in b/dlls/xapofx1_5/Makefile.in
@@ -5,6 +5,8 @@ PARENTSRC = ../xaudio2_7
 EXTRALIBS = $(FAUDIO_LIBS)
 EXTRAINCL = $(FAUDIO_CFLAGS)
 
+EXTRADLLFLAGS = -Wb,--prefer-native
+
 C_SRCS = \
 	xapo.c \
 	xapofx.c \

diff --git a/dlls/xaudio2_0/Makefile.in b/dlls/xaudio2_0/Makefile.in
@@ -5,6 +5,8 @@ PARENTSRC = ../xaudio2_7
 EXTRALIBS = $(FAUDIO_LIBS)
 EXTRAINCL = $(FAUDIO_CFLAGS)
 
+EXTRADLLFLAGS = $(XAUDIO_NATIVE_SWITCH)
+
 C_SRCS = \
 	compat.c \
 	xapo.c \

diff --git a/dlls/xaudio2_1/Makefile.in b/dlls/xaudio2_1/Makefile.in
@@ -5,6 +5,8 @@ PARENTSRC = ../xaudio2_7
 EXTRALIBS = $(FAUDIO_LIBS)
 EXTRAINCL = $(FAUDIO_CFLAGS)
 
+EXTRADLLFLAGS = $(XAUDIO_NATIVE_SWITCH)
+
 C_SRCS = \
 	compat.c \
 	xapo.c \

diff --git a/dlls/xaudio2_2/Makefile.in b/dlls/xaudio2_2/Makefile.in
@@ -5,6 +5,8 @@ PARENTSRC = ../xaudio2_7
 EXTRALIBS = $(FAUDIO_LIBS)
 EXTRAINCL = $(FAUDIO_CFLAGS)
 
+EXTRADLLFLAGS = $(XAUDIO_NATIVE_SWITCH)
+
 C_SRCS = \
 	compat.c \
 	xapo.c \

diff --git a/dlls/xaudio2_3/Makefile.in b/dlls/xaudio2_3/Makefile.in
@@ -5,6 +5,8 @@ PARENTSRC = ../xaudio2_7
 EXTRALIBS = $(FAUDIO_LIBS)
 EXTRAINCL = $(FAUDIO_CFLAGS)
 
+EXTRADLLFLAGS = $(XAUDIO_NATIVE_SWITCH)
+
 C_SRCS = \
 	compat.c \
 	xapo.c \

diff --git a/dlls/xaudio2_4/Makefile.in b/dlls/xaudio2_4/Makefile.in
@@ -5,6 +5,8 @@ PARENTSRC = ../xaudio2_7
 EXTRALIBS = $(FAUDIO_LIBS)
 EXTRAINCL = $(FAUDIO_CFLAGS)
 
+EXTRADLLFLAGS = $(XAUDIO_NATIVE_SWITCH)
+
 C_SRCS = \
 	compat.c \
 	xapo.c \

diff --git a/dlls/xaudio2_5/Makefile.in b/dlls/xaudio2_5/Makefile.in
@@ -5,6 +5,8 @@ PARENTSRC = ../xaudio2_7
 EXTRALIBS = $(FAUDIO_LIBS)
 EXTRAINCL = $(FAUDIO_CFLAGS)
 
+EXTRADLLFLAGS = $(XAUDIO_NATIVE_SWITCH)
+
 C_SRCS = \
 	compat.c \
 	xapo.c \

diff --git a/dlls/xaudio2_6/Makefile.in b/dlls/xaudio2_6/Makefile.in
@@ -5,6 +5,8 @@ PARENTSRC = ../xaudio2_7
 EXTRALIBS = $(FAUDIO_LIBS)
 EXTRAINCL = $(FAUDIO_CFLAGS)
 
+EXTRADLLFLAGS = $(XAUDIO_NATIVE_SWITCH)
+
 C_SRCS = \
 	compat.c \
 	xapo.c \

diff --git a/dlls/xaudio2_7/Makefile.in b/dlls/xaudio2_7/Makefile.in
@@ -4,6 +4,8 @@ IMPORTS   = advapi32 ole32 user32 uuid
 EXTRALIBS = $(FAUDIO_LIBS)
 EXTRAINCL = $(FAUDIO_CFLAGS)
 
+EXTRADLLFLAGS = $(XAUDIO_NATIVE_SWITCH)
+
 C_SRCS = \
 	compat.c \
 	x3daudio.c \

diff --git a/dlls/xaudio2_8/Makefile.in b/dlls/xaudio2_8/Makefile.in
@@ -5,6 +5,8 @@ PARENTSRC = ../xaudio2_7
 EXTRALIBS = $(FAUDIO_LIBS)
 EXTRAINCL = $(FAUDIO_CFLAGS)
 
+EXTRADLLFLAGS = $(XAUDIO_NATIVE_SWITCH)
+
 C_SRCS = \
 	compat.c \
 	x3daudio.c \

diff --git a/dlls/xaudio2_9/Makefile.in b/dlls/xaudio2_9/Makefile.in
@@ -5,6 +5,8 @@ PARENTSRC = ../xaudio2_7
 EXTRALIBS = $(FAUDIO_LIBS)
 EXTRAINCL = $(FAUDIO_CFLAGS)
 
+EXTRADLLFLAGS = $(XAUDIO_NATIVE_SWITCH)
+
 C_SRCS = \
 	compat.c \
 	x3daudio.c \