# HG changeset patch
# User Matti Hamalainen <ccr@tnsp.org>
# Date 1562107939 -10800
# Node ID 4f3bd5710585cffe30cec2ad94527a8af8259647
# Parent  180604abb65a3cd818ddf878b147a07904b1cb54# Parent  81b561abb6e9051f0df82167a4454bc419e67228
Merge.

diff -r 180604abb65a -r 4f3bd5710585 Makefile.gen
--- a/Makefile.gen	Wed Jul 03 01:52:01 2019 +0300
+++ b/Makefile.gen	Wed Jul 03 01:52:19 2019 +0300
@@ -129,7 +129,6 @@
 ifeq ($(DM_GFX_BLITS),yes)
 DM_CFLAGS += -DDM_GFX_BLITS
 DMLIB_OBJS += dmblit.o
-endif
 
 ifeq ($(DM_GFX_BM_TEXT),yes)
 DM_CFLAGS += -DDM_GFX_BM_TEXT
@@ -140,6 +139,7 @@
 endif
 endif
 endif
+endif
 
 ifeq ($(DM_GFX_TTF_TEXT),yes)
 DM_CFLAGS += -DDM_GFX_TTF_TEXT
@@ -308,11 +308,7 @@
 TESTS_TARGETS = $(addprefix $(TESTS_BINPATH),$(addsuffix $(EXEEXT),$(TESTS_BINARIES)))
 TOOL_TARGETS = $(addprefix $(TOOL_BINPATH),$(addsuffix $(EXEEXT),$(TOOL_BINARIES)))
 TARGETS += $(DMLIB_A) $(addprefix $(BINPATH),$(addsuffix $(EXEEXT),$(BINARIES))) \
-	$(TOOL_TARGETS) $(TESTS_TARGETS) \
-	$(DMLIB)assets/SetupFont.dmf \
-	$(DMLIB_SRC)setupfont.h \
-	$(DMLIB_SRC)setupimage.h \
-	$(DMLIB_SRC)setupmenubar.h
+	$(TOOL_TARGETS) $(TESTS_TARGETS)
 
 #NONBUILD +=
 
diff -r 180604abb65a -r 4f3bd5710585 src/dmperlin.c
--- a/src/dmperlin.c	Wed Jul 03 01:52:01 2019 +0300
+++ b/src/dmperlin.c	Wed Jul 03 01:52:19 2019 +0300
@@ -120,13 +120,12 @@
  */
 DMFloat dmPerlinNoise2D(const DMPerlinContext *ctx, DMFloat x, DMFloat y, DMFloat alpha, DMFloat beta, int n)
 {
-    int i;
     DMFloat val, sum = 0;
     DMFloat p[2], scale = 1;
 
     p[0] = x;
     p[1] = y;
-    for (i = 0; i < n; i++)
+    for (int i = 0; i < n; i++)
     {
         val = dmPerlinDoNoise2(ctx, p);
         sum += val / scale;