From: Alistair Leslie-Hughes leslie_alistair@hotmail.com
--- configure | 28 ++++++++++++++++++++++++++++ configure.ac | 2 ++ libs/wined3dx/Makefile.in | 4 ++++ libs/wined3dx/texture.c | 24 ++++++++++++++++++++++++ libs/wined3dx/wined3dx.h | 24 ++++++++++++++++++++++++ 5 files changed, 82 insertions(+) create mode 100644 libs/wined3dx/Makefile.in create mode 100644 libs/wined3dx/texture.c create mode 100644 libs/wined3dx/wined3dx.h
diff --git a/configure b/configure index 9c15f952298..2e8d5bdc118 100755 --- a/configure +++ b/configure @@ -720,6 +720,8 @@ XSLT_PE_LIBS XSLT_PE_CFLAGS XML2_PE_LIBS XML2_PE_CFLAGS +WINED3DX_PE_LIBS +WINED3DX_PE_CFLAGS VKD3D_PE_LIBS VKD3D_PE_CFLAGS TIFF_PE_LIBS @@ -1596,6 +1598,7 @@ enable_tiff enable_uuid enable_vkd3d enable_wbemuuid +enable_wined3dx enable_wmcodecdspuuid enable_xml2 enable_xslt @@ -1756,6 +1759,8 @@ TIFF_PE_CFLAGS TIFF_PE_LIBS VKD3D_PE_CFLAGS VKD3D_PE_LIBS +WINED3DX_PE_CFLAGS +WINED3DX_PE_LIBS XML2_PE_CFLAGS XML2_PE_LIBS XSLT_PE_CFLAGS @@ -2558,6 +2563,11 @@ Some influential environment variables: version VKD3D_PE_LIBS Linker flags for the PE vkd3d, overriding the bundled version + WINED3DX_PE_CFLAGS + C compiler flags for the PE wined3dx, overriding the bundled + version + WINED3DX_PE_LIBS + Linker flags for the PE wined3dx, overriding the bundled version XML2_PE_CFLAGS C compiler flags for the PE xml2, overriding the bundled version XML2_PE_LIBS @@ -13202,6 +13212,21 @@ fi printf "%s\n" "$as_me:${as_lineno-$LINENO}: vkd3d cflags: $VKD3D_PE_CFLAGS" >&5 printf "%s\n" "$as_me:${as_lineno-$LINENO}: vkd3d libs: $VKD3D_PE_LIBS" >&5
+if ${WINED3DX_PE_LIBS:+false} : +then : + WINED3DX_PE_LIBS="wined3dx dxguid windowscodecs" + if ${WINED3DX_PE_CFLAGS:+false} : +then : + WINED3DX_PE_CFLAGS="-I$(top_srcdir)/libs/wined3dx" +else $as_nop + enable_wined3dx=no +fi +else $as_nop + enable_wined3dx=no +fi +printf "%s\n" "$as_me:${as_lineno-$LINENO}: wined3dx cflags: $WINED3DX_PE_CFLAGS" >&5 +printf "%s\n" "$as_me:${as_lineno-$LINENO}: wined3dx libs: $WINED3DX_PE_LIBS" >&5 + if ${XML2_PE_LIBS:+false} : then : XML2_PE_LIBS=xml2 @@ -22074,6 +22099,7 @@ wine_fn_config_makefile libs/tiff enable_tiff wine_fn_config_makefile libs/uuid enable_uuid wine_fn_config_makefile libs/vkd3d enable_vkd3d wine_fn_config_makefile libs/wbemuuid enable_wbemuuid +wine_fn_config_makefile libs/wined3dx enable_wined3dx wine_fn_config_makefile libs/wmcodecdspuuid enable_wmcodecdspuuid wine_fn_config_makefile libs/xml2 enable_xml2 wine_fn_config_makefile libs/xslt enable_xslt @@ -23232,6 +23258,8 @@ TIFF_PE_CFLAGS = $TIFF_PE_CFLAGS TIFF_PE_LIBS = $TIFF_PE_LIBS VKD3D_PE_CFLAGS = $VKD3D_PE_CFLAGS VKD3D_PE_LIBS = $VKD3D_PE_LIBS +WINED3DX_PE_CFLAGS = $WINED3DX_PE_CFLAGS +WINED3DX_PE_LIBS = $WINED3DX_PE_LIBS XML2_PE_CFLAGS = $XML2_PE_CFLAGS XML2_PE_LIBS = $XML2_PE_LIBS XSLT_PE_CFLAGS = $XSLT_PE_CFLAGS diff --git a/configure.ac b/configure.ac index dab2bb07302..abc53604dde 100644 --- a/configure.ac +++ b/configure.ac @@ -1147,6 +1147,7 @@ WINE_EXTLIB_FLAGS(MUSL, musl, musl) WINE_EXTLIB_FLAGS(PNG, png, "png $(ZLIB_PE_LIBS)", "-I$(top_srcdir)/libs/png") WINE_EXTLIB_FLAGS(TIFF, tiff, "tiff $(ZLIB_PE_LIBS)", "-I$(top_srcdir)/libs/tiff/libtiff") WINE_EXTLIB_FLAGS(VKD3D, vkd3d, vkd3d, "-I$(top_srcdir)/libs/vkd3d/include") +WINE_EXTLIB_FLAGS(WINED3DX, wined3dx, "wined3dx dxguid windowscodecs", "-I$(top_srcdir)/libs/wined3dx") WINE_EXTLIB_FLAGS(XML2, xml2, xml2, "-I$(top_srcdir)/libs/xml2/include -DLIBXML_STATIC") WINE_EXTLIB_FLAGS(XSLT, xslt, xslt, "-I$(top_srcdir)/libs/xslt/libxslt -I$(top_srcdir)/libs/xslt -DLIBXSLT_STATIC") WINE_EXTLIB_FLAGS(ZLIB, zlib, z, "-I$(top_srcdir)/libs/zlib -DFAR= -DZ_SOLO") @@ -3336,6 +3337,7 @@ WINE_CONFIG_MAKEFILE(libs/tiff) WINE_CONFIG_MAKEFILE(libs/uuid) WINE_CONFIG_MAKEFILE(libs/vkd3d) WINE_CONFIG_MAKEFILE(libs/wbemuuid) +WINE_CONFIG_MAKEFILE(libs/wined3dx) WINE_CONFIG_MAKEFILE(libs/wmcodecdspuuid) WINE_CONFIG_MAKEFILE(libs/xml2) WINE_CONFIG_MAKEFILE(libs/xslt) diff --git a/libs/wined3dx/Makefile.in b/libs/wined3dx/Makefile.in new file mode 100644 index 00000000000..9ef77a13eea --- /dev/null +++ b/libs/wined3dx/Makefile.in @@ -0,0 +1,4 @@ +STATICLIB = libwined3dx.a + +C_SRCS = \ + texture.c diff --git a/libs/wined3dx/texture.c b/libs/wined3dx/texture.c new file mode 100644 index 00000000000..1bf084184ab --- /dev/null +++ b/libs/wined3dx/texture.c @@ -0,0 +1,24 @@ +/* + * Copyright 2023 Alistair Leslie-Hughes + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "wined3dx.h" + +void function(void) +{ + /* Place Holder */ +} diff --git a/libs/wined3dx/wined3dx.h b/libs/wined3dx/wined3dx.h new file mode 100644 index 00000000000..6d5ff10ac67 --- /dev/null +++ b/libs/wined3dx/wined3dx.h @@ -0,0 +1,24 @@ +/* + * Copyright 2023 Alistair Leslie-Hughes + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ +#ifndef __WINED3DX_H__ +#define __WINED3DX_H__ + +/* Place Holder */ + + +#endif