merged

diff --git a/Makefile b/Makefile
index abcd469..8ce0adf 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -19,7 +19,7 @@ SRC_DIR    := $(ROOT_DIR)/src
 # directory where files with 'main' functions live (can be in SRC_DIR)
 DRIVER_DIR := $(SRC_DIR)/bin
 # make configuration directory
-CONF_DIR   := $(ROOT_DIR)/.make
+CONF_DIR   := $(ROOT_DIR)/make
 # Source languages handled by this build system.  These languages are capable of
 # being compiled to an intermediary format for binary output by one of the
 # provided compilersfor each language

diff --git a/.make/SDL2.mk b/make/SDL2.mk
similarity index 100%
rename from .make/SDL2.mk
rename to make/SDL2.mk

diff --git a/.make/SDL2_image.mk b/make/SDL2_image.mk
similarity index 100%
rename from .make/SDL2_image.mk
rename to make/SDL2_image.mk

diff --git a/.make/SDL2_net.mk b/make/SDL2_net.mk
similarity index 100%
rename from .make/SDL2_net.mk
rename to make/SDL2_net.mk

diff --git a/.make/SDL2_ttf.mk b/make/SDL2_ttf.mk
similarity index 100%
rename from .make/SDL2_ttf.mk
rename to make/SDL2_ttf.mk

diff --git a/.make/jpeg.mk b/make/jpeg.mk
similarity index 100%
rename from .make/jpeg.mk
rename to make/jpeg.mk

diff --git a/.make/lcms2.mk b/make/lcms2.mk
similarity index 100%
rename from .make/lcms2.mk
rename to make/lcms2.mk

diff --git a/.make/png.mk b/make/png.mk
similarity index 100%
rename from .make/png.mk
rename to make/png.mk

diff --git a/.make/tiff.mk b/make/tiff.mk
similarity index 100%
rename from .make/tiff.mk
rename to make/tiff.mk

diff --git a/.make/webp.mk b/make/webp.mk
similarity index 100%
rename from .make/webp.mk
rename to make/webp.mk

diff --git a/.make/wolfssl.mk b/make/wolfssl.mk
similarity index 100%
rename from .make/wolfssl.mk
rename to make/wolfssl.mk

diff --git a/.make/z.mk b/make/z.mk
similarity index 100%
rename from .make/z.mk
rename to make/z.mk