diff options
| -rw-r--r-- | Makefile | 16 | ||||
| -rw-r--r-- | src/wayclock.cc | 6 | ||||
| m--------- | wgpu | 0 |
3 files changed, 2 insertions, 20 deletions
@@ -36,20 +36,9 @@ MI_FLAGS = \ HASHMAP_DIR = $(WORK_DIR)/hashmap HASHMAP_SOURCE = $(HASHMAP_DIR)/hashmap.c -WGPU_DIR = $(WORK_DIR)/wgpu -WGPU_MANIFEST = $(WGPU_DIR)/Cargo.toml -WGPU_MANIFEST_FLAG = --manifest-path $(WGPU_MANIFEST) -WGPU_ARTIFACTS = $(WGPU_DIR)/build -WGPU_LIB = $(WGPU_ARTIFACTS)/libwgpu_native.a -WGPU_BUILD_FLAGS = --release --artifact-dir $(WGPU_ARTIFACTS) -Z unstable-options -WGPU_INCLUDE = $(WGPU_DIR)/ffi -WGPU_INCLUDE_WEBGPU = $(WGPU_INCLUDE)/webgpu-headers - CSH_FLAGS += \ -I$(MI_INCLUDE) \ -I$(HASHMAP_DIR) \ - -I$(WGPU_INCLUDE) \ - -I$(WGPU_INCLUDE_WEBGPU) MI_GENERATOR = "Unix Makefiles" @@ -72,7 +61,7 @@ OBJECTS += $(MI_OBJECT) DEPS = $(OBJECTS:.o=.d) -LIBRARIES = -lwayland-client -lvulkan $(WGPU_LIB) +LIBRARIES = -lwayland-client -lvulkan all: $(WAYCLOCK) @@ -88,7 +77,7 @@ $(MI_OBJECT): | $(MI_BUILD) @echo " MAKE $@" @$(MAKE) -C $(MI_BUILD) -$(WAYCLOCK): $(OBJECTS) $(LIBRARIES) +$(WAYCLOCK): $(OBJECTS) @echo " LD $@" @$(CXX) $(CXX_FLAGS) -o $@ $^ $(LIBRARIES) @@ -102,7 +91,6 @@ $(WAYCLOCK): $(OBJECTS) $(LIBRARIES) .PHONY: clean clean: - @$(CARGO) clean $(WGPU_MANIFEST_FLAG) @$(RM) $(OBJECTS) $(DEPS) @$(RM) $(WAYCLOCK) @$(RM) $(MI_BUILD) diff --git a/src/wayclock.cc b/src/wayclock.cc index 07d767e..2d3f9c7 100644 --- a/src/wayclock.cc +++ b/src/wayclock.cc @@ -1,10 +1,8 @@ -#include <wgpu.h> #include <cstdio> #include "events.h" #include "graphics.h" -#include "webgpu.h" #include "window.h" #define WAYC_APP_NAME "Wayclock" @@ -42,9 +40,6 @@ void handle(struct eventloop_s* loop, struct event_s* event) { } int main() { - WGPUInstance instance = wgpuCreateInstance(nullptr); - if (instance == nullptr) wayc_panic("Failed to create WGPU instance"); - struct graphics_s graphics; if (wayc_graphics_init(&graphics) != GRAPHICS_ERROR_NONE) wayc_panic("Failed to initialize graphics"); @@ -69,6 +64,5 @@ int main() { wayc_window_deinit(&window); wayc_eventloop_deinit(&loop); wayc_graphics_deinit(&graphics); - wgpuInstanceRelease(instance); return 0; }
\ No newline at end of file diff --git a/wgpu b/wgpu deleted file mode 160000 -Subproject d53a603900009077c6e09676c3e3a13719e6f07 |