diff options
author | Joshua Ashton <joshua@froggi.es> | 2020-06-26 18:27:05 +0300 |
---|---|---|
committer | Joshua Ashton <joshua@froggi.es> | 2020-06-26 18:27:05 +0300 |
commit | a996c82adc750bbe2527ef96e026c51c08c49785 (patch) | |
tree | c71ea7153823b99428d650073c692e00f53fc832 | |
parent | 9564f57a6935544d0ee5f0bee6818403c75c7114 (diff) |
build: Remove autotoolsdump-autotools
Signed-off-by: Joshua Ashton <joshua@froggi.es>
-rw-r--r-- | .gitignore | 25 | ||||
-rw-r--r-- | Makefile.am | 287 | ||||
-rwxr-xr-x | autogen.sh | 4 | ||||
-rw-r--r-- | bin/.gitignore | 9 | ||||
-rw-r--r-- | configure.ac | 133 | ||||
-rw-r--r-- | crosslibs/.gitignore | 1 | ||||
-rw-r--r-- | demos/.gitignore | 3 | ||||
-rw-r--r-- | include/.gitignore | 13 | ||||
-rw-r--r-- | libs/.gitignore | 1 | ||||
-rw-r--r-- | libs/vkd3d-shader/libvkd3d-shader.pc.in | 10 | ||||
-rw-r--r-- | libs/vkd3d-shader/vkd3d_shader.def | 13 | ||||
-rw-r--r-- | libs/vkd3d-shader/vkd3d_shader.map | 17 | ||||
-rw-r--r-- | libs/vkd3d-utils/libvkd3d-utils.pc.in | 10 | ||||
-rw-r--r-- | libs/vkd3d-utils/vkd3d_utils.def | 13 | ||||
-rw-r--r-- | libs/vkd3d-utils/vkd3d_utils.map | 16 | ||||
-rw-r--r-- | libs/vkd3d/libvkd3d.pc.in | 10 | ||||
-rw-r--r-- | libs/vkd3d/vkd3d.def | 23 | ||||
-rw-r--r-- | libs/vkd3d/vkd3d.map | 27 | ||||
-rw-r--r-- | m4/.gitignore | 5 | ||||
-rw-r--r-- | m4/ax_compare_version.m4 | 177 | ||||
-rw-r--r-- | m4/check-cflags.m4 | 16 | ||||
-rw-r--r-- | m4/check-functions.m4 | 55 | ||||
-rw-r--r-- | m4/check-mingw-prog.m4 | 41 | ||||
-rw-r--r-- | m4/check-pthread.m4 | 21 | ||||
-rw-r--r-- | m4/check-soname.m4 | 54 | ||||
-rw-r--r-- | m4/ld-version-script.m4 | 48 | ||||
-rw-r--r-- | m4/vulkan.m4 | 18 | ||||
-rw-r--r-- | m4/widl.m4 | 14 | ||||
-rw-r--r-- | tests/.gitignore | 5 |
29 files changed, 0 insertions, 1069 deletions
@@ -1,28 +1,3 @@ -aclocal.m4 -autom4te.cache -config.log -config.status -configure -libtool -Makefile -Makefile.in -test-suite.log -vkd3d-compiler - -vkd3d-*.tar.xz - -*.exe -*.la -*.lo -*.log -*.o -*.pc -*.trs -*~ - -.deps -.dirstamp -.libs build build.native build.cross diff --git a/Makefile.am b/Makefile.am deleted file mode 100644 index ec4fa061..00000000 --- a/Makefile.am +++ /dev/null @@ -1,287 +0,0 @@ -ACLOCAL_AMFLAGS = -I m4 -AM_CFLAGS = @VKD3D_CFLAGS@ -DPACKAGE_VERSION=\"$(PACKAGE_VERSION)\" -D_GNU_SOURCE -AM_CPPFLAGS = -I$(srcdir)/include -I$(srcdir)/include/dummy -I$(srcdir)/include/private -I$(srcdir)/subprojects/SPIRV-Headers/include -I$(srcdir)/subprojects/Vulkan-Headers/include -AM_LDFLAGS = -no-undefined - -widl_headers = \ - include/vkd3d_d3d12.h \ - include/vkd3d_d3d12sdklayers.h \ - include/vkd3d_d3dcommon.h \ - include/vkd3d_dxgi.h \ - include/vkd3d_dxgi1_2.h \ - include/vkd3d_dxgi1_3.h \ - include/vkd3d_dxgi1_4.h \ - include/vkd3d_dxgibase.h \ - include/vkd3d_dxgiformat.h \ - include/vkd3d_dxgitype.h - -vkd3d_public_headers = \ - include/vkd3d.h \ - include/vkd3d_d3d12.h \ - include/vkd3d_d3d12sdklayers.h \ - include/vkd3d_d3dcommon.h \ - include/vkd3d_dxgibase.h \ - include/vkd3d_dxgiformat.h \ - include/vkd3d_shader.h \ - include/vkd3d_types.h \ - include/vkd3d_utils.h \ - include/vkd3d_windows.h \ - include/vkd3d_sonames.h - -vkd3d_demos_shaders = \ - demos/gears.hlsl \ - demos/gears_ps_flat.h \ - demos/gears_ps_smooth.h \ - demos/gears_vs.h \ - demos/triangle.hlsl \ - demos/triangle_ps.h \ - demos/triangle_vs.h - -vkd3d_tests = \ - tests/vkd3d_api \ - tests/vkd3d_common \ - tests/vkd3d_shader_api - -vkd3d_cross_tests = \ - tests/d3d12 \ - tests/d3d12_invalid_usage - -vkd3d_test_headers = \ - tests/d3d12_crosstest.h \ - tests/d3d12_test_utils.h - -vkd3d_demos = \ - demos/gears \ - demos/triangle - -vkd3d_demos_headers = \ - demos/demo.h \ - demos/demo_win32.h \ - demos/demo_xcb.h - -BUILT_SOURCES = $(widl_headers) - -noinst_LTLIBRARIES = libvkd3d-common.la -libvkd3d_common_la_SOURCES = \ - include/private/vkd3d_debug.h \ - libs/vkd3d-common/debug.c \ - libs/vkd3d-common/memory.c \ - libs/vkd3d-common/utf8.c - -lib_LTLIBRARIES = libvkd3d-shader.la libvkd3d.la libvkd3d-utils.la - -libvkd3d_shader_la_SOURCES = \ - include/private/list.h \ - include/private/rbtree.h \ - include/private/vkd3d_common.h \ - include/private/vkd3d_spinlock.h \ - include/private/vkd3d_debug.h \ - include/private/vkd3d_memory.h \ - include/vkd3d_shader.h \ - libs/vkd3d-shader/checksum.c \ - libs/vkd3d-shader/dxbc.c \ - libs/vkd3d-shader/spirv.c \ - libs/vkd3d-shader/trace.c \ - libs/vkd3d-shader/vkd3d_shader.map \ - libs/vkd3d-shader/vkd3d_shader_main.c \ - libs/vkd3d-shader/vkd3d_shader_private.h -libvkd3d_shader_la_CFLAGS = $(AM_CFLAGS) @dxil_spirv_c_shared_CFLAGS@ -libvkd3d_shader_la_LDFLAGS = $(AM_LDFLAGS) -version-info 1:0:0 -libvkd3d_shader_la_LIBADD = libvkd3d-common.la @dxil_spirv_c_shared_LIBS@ -if HAVE_LD_VERSION_SCRIPT -libvkd3d_shader_la_LDFLAGS += -Wl,--version-script=$(srcdir)/libs/vkd3d-shader/vkd3d_shader.map -EXTRA_libvkd3d_shader_la_DEPENDENCIES = $(srcdir)/libs/vkd3d-shader/vkd3d_shader.map -endif -if HAVE_DXIL_SPV -libvkd3d_shader_la_SOURCES += \ - libs/vkd3d-shader/dxil.c -endif - -libvkd3d_la_SOURCES = \ - include/private/vkd3d_atomic.h \ - include/private/vkd3d_common.h \ - include/private/vkd3d_spinlock.h \ - include/private/vkd3d_debug.h \ - include/private/vkd3d_memory.h \ - include/private/vkd3d_private.h \ - include/private/vkd3d_utf8.h \ - include/private/vkd3d_test.h \ - include/vkd3d_d3d12.idl \ - include/vkd3d_d3dcommon.idl \ - include/vkd3d_unknown.idl \ - libs/vkd3d/command.c \ - libs/vkd3d/device.c \ - libs/vkd3d/meta.c \ - libs/vkd3d/platform.c \ - libs/vkd3d/resource.c \ - libs/vkd3d/state.c \ - libs/vkd3d/utils.c \ - libs/vkd3d/vkd3d.map \ - libs/vkd3d/vkd3d_main.c \ - libs/vkd3d/vkd3d_private.h \ - libs/vkd3d/vkd3d_shaders.h \ - libs/vkd3d/vulkan_procs.h \ - libs/vkd3d_version.c -libvkd3d_la_LDFLAGS = $(AM_LDFLAGS) -version-info 2:0:1 -libvkd3d_la_LIBADD = libvkd3d-common.la libvkd3d-shader.la @DL_LIBS@ @PTHREAD_LIBS@ -if HAVE_LD_VERSION_SCRIPT -libvkd3d_la_LDFLAGS += -Wl,--version-script=$(srcdir)/libs/vkd3d/vkd3d.map -EXTRA_libvkd3d_la_DEPENDENCIES = $(srcdir)/libs/vkd3d/vkd3d.map -endif - -libvkd3d_utils_la_SOURCES = \ - libs/vkd3d-utils/vkd3d_utils.map \ - libs/vkd3d-utils/vkd3d_utils_main.c \ - libs/vkd3d-utils/vkd3d_utils_private.h -libvkd3d_utils_la_LDFLAGS = $(AM_LDFLAGS) -version-info 1:1:0 -libvkd3d_utils_la_LIBADD = libvkd3d-common.la libvkd3d.la -if HAVE_LD_VERSION_SCRIPT -libvkd3d_utils_la_LDFLAGS += -Wl,--version-script=$(srcdir)/libs/vkd3d-utils/vkd3d_utils.map -EXTRA_libvkd3d_utils_la_DEPENDENCIES = $(srcdir)/libs/vkd3d-utils/vkd3d_utils.map -endif - -EXTRA_DIST = LICENSE - -pkgconfigdir = $(libdir)/pkgconfig -pkginclude_HEADERS = $(vkd3d_public_headers) -nodist_pkgconfig_DATA = libvkd3d.pc libvkd3d-shader.pc libvkd3d-utils.pc -CLEANFILES = libvkd3d.pc libvkd3d-shader.pc libvkd3d-utils.pc -EXTRA_DIST += \ - libs/vkd3d/libvkd3d.pc.in \ - libs/vkd3d-shader/libvkd3d-shader.pc.in \ - libs/vkd3d-utils/libvkd3d-utils.pc.in - -noinst_PROGRAMS = vkd3d-compiler -vkd3d_compiler_SOURCES = programs/vkd3d-compiler/main.c -vkd3d_compiler_LDADD = libvkd3d-shader.la - -LDADD = libvkd3d.la libvkd3d-utils.la -AM_DEFAULT_SOURCE_EXT = .c -if BUILD_TESTS -check_PROGRAMS = $(vkd3d_tests) $(vkd3d_cross_tests) -TESTS = $(vkd3d_tests) $(vkd3d_cross_tests) -tests_d3d12_LDADD = $(LDADD) @PTHREAD_LIBS@ -tests_d3d12_invalid_usage_LDADD = $(LDADD) -tests_vkd3d_api_LDADD = libvkd3d.la -tests_vkd3d_shader_api_LDADD = libvkd3d-shader.la -endif - -if BUILD_DEMOS -DEMOS_LDADD = $(LDADD) libvkd3d-shader.la @XCB_LIBS@ @DL_LIBS@ -DEMOS_CFLAGS = $(AM_CFLAGS) @XCB_CFLAGS@ -noinst_PROGRAMS += $(vkd3d_demos) - -demos_gears_CFLAGS = $(DEMOS_CFLAGS) -demos_gears_LDADD = $(DEMOS_LDADD) -lm - -demos_triangle_CFLAGS = $(DEMOS_CFLAGS) -demos_triangle_LDADD = $(DEMOS_LDADD) -endif - -EXTRA_DIST += $(vkd3d_test_headers) $(vkd3d_demos_headers) - -VKD3D_V_WIDL = $(vkd3d_v_widl_@AM_V@) -vkd3d_v_widl_ = $(vkd3d_v_widl_@AM_DEFAULT_V@) -vkd3d_v_widl_0 = @echo " WIDL " $@; -vkd3d_v_widl_1 = - -EXTRA_DIST += $(widl_headers) $(widl_headers:.h=.idl) -$(widl_headers): %.h: %.idl -if HAVE_WIDL - $(VKD3D_V_WIDL)$(WIDL) -h -o $@ $< -else - @echo "widl is required to generate $@" -endif - -EXTRA_DIST += $(vkd3d_demos_shaders) - -libvkd3d-utils.pc: $(srcdir)/libs/vkd3d-utils/libvkd3d-utils.pc.in Makefile - $(AM_V_GEN)$(SED) -e 's![@]prefix[@]!$(prefix)!g' \ - -e 's![@]exec_prefix[@]!$(exec_prefix)!g' \ - -e 's![@]includedir[@]!$(includedir)!g' \ - -e 's![@]libdir[@]!$(libdir)!g' \ - -e 's![@]PACKAGE_VERSION[@]!$(PACKAGE_VERSION)!g' \ - $< > $@ - -libvkd3d-shader.pc: $(srcdir)/libs/vkd3d-shader/libvkd3d-shader.pc.in Makefile - $(AM_V_GEN)$(SED) -e 's![@]prefix[@]!$(prefix)!g' \ - -e 's![@]exec_prefix[@]!$(exec_prefix)!g' \ - -e 's![@]includedir[@]!$(includedir)!g' \ - -e 's![@]libdir[@]!$(libdir)!g' \ - -e 's![@]PACKAGE_VERSION[@]!$(PACKAGE_VERSION)!g' \ - $< > $@ - -libvkd3d.pc: $(srcdir)/libs/vkd3d/libvkd3d.pc.in Makefile - $(AM_V_GEN)$(SED) -e 's![@]prefix[@]!$(prefix)!g' \ - -e 's![@]exec_prefix[@]!$(exec_prefix)!g' \ - -e 's![@]includedir[@]!$(includedir)!g' \ - -e 's![@]libdir[@]!$(libdir)!g' \ - -e 's![@]PACKAGE_VERSION[@]!$(PACKAGE_VERSION)!g' \ - $< > $@ - -libs/vkd3d_version.c: dummy-vkd3d-version - $(AM_V_GEN)version=`(GIT_DIR=$(top_srcdir)/.git git describe HEAD 2>/dev/null || echo "vkd3d-$(PACKAGE_VERSION)") | $(SED) -n -e '$$s/\(.*\)/const char vkd3d_build[] = "\1";/p'` && (echo $$version | cmp -s - $@) || echo $$version >$@ || ($(RM) $@ && exit 1) -.SILENT: libs/vkd3d_version.c -CLEANFILES += libs/vkd3d_version.c - -.PHONY: dummy-vkd3d-version -dummy-vkd3d-version: - -## Cross-compile tests -cross_implibs = crosslibs/d3d12 -CROSS_CPPFLAGS = -I$(srcdir)/include -I$(srcdir)/include/private -I$(builddir)/include -CROSS_CFLAGS = -g -O2 -Wall -municode ${CROSS_CPPFLAGS} -EXTRA_DIST += $(cross_implibs:=.cross32.def) $(cross_implibs:=.cross64.def) - -if HAVE_CROSSTARGET32 -CROSS32_CC = @CROSSCC32@ -CROSS32_DLLTOOL = @CROSSTARGET32@-dlltool -CROSS32_IMPLIBS = $(cross_implibs:=.cross32.a) -CROSS32_EXEFILES = $(vkd3d_cross_tests:=.cross32.exe) $(vkd3d_demos:=.cross32.exe) -CROSS32_FILES = $(CROSS32_IMPLIBS) $(CROSS32_EXEFILES) - -CLEANFILES += $(CROSS32_FILES) -crosstest32: $(CROSS32_FILES) - --include tests/$(DEPDIR)/*.cross32.Po --include demos/$(DEPDIR)/*.cross32.Po - -$(CROSS32_IMPLIBS): %.cross32.a: %.cross32.def - @${MKDIR_P} crosslibs - $(AM_V_GEN)$(CROSS32_DLLTOOL) -k -m i386 --as-flags=-32 -d $< -l $@ - -$(CROSS32_EXEFILES): %.cross32.exe: %.c $(CROSS32_IMPLIBS) $(widl_headers) - $(AM_V_CCLD)depbase=`echo $@ | $(SED) 's![^/]*$$!$(DEPDIR)/&!;s!\.exe$$!!'`; \ - $(CROSS32_CC) $(CROSS_CFLAGS) -MT $@ -MD -MP -MF $$depbase.Tpo -o $@ $< $(CROSS32_IMPLIBS) -ldxgi -lgdi32 && \ - $(am__mv) $$depbase.Tpo $$depbase.Po -else -crosstest32: -endif - -if HAVE_CROSSTARGET64 -CROSS64_CC = @CROSSCC64@ -CROSS64_DLLTOOL = @CROSSTARGET64@-dlltool -CROSS64_IMPLIBS = $(cross_implibs:=.cross64.a) -CROSS64_EXEFILES = $(vkd3d_cross_tests:=.cross64.exe) $(vkd3d_demos:=.cross64.exe) -CROSS64_FILES = $(CROSS64_IMPLIBS) $(CROSS64_EXEFILES) - -CLEANFILES += $(CROSS64_FILES) -crosstest64: $(CROSS64_FILES) - --include tests/$(DEPDIR)/*.cross64.Po --include demos/$(DEPDIR)/*.cross64.Po - -$(CROSS64_IMPLIBS): %.cross64.a: %.cross64.def - @${MKDIR_P} crosslibs - $(AM_V_GEN)$(CROSS64_DLLTOOL) -k -m i386:x86-64 --as-flags=-64 -d $< -l $@ - -$(CROSS64_EXEFILES): %.cross64.exe: %.c $(CROSS64_IMPLIBS) $(widl_headers) - $(AM_V_CCLD)depbase=`echo $@ | sed 's![^/]*$$!$(DEPDIR)/&!;s!\.exe$$!!'`; \ - $(CROSS64_CC) $(CROSS_CFLAGS) -MT $@ -MD -MP -MF $$depbase.Tpo -o $@ $< $(CROSS64_IMPLIBS) -ldxgi -lgdi32 && \ - $(am__mv) $$depbase.Tpo $$depbase.Po -else -crosstest64: -endif - -.PHONY: crosstest crosstest32 crosstest64 -crosstest: crosstest32 crosstest64 diff --git a/autogen.sh b/autogen.sh deleted file mode 100755 index 845c8d89..00000000 --- a/autogen.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/sh -set -e -autoreconf -ifv -rm -rf autom4te.cache diff --git a/bin/.gitignore b/bin/.gitignore deleted file mode 100644 index 270bf15a..00000000 --- a/bin/.gitignore +++ /dev/null @@ -1,9 +0,0 @@ -ar-lib -compile -config.guess -config.sub -depcomp -install-sh -ltmain.sh -missing -test-driver diff --git a/configure.ac b/configure.ac deleted file mode 100644 index 2b502828..00000000 --- a/configure.ac +++ /dev/null @@ -1,133 +0,0 @@ -AC_PREREQ([2.69]) -AC_INIT([vkd3d],[1.1]) - -AC_CONFIG_AUX_DIR([bin]) -AC_CONFIG_MACRO_DIR([m4]) -AC_CONFIG_HEADERS(include/config.h) - -AC_ARG_VAR([WIDL], [widl IDL compiler]) -AC_ARG_VAR([CROSSCC32], [32-bit Windows cross compiler]) -AC_ARG_VAR([CROSSCC64], [64-bit Windows cross compiler]) -AC_ARG_WITH([xcb], AS_HELP_STRING([--with-xcb], [Build with XCB library (default: test)])) -AC_ARG_WITH([dxil-spirv], AS_HELP_STRING([--with-dxil-spirv], - [Build with dxil-spirv library for DXIL support (default: enabled)])) -AC_ARG_ENABLE([demos], - AS_HELP_STRING([--enable-demos], [Build demo programs (default: disabled)]),, - [enable_demos=no]) -AC_ARG_ENABLE([tests], - AS_HELP_STRING([--enable-tests], [Build tests (default: enabled)]),, - [enable_tests=yes]) - -AC_USE_SYSTEM_EXTENSIONS - -dnl Check for progs -AM_PROG_AR -AC_PROG_CC -AM_PROG_CC_C_O -AC_PROG_SED -AC_PROG_MKDIR_P -VKD3D_PROG_WIDL(3, 20) -AS_IF([test "x$WIDL" = "xno"], [AC_MSG_WARN([widl is required to build header files.])]) - -AM_INIT_AUTOMAKE([1.11 foreign silent-rules subdir-objects no-dist-gzip dist-xz -Wall -Werror]) -AM_MAINTAINER_MODE([enable]) -AM_SILENT_RULES([yes]) - -LT_PREREQ([2.4.2]) -LT_INIT([win32-dll]) - -gl_LD_VERSION_SCRIPT - -dnl Check compiler specific flags -AC_SUBST([VKD3D_CFLAGS]) -AS_IF([test "x${GCC}" = "xyes"], - [VKD3D_CFLAGS="-Wall -pipe" - VKD3D_CHECK_CFLAGS([-std=c99]) - VKD3D_CHECK_CFLAGS([-Wdeclaration-after-statement]) - VKD3D_CHECK_CFLAGS([-Wimplicit-fallthrough]) - VKD3D_CHECK_CFLAGS([-Wmissing-prototypes]) - VKD3D_CHECK_CFLAGS([-Wunused-but-set-parameter]) - VKD3D_CHECK_CFLAGS([-Wvla]) - VKD3D_CHECK_CFLAGS([-Wpointer-arith]) - VKD3D_CHECK_CFLAGS([-Wl,--no-undefined])]) - -dnl Check for cross compilers -VKD3D_CHECK_MINGW32_PROG([CROSSCC32], [CROSSTARGET32], [no]) -VKD3D_CHECK_MINGW64_PROG([CROSSCC64], [CROSSTARGET64], [no]) - -dnl Check for headers -AC_CHECK_HEADERS([dlfcn.h pthread.h]) -AS_IF([test "x$ac_cv_header_pthread_h" != "xyes"], [AC_MSG_ERROR([pthread.h not found.])]) - -VKD3D_CHECK_VULKAN_HEADER_VERSION([140], [AC_MSG_ERROR([Vulkan headers are too old, 1.2.140 is required.])]) - -AC_CHECK_DECLS([program_invocation_name],,,[#include <errno.h>]) - -dnl Check for libraries -m4_ifdef([PKG_PROG_PKG_CONFIG], [PKG_PROG_PKG_CONFIG], [m4_fatal([pkg-config autoconf macros not found.])]) - -AC_CHECK_LIB([m], [ceilf]) - -AC_SUBST([DL_LIBS]) -AC_CHECK_LIB([dl], [dlopen], - [DL_LIBS="-ldl"], - [AS_IF([test "$ac_cv_header_dlfnc_h" = "xyes"], [AC_MSG_ERROR([libdl not found.])])]) - -AC_ARG_VAR([PTHREAD_LIBS], [linker flags for pthreads]) -VKD3D_CHECK_PTHREAD - -HAVE_XCB=no -AS_IF([test "x$with_xcb" != "xno"], - [PKG_CHECK_MODULES([XCB], [xcb xcb-keysyms], - [AC_DEFINE([HAVE_XCB], [1], [Define to 1 if you have libxcb.]) - HAVE_XCB=yes], - [HAVE_XCB=no])]) - -HAVE_DXIL_SPV=no -AS_IF([test "x$with_dxil_spirv" != "xno"], - [PKG_CHECK_MODULES([dxil_spirv_c_shared], [dxil-spirv-c-shared], - [AC_DEFINE([HAVE_DXIL_SPV], [1], [Define to 1 if you have dxil-spirv.]) - HAVE_DXIL_SPV=yes], [HAVE_DXIL_SPV=no])], - [HAVE_DXIL_SPV=no]) - -dnl Check for functions -VKD3D_CHECK_FUNC([HAVE_BUILTIN_CLZ], [__builtin_clz], [__builtin_clz(0)]) -VKD3D_CHECK_FUNC([HAVE_BUILTIN_CTZLL], [__builtin_ctzll], [__builtin_ctzll(0)]) -VKD3D_CHECK_FUNC([HAVE_BUILTIN_POPCOUNT], [__builtin_popcount], [__builtin_popcount(0)]) -VKD3D_CHECK_FUNC([HAVE_SYNC_ADD_AND_FETCH], [__sync_add_and_fetch], [__sync_add_and_fetch((int *)0, 0)]) -VKD3D_CHECK_FUNC([HAVE_SYNC_SUB_AND_FETCH], [__sync_sub_and_fetch], [__sync_sub_and_fetch((int *)0, 0)]) - -VKD3D_CHECK_PTHREAD_SETNAME_NP - -dnl Makefiles -AS_IF([test "x$enable_demos" = "xyes" -a "x$HAVE_XCB" != "xyes"], - [AC_MSG_ERROR([libxcb is required for demos.])]) -AM_CONDITIONAL([BUILD_DEMOS], [test "x$enable_demos" = "xyes"]) -AM_CONDITIONAL([BUILD_TESTS], [test "x$enable_tests" != "xno"]) -AM_CONDITIONAL([HAVE_WIDL], [test "x$WIDL" != "xno"]) -AM_CONDITIONAL([HAVE_CROSSTARGET32], [test "x$CROSSTARGET32" != "xno"]) -AM_CONDITIONAL([HAVE_CROSSTARGET64], [test "x$CROSSTARGET64" != "xno"]) -AM_CONDITIONAL([HAVE_DXIL_SPV], [test "x$HAVE_DXIL_SPV" = "xyes"]) - -AC_CONFIG_FILES([Makefile]) -AC_OUTPUT - -dnl Output configuration summary -AS_IF([test "x$CROSSTARGET32" != "xno" -o "x$CROSSTARGET64" != "xno"], - [HAVE_CROSSTEST=yes], [HAVE_CROSSTEST=no]) - -AS_ECHO([" - Configuration summary for $PACKAGE $VERSION - - widl: ${WIDL} - - Have XCB: ${HAVE_XCB} - Have dxil-spirv: ${HAVE_DXIL_SPV} - - Building demos: ${enable_demos} - Building tests: ${enable_tests} - - Building crosstests: ${HAVE_CROSSTEST}"]) -AS_IF([test "x$CROSSTARGET32" != "xno"], [AS_ECHO([" Using 32-bit cross compiler: $CROSSCC32"])]) -AS_IF([test "x$CROSSTARGET64" != "xno"], [AS_ECHO([" Using 64-bit cross compiler: $CROSSCC64"])]) -AS_ECHO([]) diff --git a/crosslibs/.gitignore b/crosslibs/.gitignore deleted file mode 100644 index 10301e28..00000000 --- a/crosslibs/.gitignore +++ /dev/null @@ -1 +0,0 @@ -*.a diff --git a/demos/.gitignore b/demos/.gitignore deleted file mode 100644 index afb83ec5..00000000 --- a/demos/.gitignore +++ /dev/null @@ -1,3 +0,0 @@ -gears -triangle -*.spv diff --git a/include/.gitignore b/include/.gitignore deleted file mode 100644 index 7ed2b780..00000000 --- a/include/.gitignore +++ /dev/null @@ -1,13 +0,0 @@ -config.h -config.h.in -stamp-h1 -vkd3d_d3d12.h -vkd3d_d3d12sdklayers.h -vkd3d_d3dcommon.h -vkd3d_dxgi.h -vkd3d_dxgi1_2.h -vkd3d_dxgi1_3.h -vkd3d_dxgi1_4.h -vkd3d_dxgibase.h -vkd3d_dxgiformat.h -vkd3d_dxgitype.h diff --git a/libs/.gitignore b/libs/.gitignore deleted file mode 100644 index b4fc05a2..00000000 --- a/libs/.gitignore +++ /dev/null @@ -1 +0,0 @@ -vkd3d_version.c diff --git a/libs/vkd3d-shader/libvkd3d-shader.pc.in b/libs/vkd3d-shader/libvkd3d-shader.pc.in deleted file mode 100644 index b93e6ed9..00000000 --- a/libs/vkd3d-shader/libvkd3d-shader.pc.in +++ /dev/null @@ -1,10 +0,0 @@ -prefix=@prefix@ -exec_prefix=@exec_prefix@ -libdir=@libdir@ -includedir=@includedir@ - -Name: vkd3d-shader -Description: The vkd3d Shader Translation Library -Version: @PACKAGE_VERSION@ -Cflags: -I${includedir}/vkd3d -Libs: -L${libdir} -lvkd3d-shader diff --git a/libs/vkd3d-shader/vkd3d_shader.def b/libs/vkd3d-shader/vkd3d_shader.def deleted file mode 100644 index 2d45d131..00000000 --- a/libs/vkd3d-shader/vkd3d_shader.def +++ /dev/null @@ -1,13 +0,0 @@ -LIBRARY vkd3d-shader -EXPORTS - vkd3d_shader_compile_dxbc - vkd3d_shader_convert_root_signature - vkd3d_shader_find_signature_element - vkd3d_shader_free_root_signature - vkd3d_shader_free_shader_code - vkd3d_shader_free_shader_signature - vkd3d_shader_parse_input_signature - vkd3d_shader_parse_root_signature - vkd3d_shader_scan_dxbc - vkd3d_shader_serialize_root_signature - vkd3d_shader_supports_dxil diff --git a/libs/vkd3d-shader/vkd3d_shader.map b/libs/vkd3d-shader/vkd3d_shader.map deleted file mode 100644 index bd3ec180..00000000 --- a/libs/vkd3d-shader/vkd3d_shader.map +++ /dev/null @@ -1,17 +0,0 @@ -VKD3D_1_0 -{ -global: - vkd3d_shader_compile_dxbc; - vkd3d_shader_convert_root_signature; - vkd3d_shader_find_signature_element; - vkd3d_shader_free_root_signature; - vkd3d_shader_free_shader_code; - vkd3d_shader_free_shader_signature; - vkd3d_shader_parse_input_signature; - vkd3d_shader_parse_root_signature; - vkd3d_shader_scan_dxbc; - vkd3d_shader_serialize_root_signature; - vkd3d_shader_supports_dxil; - -local: *; -}; diff --git a/libs/vkd3d-utils/libvkd3d-utils.pc.in b/libs/vkd3d-utils/libvkd3d-utils.pc.in deleted file mode 100644 index 31d2a89c..00000000 --- a/libs/vkd3d-utils/libvkd3d-utils.pc.in +++ /dev/null @@ -1,10 +0,0 @@ -prefix=@prefix@ -exec_prefix=@exec_prefix@ -libdir=@libdir@ -includedir=@includedir@ - -Name: vkd3d-utils -Description: The vkd3d 3D Graphics Utility Library -Version: @PACKAGE_VERSION@ -Cflags: -I${includedir}/vkd3d -Libs: -L${libdir} -lvkd3d-utils diff --git a/libs/vkd3d-utils/vkd3d_utils.def b/libs/vkd3d-utils/vkd3d_utils.def deleted file mode 100644 index 0c4e261b..00000000 --- a/libs/vkd3d-utils/vkd3d_utils.def +++ /dev/null @@ -1,13 +0,0 @@ -LIBRARY vkd3d-utils -EXPORTS - D3D12CreateDevice - D3D12CreateRootSignatureDeserializer - D3D12CreateVersionedRootSignatureDeserializer - D3D12GetDebugInterface - D3D12SerializeRootSignature - D3D12SerializeVersionedRootSignature - vkd3d_create_event - vkd3d_destroy_event - vkd3d_signal_event - vkd3d_wait_event - diff --git a/libs/vkd3d-utils/vkd3d_utils.map b/libs/vkd3d-utils/vkd3d_utils.map deleted file mode 100644 index 9d95a841..00000000 --- a/libs/vkd3d-utils/vkd3d_utils.map +++ /dev/null @@ -1,16 +0,0 @@ -VKD3D_1_0 -{ -global: - D3D12CreateDevice; - D3D12CreateRootSignatureDeserializer; - D3D12CreateVersionedRootSignatureDeserializer; - D3D12GetDebugInterface; - D3D12SerializeRootSignature; - D3D12SerializeVersionedRootSignature; - vkd3d_create_event; - vkd3d_destroy_event; - vkd3d_signal_event; - vkd3d_wait_event; - -local: *; -}; diff --git a/libs/vkd3d/libvkd3d.pc.in b/libs/vkd3d/libvkd3d.pc.in deleted file mode 100644 index e8b27295..00000000 --- a/libs/vkd3d/libvkd3d.pc.in +++ /dev/null @@ -1,10 +0,0 @@ -prefix=@prefix@ -exec_prefix=@exec_prefix@ -libdir=@libdir@ -includedir=@includedir@ - -Name: vkd3d -Description: The vkd3d 3D Graphics Library -Version: @PACKAGE_VERSION@ -Cflags: -I${includedir}/vkd3d -Libs: -L${libdir} -lvkd3d diff --git a/libs/vkd3d/vkd3d.def b/libs/vkd3d/vkd3d.def deleted file mode 100644 index 0697ef2c..00000000 --- a/libs/vkd3d/vkd3d.def +++ /dev/null @@ -1,23 +0,0 @@ -LIBRARY vkd3d -EXPORTS - vkd3d_acquire_vk_queue - vkd3d_create_device - vkd3d_create_image_resource - vkd3d_create_instance - vkd3d_create_root_signature_deserializer - vkd3d_create_versioned_root_signature_deserializer - vkd3d_get_device_parent - vkd3d_get_dxgi_format - vkd3d_get_vk_device - vkd3d_get_vk_format - vkd3d_get_vk_physical_device - vkd3d_get_vk_queue_family_index - vkd3d_instance_decref - vkd3d_instance_from_device - vkd3d_instance_get_vk_instance - vkd3d_instance_incref - vkd3d_release_vk_queue - vkd3d_resource_decref - vkd3d_resource_incref - vkd3d_serialize_root_signature - vkd3d_serialize_versioned_root_signature diff --git a/libs/vkd3d/vkd3d.map b/libs/vkd3d/vkd3d.map deleted file mode 100644 index 6f1f3761..00000000 --- a/libs/vkd3d/vkd3d.map +++ /dev/null @@ -1,27 +0,0 @@ -VKD3D_1_0 -{ -global: - vkd3d_acquire_vk_queue; - vkd3d_create_device; - vkd3d_create_image_resource; - vkd3d_create_instance; - vkd3d_create_root_signature_deserializer; - vkd3d_create_versioned_root_signature_deserializer; - vkd3d_get_device_parent; - vkd3d_get_dxgi_format; - vkd3d_get_vk_device; - vkd3d_get_vk_format; - vkd3d_get_vk_physical_device; - vkd3d_get_vk_queue_family_index; - vkd3d_instance_decref; - vkd3d_instance_from_device; - vkd3d_instance_get_vk_instance; - vkd3d_instance_incref; - vkd3d_release_vk_queue; - vkd3d_resource_decref; - vkd3d_resource_incref; - vkd3d_serialize_root_signature; - vkd3d_serialize_versioned_root_signature; - -local: *; -}; diff --git a/m4/.gitignore b/m4/.gitignore deleted file mode 100644 index 38066ddf..00000000 --- a/m4/.gitignore +++ /dev/null @@ -1,5 +0,0 @@ -libtool.m4 -ltoptions.m4 -ltsugar.m4 -ltversion.m4 -lt~obsolete.m4 diff --git a/m4/ax_compare_version.m4 b/m4/ax_compare_version.m4 deleted file mode 100644 index ffb4997e..00000000 --- a/m4/ax_compare_version.m4 +++ /dev/null @@ -1,177 +0,0 @@ -# =========================================================================== -# https://www.gnu.org/software/autoconf-archive/ax_compare_version.html -# =========================================================================== -# -# SYNOPSIS -# -# AX_COMPARE_VERSION(VERSION_A, OP, VERSION_B, [ACTION-IF-TRUE], [ACTION-IF-FALSE]) -# -# DESCRIPTION -# -# This macro compares two version strings. Due to the various number of -# minor-version numbers that can exist, and the fact that string -# comparisons are not compatible with numeric comparisons, this is not -# necessarily trivial to do in a autoconf script. This macro makes doing -# these comparisons easy. -# -# The six basic comparisons are available, as well as checking equality -# limited to a certain number of minor-version levels. -# -# The operator OP determines what type of comparison to do, and can be one -# of: -# -# eq - equal (test A == B) -# ne - not equal (test A != B) -# le - less than or equal (test A <= B) -# ge - greater than or equal (test A >= B) -# lt - less than (test A < B) -# gt - greater than (test A > B) -# -# Additionally, the eq and ne operator can have a number after it to limit -# the test to that number of minor versions. -# -# eq0 - equal up to the length of the shorter version -# ne0 - not equal up to the length of the shorter version -# eqN - equal up to N sub-version levels -# neN - not equal up to N sub-version levels -# -# When the condition is true, shell commands ACTION-IF-TRUE are run, -# otherwise shell commands ACTION-IF-FALSE are run. The environment -# variable 'ax_compare_version' is always set to either 'true' or 'false' -# as well. -# -# Examples: -# -# AX_COMPARE_VERSION([3.15.7],[lt],[3.15.8]) -# AX_COMPARE_VERSION([3.15],[lt],[3.15.8]) -# -# would both be true. -# -# AX_COMPARE_VERSION([3.15.7],[eq],[3.15.8]) -# AX_COMPARE_VERSION([3.15],[gt],[3.15.8]) -# -# would both be false. -# -# AX_COMPARE_VERSION([3.15.7],[eq2],[3.15.8]) -# -# would be true because it is only comparing two minor versions. -# -# AX_COMPARE_VERSION([3.15.7],[eq0],[3.15]) -# -# would be true because it is only comparing the lesser number of minor -# versions of the two values. -# -# Note: The characters that separate the version numbers do not matter. An -# empty string is the same as version 0. OP is evaluated by autoconf, not -# configure, so must be a string, not a variable. -# -# The author would like to acknowledge Guido Draheim whose advice about -# the m4_case and m4_ifvaln functions make this macro only include the -# portions necessary to perform the specific comparison specified by the -# OP argument in the final configure script. -# -# LICENSE -# -# Copyright (c) 2008 Tim Toolan <toolan@ele.uri.edu> -# -# Copying and distribution of this file, with or without modification, are -# permitted in any medium without royalty provided the copyright notice -# and this notice are preserved. This file is offered as-is, without any -# warranty. - -#serial 13 - -dnl ######################################################################### -AC_DEFUN([AX_COMPARE_VERSION], [ - AC_REQUIRE([AC_PROG_AWK]) - - # Used to indicate true or false condition - ax_compare_version=false - - # Convert the two version strings to be compared into a format that - # allows a simple string comparison. The end result is that a version - # string of the form 1.12.5-r617 will be converted to the form - # 0001001200050617. In other words, each number is zero padded to four - # digits, and non digits are removed. - AS_VAR_PUSHDEF([A],[ax_compare_version_A]) - A=`echo "$1" | sed -e 's/\([[0-9]]*\)/Z\1Z/g' \ - -e 's/Z\([[0-9]]\)Z/Z0\1Z/g' \ - -e 's/Z\([[0-9]][[0-9]]\)Z/Z0\1Z/g' \ - -e 's/Z\([[0-9]][[0-9]][[0-9]]\)Z/Z0\1Z/g' \ - -e 's/[[^0-9]]//g'` - - AS_VAR_PUSHDEF([B],[ax_compare_version_B]) - B=`echo "$3" | sed -e 's/\([[0-9]]*\)/Z\1Z/g' \ - -e 's/Z\([[0-9]]\)Z/Z0\1Z/g' \ - -e 's/Z\([[0-9]][[0-9]]\)Z/Z0\1Z/g' \ - -e 's/Z\([[0-9]][[0-9]][[0-9]]\)Z/Z0\1Z/g' \ - -e 's/[[^0-9]]//g'` - - dnl # In the case of le, ge, lt, and gt, the strings are sorted as necessary - dnl # then the first line is used to determine if the condition is true. - dnl # The sed right after the echo is to remove any indented white space. - m4_case(m4_tolower($2), - [lt],[ - ax_compare_version=`echo "x$A -x$B" | sed 's/^ *//' | sort -r | sed "s/x${A}/false/;s/x${B}/true/;1q"` - ], - [gt],[ - ax_compare_version=`echo "x$A -x$B" | sed 's/^ *//' | sort | sed "s/x${A}/false/;s/x${B}/true/;1q"` - ], - [le],[ - ax_compare_version=`echo "x$A -x$B" | sed 's/^ *//' | sort | sed "s/x${A}/true/;s/x${B}/false/;1q"` - ], - [ge],[ - ax_compare_version=`echo "x$A -x$B" | sed 's/^ *//' | sort -r | sed "s/x${A}/true/;s/x${B}/false/;1q"` - ],[ - dnl Split the operator from the subversion count if present. - m4_bmatch(m4_substr($2,2), - [0],[ - # A count of zero means use the length of the shorter version. - # Determine the number of characters in A and B. - ax_compare_version_len_A=`echo "$A" | $AWK '{print(length)}'` - ax_compare_version_len_B=`echo "$B" | $AWK '{print(length)}'` - - # Set A to no more than B's length and B to no more than A's length. - A=`echo "$A" | sed "s/\(.\{$ax_compare_version_len_B\}\).*/\1/"` - B=`echo "$B" | sed "s/\(.\{$ax_compare_version_len_A\}\).*/\1/"` - ], - [[0-9]+],[ - # A count greater than zero means use only that many subversions - A=`echo "$A" | sed "s/\(\([[0-9]]\{4\}\)\{m4_substr($2,2)\}\).*/\1/"` - B=`echo "$B" | sed "s/\(\([[0-9]]\{4\}\)\{m4_substr($2,2)\}\).*/\1/"` - ], - [.+],[ - AC_WARNING( - [invalid OP numeric parameter: $2]) - ],[]) - - # Pad zeros at end of numbers to make same length. - ax_compare_version_tmp_A="$A`echo $B | sed 's/./0/g'`" - B="$B`echo $A | sed 's/./0/g'`" - A="$ax_compare_version_tmp_A" - - # Check for equality or inequality as necessary. - m4_case(m4_tolower(m4_substr($2,0,2)), - [eq],[ - test "x$A" = "x$B" && ax_compare_version=true - ], - [ne],[ - test "x$A" != "x$B" && ax_compare_version=true - ],[ - AC_WARNING([invalid OP parameter: $2]) - ]) - ]) - - AS_VAR_POPDEF([A])dnl - AS_VAR_POPDEF([B])dnl - - dnl # Execute ACTION-IF-TRUE / ACTION-IF-FALSE. - if test "$ax_compare_version" = "true" ; then - m4_ifvaln([$4],[$4],[:])dnl - m4_ifvaln([$5],[else $5])dnl - fi -]) dnl AX_COMPARE_VERSION diff --git a/m4/check-cflags.m4 b/m4/check-cflags.m4 deleted file mode 100644 index 31e36c67..00000000 --- a/m4/check-cflags.m4 +++ /dev/null @@ -1,16 +0,0 @@ -dnl -dnl This file contains code derived from WINE_TRY_CFLAGS() and is used courtesy of Alexandre Julliard. -dnl - -dnl VKD3D_CHECK_CFLAGS(flags) -AC_DEFUN([VKD3D_CHECK_CFLAGS], - [AS_VAR_PUSHDEF([vkd3d_cflags], vkd3d_cv_cflags_[[$1]])dnl - AC_CACHE_CHECK([whether the compiler supports $1], vkd3d_cflags, - [vkd3d_cflags_saved=$CFLAGS - CFLAGS="$CFLAGS $1 -Werror" - AC_LINK_IFELSE([AC_LANG_SOURCE([[int main(int argc, char **argv) { return 0; }]])], - [AS_VAR_SET(vkd3d_cflags, yes)], - [AS_VAR_SET(vkd3d_cflags, no)]) - CFLAGS=$vkd3d_cflags_saved]) - AS_VAR_IF([vkd3d_cflags], [yes], [VKD3D_CFLAGS="$VKD3D_CFLAGS $1"])dnl - AS_VAR_POPDEF([vkd3d_cflags])]) diff --git a/m4/check-functions.m4 b/m4/check-functions.m4 deleted file mode 100644 index 4d018d69..00000000 --- a/m4/check-functions.m4 +++ /dev/null @@ -1,55 +0,0 @@ -dnl VKD3D_CHECK_FUNC -AC_DEFUN([VKD3D_CHECK_FUNC], -[AC_MSG_CHECKING([for $2]) -AC_LINK_IFELSE([AC_LANG_SOURCE([int main(void) { return [$3]; }])], - [AC_MSG_RESULT([yes]) - AC_DEFINE([$1], - [1], - [Define to 1 if you have $2.])], - [AC_MSG_RESULT([no])])]) - -dnl VKD3D_CHECK_LIB_FUNCS -AC_DEFUN([VKD3D_CHECK_LIB_FUNCS], -[vkd3d_libs_saved="$LIBS" -LIBS="$LIBS $2" -AC_CHECK_FUNCS([$1], [$3], [$4]) -LIBS="$vkd3d_libs_saved"]) - -dnl VKD3D_CHECK_WHICH_PTHREAD_SETNAME_NP -AC_DEFUN([VKD3D_CHECK_WHICH_PTHREAD_SETNAME_NP], - [AC_MSG_CHECKING([how many arguments pthread_set_np() takes]) - AC_CACHE_VAL([vkd3d_cv_which_pthread_set_np], [ - -vkd3d_cv_which_pthread_set_np=unknown - -AC_COMPILE_IFELSE([AC_LANG_PROGRAM([#include <pthread.h>], - [pthread_setname_np(pthread_self(), "conftest")])], - [vkd3d_cv_which_pthread_set_np=two]) - -AS_IF([test "$vkd3d_cv_which_pthread_set_np" = "unknown"], - [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([#include <pthread.h>], - [pthread_setname_np("conftest")])], - [vkd3d_cv_which_pthread_set_np=one])]) - -]) dnl AC_CACHE_VAL - -AS_CASE(["$vkd3d_cv_which_pthread_set_np"], - [one], - [AC_DEFINE([HAVE_PTHREAD_SETNAME_NP_1], [1], - [Define to 1 if you have the one-argument variant of pthread_setname_np().]) - AC_MSG_RESULT([one])], - - [two], - [AC_DEFINE([HAVE_PTHREAD_SETNAME_NP_2], [1], - [Define to 1 if you have the two-argument variant of pthread_setname_np().]) - AC_MSG_RESULT([two])], - - [AC_MSG_RESULT([unknown])]) - -]) dnl AC_DEFUN - -dnl VKD3D_CHECK_PTHREAD_SETNAME_NP -AC_DEFUN([VKD3D_CHECK_PTHREAD_SETNAME_NP], - [VKD3D_CHECK_LIB_FUNCS([pthread_setname_np], [$PTHREAD_LIBS]) - AS_IF([test "x$ac_cv_func_pthread_setname_np" = "xyes"], - [VKD3D_CHECK_WHICH_PTHREAD_SETNAME_NP])]) diff --git a/m4/check-mingw-prog.m4 b/m4/check-mingw-prog.m4 deleted file mode 100644 index ac3e07d3..00000000 --- a/m4/check-mingw-prog.m4 +++ /dev/null @@ -1,41 +0,0 @@ -dnl -dnl This file contains code derived from WINE_CHECK_MINGW_PROG() and is used courtesy of Alexandre Julliard. -dnl - -dnl VKD3D_CHECK_MINGW32_PROG(cc-variable, crosstarget-variable, [value-if-not-found], [path]) -AC_DEFUN([VKD3D_CHECK_MINGW32_PROG], -[AC_SUBST([$2], [$3]) -vkd3d_mingw_list="m4_foreach([vkd3d_cpu], [i686, i586, i486, i386], [vkd3d_cpu-w64-mingw32-gcc ])" -AC_CHECK_PROGS([$1], [$vkd3d_mingw_list], [$3], [$4]) -AS_VAR_PUSHDEF([vkd3d_cross_cc], [$1])dnl -AS_VAR_IF([vkd3d_cross_cc], [$3], - [], - [vkd3d_cc_saved="$CC" - AS_VAR_COPY([CC], [vkd3d_cross_cc]) - AC_MSG_CHECKING([whether $CC works]) - AC_COMPILE_IFELSE([AC_LANG_PROGRAM([])], - [AC_MSG_RESULT([yes]) - $2=`expr "$CC" : '\(.*\)-gcc'`], - [AC_MSG_RESULT([no])]) - CC="$vkd3d_cc_saved"]) -AS_VAR_POPDEF([vkd3d_cross_cc])dnl -]) - -dnl VKD3D_CHECK_MINGW64_PROG(cc-variable, crosstarget-variable, [value-if-not-found], [path]) -AC_DEFUN([VKD3D_CHECK_MINGW64_PROG], -[AC_SUBST([$2], [$3]) -vkd3d_mingw_list="m4_foreach([vkd3d_cpu], [x86_64, amd64], [vkd3d_cpu-w64-mingw32-gcc ])" -AC_CHECK_PROGS([$1], [$vkd3d_mingw_list], [$3], [$4]) -AS_VAR_PUSHDEF([vkd3d_cross_cc], [$1])dnl -AS_VAR_IF([vkd3d_cross_cc], [$3], - [], - [vkd3d_cc_saved="$CC" - AS_VAR_COPY([CC], [vkd3d_cross_cc]) - AC_MSG_CHECKING([whether $CC works]) - AC_COMPILE_IFELSE([AC_LANG_PROGRAM([])], - [AC_MSG_RESULT([yes]) - $2=`expr "$CC" : '\(.*\)-gcc'`], - [AC_MSG_RESULT([no])]) - CC="$vkd3d_cc_saved"]) -AS_VAR_POPDEF([vkd3d_cross_cc])dnl -]) diff --git a/m4/check-pthread.m4 b/m4/check-pthread.m4 deleted file mode 100644 index 5fa82ecb..00000000 --- a/m4/check-pthread.m4 +++ /dev/null @@ -1,21 +0,0 @@ -dnl VKD3D_CHECK_PTHREAD -AC_DEFUN([VKD3D_CHECK_PTHREAD], -[vkd3d_pthread_found=no - -AS_IF([test "x$PTHREAD_LIBS" != x], -[vkd3d_libs_saved="$LIBS" -LIBS="$LIBS $PTHREAD_LIBS" - -AC_MSG_CHECKING([checking for pthread_create in $PTHREAD_LIBS]) -AC_TRY_LINK_FUNC([pthread_create], [vkd3d_pthread_found=yes]) -AC_MSG_RESULT([$vkd3d_pthread_found]) - -AS_IF([test "x$vkd3d_pthread_found" = "xno"], [PTHREAD_LIBS=""]) - -LIBS="$vkd3d_libs_saved"]) - -AS_IF([test "x$vkd3d_pthread_found" != "xyes"], -AC_CHECK_LIB([pthread], [pthread_create], - [PTHREAD_LIBS="-lpthread"], - [AC_MSG_ERROR([libpthread not found.])])) -]) diff --git a/m4/check-soname.m4 b/m4/check-soname.m4 deleted file mode 100644 index f1953413..00000000 --- a/m4/check-soname.m4 +++ /dev/null @@ -1,54 +0,0 @@ -dnl -dnl Copyright 2002 Alexandre Julliard -dnl -dnl This library is free software; you can redistribute it and/or -dnl modify it under the terms of the GNU Lesser General Public -dnl License as published by the Free Software Foundation; either -dnl version 2.1 of the License, or (at your option) any later version. -dnl -dnl This library is distributed in the hope that it will be useful, -dnl but WITHOUT ANY WARRANTY; without even the implied warranty of -dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -dnl Lesser General Public License for more details. -dnl -dnl You should have received a copy of the GNU Lesser General Public -dnl License along with this library; if not, write to the Free Software -dnl Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA -dnl -dnl As a special exception to the GNU Lesser General Public License, -dnl if you distribute this file as part of a program that contains a -dnl configuration script generated by Autoconf, you may include it -dnl under the same distribution terms that you use for the rest of -dnl that program. - -dnl VKD3D_PATH_SONAME_TOOLS -AC_DEFUN([VKD3D_PATH_SONAME_TOOLS], -[AC_PATH_PROG(LDD,ldd,true,/sbin:/usr/sbin:$PATH) -AC_CHECK_TOOL(OTOOL,otool,otool) -AC_CHECK_TOOL(READELF,[readelf],true)]) - -dnl VKD3D_CHECK_SONAME(library, function, [action-if-found, [action-if-not-found, [other_libraries, [pattern]]]]) -AC_DEFUN([VKD3D_CHECK_SONAME], -[AC_REQUIRE([VKD3D_PATH_SONAME_TOOLS])dnl -AS_VAR_PUSHDEF([ac_Lib],[ac_cv_lib_soname_$1])dnl -m4_pushdef([ac_lib_pattern],m4_default([$6],[lib$1]))dnl -AC_MSG_CHECKING([for -l$1]) -AC_CACHE_VAL(ac_Lib, -[ac_check_soname_save_LIBS=$LIBS - LIBS="-l$1 $5 $LIBS" - AC_LINK_IFELSE([AC_LANG_CALL([], [$2])], - [AS_CASE(["$host_os"], - [darwin*|macosx*], [AS_VAR_SET(ac_Lib,[`$OTOOL -L conftest$ac_exeext | grep "]ac_lib_pattern[\\.[[0-9A-Za-z.]]*dylib" | sed -e "s/^.*\/\(]ac_lib_pattern[\.[[0-9A-Za-z.]]*dylib\).*$/\1/"';2,$d'`])], - [AS_VAR_SET(ac_Lib,[`$READELF -d conftest$ac_exeext | grep "NEEDED.*]ac_lib_pattern[" | sed -e "s/^.*\\m4_dquote(\\(]ac_lib_pattern[[[^ ]]*\\)\\).*$/\1/"';2,$d'`]) - AS_VAR_IF([ac_Lib],[], - [AS_VAR_SET(ac_Lib,[`$LDD conftest$ac_exeext | grep "]ac_lib_pattern[" | sed -e "s/^.*\(]ac_lib_pattern[[[^ ]]*\).*$/\1/"';2,$d'`])])])]) - LIBS=$ac_check_soname_save_LIBS])dnl -AS_VAR_IF([ac_Lib],[], - [AC_MSG_RESULT([not found]) - $4], - [AC_MSG_RESULT(AS_VAR_GET(ac_Lib)) - AC_DEFINE_UNQUOTED(AS_TR_CPP(SONAME_LIB$1),["]AS_VAR_GET(ac_Lib)["], - [Define to the soname of the lib$1 library.]) - $3])dnl -m4_popdef([ac_lib_pattern])dnl -AS_VAR_POPDEF([ac_Lib])]) diff --git a/m4/ld-version-script.m4 b/m4/ld-version-script.m4 deleted file mode 100644 index 4364f9f7..00000000 --- a/m4/ld-version-script.m4 +++ /dev/null @@ -1,48 +0,0 @@ -# ld-version-script.m4 serial 4 -dnl Copyright (C) 2008-2018 Free Software Foundation, Inc. -dnl This file is free software; the Free Software Foundation -dnl gives unlimited permission to copy and/or distribute it, -dnl with or without modifications, as long as this notice is preserved. - -dnl From Simon Josefsson - -# FIXME: The test below returns a false positive for mingw -# cross-compiles, 'local:' statements does not reduce number of -# exported symbols in a DLL. Use --disable-ld-version-script to work -# around the problem. - -# gl_LD_VERSION_SCRIPT -# -------------------- -# Check if LD supports linker scripts, and define automake conditional -# HAVE_LD_VERSION_SCRIPT if so. -AC_DEFUN([gl_LD_VERSION_SCRIPT], -[ - AC_ARG_ENABLE([ld-version-script], - [AS_HELP_STRING([--enable-ld-version-script], - [enable linker version script (default is enabled when possible)])], - [have_ld_version_script=$enableval], - [AC_CACHE_CHECK([if LD -Wl,--version-script works], - [gl_cv_sys_ld_version_script], - [gl_cv_sys_ld_version_script=no - save_LDFLAGS=$LDFLAGS - LDFLAGS="$LDFLAGS -Wl,--version-script=conftest.map" - echo foo >conftest.map - AC_LINK_IFELSE([AC_LANG_PROGRAM([], [])], - [], - [cat > conftest.map <<EOF -VERS_1 { - global: sym; -}; - -VERS_2 { - global: sym; -} VERS_1; -EOF - AC_LINK_IFELSE([AC_LANG_PROGRAM([], [])], - [gl_cv_sys_ld_version_script=yes])]) - rm -f conftest.map - LDFLAGS=$save_LDFLAGS]) - have_ld_version_script=$gl_cv_sys_ld_version_script]) - AM_CONDITIONAL([HAVE_LD_VERSION_SCRIPT], - [test "$have_ld_version_script" = yes]) -]) diff --git a/m4/vulkan.m4 b/m4/vulkan.m4 deleted file mode 100644 index 6ef5818c..00000000 --- a/m4/vulkan.m4 +++ /dev/null @@ -1,18 +0,0 @@ -dnl VKD3D_CHECK_VULKAN_HEADER_VERSION -AC_DEFUN([VKD3D_CHECK_VULKAN_HEADER_VERSION], - -[AS_VAR_PUSHDEF([vkd3d_vk_version], vkd3d_cv_vk_header_version_[[$1]]) - -AC_CACHE_CHECK([whether VK_HEADER_VERSION >= [$1]], vkd3d_vk_version, - [AC_LINK_IFELSE( - [AC_LANG_SOURCE([#include <vulkan/vulkan.h> - #if VK_HEADER_VERSION < $1 - #error "Vulkan headers are too old" - #endif - int main(void) { return 0; }])], - [AS_VAR_SET([vkd3d_vk_version], [yes])], - [AS_VAR_SET([vkd3d_vk_version], [no])])]) - -AS_IF([test "x$vkd3d_vk_version" != "xyes"], [$2]) - -AS_VAR_POPDEF([vkd3d_vk_version])]) diff --git a/m4/widl.m4 b/m4/widl.m4 deleted file mode 100644 index 6d226064..00000000 --- a/m4/widl.m4 +++ /dev/null @@ -1,14 +0,0 @@ -dnl VKD3D_PROG_WIDL(major, minor) -AC_DEFUN([VKD3D_PROG_WIDL], - -[AC_CHECK_PROG([WIDL], [widl], [widl], [no]) - -AS_IF([test "x$WIDL" != "xno"], -[AC_MSG_CHECKING([checking whether widl version >= $1.$2]) -vkd3d_widl_version=`$WIDL -V 2>/dev/null | $SED -E '/version/{s/.* version (.*)/\1/;q;}'` - -AX_COMPARE_VERSION([$vkd3d_widl_version], [ge], [$1.$2], - [AC_MSG_RESULT([yes ($vkd3d_widl_version)])], - [AC_MSG_RESULT([no ($vkd3d_widl_version)]) - WIDL=no]) -])]) diff --git a/tests/.gitignore b/tests/.gitignore deleted file mode 100644 index 1854d55b..00000000 --- a/tests/.gitignore +++ /dev/null @@ -1,5 +0,0 @@ -/d3d12 -/d3d12_invalid_usage -/vkd3d_api -/vkd3d_common -/vkd3d_shader_api |