Use an in repo texture
This commit is contained in:
1 parent
10e5d7e28c
commit
4ad7eb3622
3 files changed
+6
-2
No files matched your search
@@ -26,6 +26,7 @@ OBJDIR = $(BUILDDIR)/obj
|
|||||||
COBJDIR = $(OBJDIR)/c
|
COBJDIR = $(OBJDIR)/c
|
||||||
CXXOBJDIR = $(OBJDIR)/cxx
|
CXXOBJDIR = $(OBJDIR)/cxx
|
||||||
SHADER_OUTDIR = $(BUILDDIR)/shaders
|
SHADER_OUTDIR = $(BUILDDIR)/shaders
|
||||||
|
ASSETS_DIR = assets
|
||||||
|
|
||||||
ifeq ($(WND_BKND), SDL)
|
ifeq ($(WND_BKND), SDL)
|
||||||
CFLAGS += -DUSE_SDL_WINDOW_BACKEND
|
CFLAGS += -DUSE_SDL_WINDOW_BACKEND
|
||||||
@@ -47,7 +48,7 @@ OUT_NAME = main
|
|||||||
OUT = $(BUILDDIR)/$(OUT_NAME)
|
OUT = $(BUILDDIR)/$(OUT_NAME)
|
||||||
SHADER_OUT = $(SHADER_OUTDIR)/shader.spv
|
SHADER_OUT = $(SHADER_OUTDIR)/shader.spv
|
||||||
|
|
||||||
build: $(OUT) $(SHADER_OUT)
|
build: $(OUT) $(SHADER_OUT) copy-assets
|
||||||
|
|
||||||
$(OUT): $(OBJS)
|
$(OUT): $(OBJS)
|
||||||
$(CXX) $(LDFLAGS) -o "$@" $^ $(LDLIBS)
|
$(CXX) $(LDFLAGS) -o "$@" $^ $(LDLIBS)
|
||||||
@@ -68,6 +69,9 @@ $(SHADER_OUT): $(SHADER_SRC)
|
|||||||
@mkdir -p $(SHADER_OUTDIR)
|
@mkdir -p $(SHADER_OUTDIR)
|
||||||
$(SLANGC) $(SHADER_SRC) $(SLANGC_FLAGS) -o $(SHADER_OUT)
|
$(SLANGC) $(SHADER_SRC) $(SLANGC_FLAGS) -o $(SHADER_OUT)
|
||||||
|
|
||||||
|
copy-assets:
|
||||||
|
@cp -r $(ASSETS_DIR) $(BUILDDIR)
|
||||||
|
|
||||||
run:
|
run:
|
||||||
@cd $(BUILDDIR) && ./$(OUT_NAME)
|
@cd $(BUILDDIR) && ./$(OUT_NAME)
|
||||||
|
|
||||||
|
|||||||
Binary file not shown.
|
After Width: | Height: | Size: 28 KiB |
+1
-1
@@ -162,7 +162,7 @@ i32 main(void) {
|
|||||||
|
|
||||||
GpuLoadImageFromFileRequest load_img_req = {
|
GpuLoadImageFromFileRequest load_img_req = {
|
||||||
.command_pool = pool,
|
.command_pool = pool,
|
||||||
.filename = wpStr8LitRo("/home/abdelrahman/Pictures/800px-Trumpets02262006.jpg"),
|
.filename = wpStr8LitRo("assets/collections.png"),
|
||||||
};
|
};
|
||||||
GpuImage *texture = gpuLoadImageFromFile(&arena, &temp_arena, load_img_req);
|
GpuImage *texture = gpuLoadImageFromFile(&arena, &temp_arena, load_img_req);
|
||||||
|
|
||||||
|
|||||||
Reference in new issue
Block a user