From ad41ceefcea8ba58c2175ca6bef5f4c93909bf70 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20Bernon?= <rbernon@codeweavers.com>
Date: Tue, 26 Sep 2023 18:49:50 +0200
Subject: [PATCH] wineopenxr: Build using makedep rules.

CW-Bug-Id: #22729
---
 Makefile.in             | 6 ++----
 wineopenxr/Makefile.in  | 9 +++++++++
 wineopenxr/wineopenxr.h | 4 ++++
 3 files changed, 15 insertions(+), 4 deletions(-)
 create mode 100644 wineopenxr/Makefile.in

diff --git a/Makefile.in b/Makefile.in
index 31b03780..fac6405c 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -330,13 +330,11 @@ $(eval $(call rules-cmake,openxr,64))
 ## Note 32-bit is not supported by SteamVR, so we don't build it.
 ##
 
-WINEOPENXR_LDFLAGS = -lopenxr_loader -ldxgi -lvulkan -ldl
-
+WINEOPENXR_LDFLAGS = -lopenxr_loader
 WINEOPENXR_DEPENDS = wine openxr
 
 $(eval $(call rules-source,wineopenxr,$(SRCDIR)/wineopenxr))
-# $(eval $(call rules-winemaker,wineopenxr,32,wineopenxr.dll))
-$(eval $(call rules-winemaker,wineopenxr,64,wineopenxr.dll))
+$(eval $(call rules-makedep,wineopenxr,64))
 
 DIST_WINEOPENXR_JSON64 := $(DIST_PREFIX)/drive_c/openxr/wineopenxr64.json
 $(WINEOPENXR_SRC)/wineopenxr64.json: wineopenxr
diff --git a/wineopenxr/Makefile.in b/wineopenxr/Makefile.in
new file mode 100644
index 00000000..88a87d7c
--- /dev/null
+++ b/wineopenxr/Makefile.in
@@ -0,0 +1,9 @@
+MODULE     = wineopenxr.dll
+IMPORTS    = advapi32 dxgi vulkan-1
+
+EXTRADLLFLAGS = -mcygwin
+EXTRADEFS = -DWINE_NO_LONG_TYPES
+
+C_SRCS = \
+	openxr.c \
+	openxr_thunks.c \
diff --git a/wineopenxr/wineopenxr.h b/wineopenxr/wineopenxr.h
index 43e9097c..539b1ba3 100644
--- a/wineopenxr/wineopenxr.h
+++ b/wineopenxr/wineopenxr.h
@@ -43,6 +43,10 @@
 #define WINE_XR_ALIGN DECLSPEC_ALIGN
 #endif
 
+#ifdef __x86_64__
+#define XR_PTR_SIZE 8
+#endif
+
 #define XR_TRUE 1
 #define XR_FALSE 0
 #define XR_MAX_EXTENSION_NAME_SIZE 128