Merge branch 'master' into textures_image_kernel
This commit is contained in:
commit
486974e52d
|
|
@ -705,7 +705,8 @@ textures/textures_image_generation: textures/textures_image_generation.c
|
||||||
$(CC) -o $@$(EXT) $< $(CFLAGS) $(INCLUDE_PATHS) $(LDFLAGS) $(LDLIBS) -D$(PLATFORM) -s TOTAL_MEMORY=67108864
|
$(CC) -o $@$(EXT) $< $(CFLAGS) $(INCLUDE_PATHS) $(LDFLAGS) $(LDLIBS) -D$(PLATFORM) -s TOTAL_MEMORY=67108864
|
||||||
|
|
||||||
textures/textures_image_kernel: textures/textures_image_kernel.c
|
textures/textures_image_kernel: textures/textures_image_kernel.c
|
||||||
$(CC) -o $@$(EXT) $< $(CFLAGS) $(INCLUDE_PATHS) $(LDFLAGS) $(LDLIBS) -D$(PLATFORM)
|
$(CC) -o $@$(EXT) $< $(CFLAGS) $(INCLUDE_PATHS) $(LDFLAGS) $(LDLIBS) -D$(PLATFORM) \
|
||||||
|
--preload-file textures/resources/cat.png@resources/cat.png
|
||||||
|
|
||||||
textures/textures_image_loading: textures/textures_image_loading.c
|
textures/textures_image_loading: textures/textures_image_loading.c
|
||||||
$(CC) -o $@$(EXT) $< $(CFLAGS) $(INCLUDE_PATHS) $(LDFLAGS) $(LDLIBS) -D$(PLATFORM) \
|
$(CC) -o $@$(EXT) $< $(CFLAGS) $(INCLUDE_PATHS) $(LDFLAGS) $(LDLIBS) -D$(PLATFORM) \
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue
Block a user