diff --git a/.gitattributes b/.gitattributes index eacc67a..2127b99 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,5 +1,5 @@ -/src/external/stb_ds.h linguist-generated -/src/external/stb_image.h linguist-generated +/external/stb_ds.h linguist-generated +/external/stb_image.h linguist-generated /external/libjpeg/include/*.h linguist-generated /external/libjpeg/src/*.c linguist-generated /external/libjpeg/src/*.h linguist-generated diff --git a/GNUmakefile b/GNUmakefile index d3fafa3..28a154e 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -27,7 +27,7 @@ L_LDFLAGS = $(LDFLAGS) L_LIBS = $(LIBS) L_OBJS = src/core.o src/default.o src/draw.o src/lowlevel.o src/font.o src/boldfont.o src/error.o src/unicode.o src/color.o src/messagebox.o -L_OBJS += src/external/ds.o src/external/image.o +L_OBJS += external/ds.o external/image.o L_OBJS += src/widget/window.o src/widget/button.o src/widget/frame.o src/widget/menu.o src/widget/submenu.o src/widget/image.o src/widget/scrollbar.o src/widget/checkbox.o src/widget/label.o src/widget/entry.o src/widget/numberentry.o src/widget/viewport.o L_OBJS += src/cursor/default.o src/cursor/cross.o src/cursor/text.o L_OBJS += src/icon/question.o src/icon/warning.o src/icon/note.o src/icon/info.o src/icon/news.o src/icon/error.o diff --git a/src/external/ds.c b/external/ds.c similarity index 100% rename from src/external/ds.c rename to external/ds.c diff --git a/src/external/image.c b/external/image.c similarity index 100% rename from src/external/image.c rename to external/image.c diff --git a/src/external/stb_ds.h b/external/stb_ds.h similarity index 100% rename from src/external/stb_ds.h rename to external/stb_ds.h diff --git a/src/external/stb_image.h b/external/stb_image.h similarity index 100% rename from src/external/stb_image.h rename to external/stb_image.h diff --git a/src/core.c b/src/core.c index fd398c9..3853527 100644 --- a/src/core.c +++ b/src/core.c @@ -1,7 +1,7 @@ /* $Id$ */ #include -#include "external/stb_ds.h" +#include "../external/stb_ds.h" static void lldrawhandler(MwLL handle, void* data) { MwWidget h = (MwWidget)handle->user; diff --git a/src/draw.c b/src/draw.c index 53455c9..737585c 100644 --- a/src/draw.c +++ b/src/draw.c @@ -2,14 +2,14 @@ #include #ifdef USE_STB_IMAGE -#include "external/stb_image.h" +#include "../external/stb_image.h" #else #include #include #include #endif -#include "external/stb_ds.h" +#include "../external/stb_ds.h" #define FontWidth 7 #define FontHeight 14 diff --git a/src/messagebox.c b/src/messagebox.c index 33ce760..5771bc3 100644 --- a/src/messagebox.c +++ b/src/messagebox.c @@ -1,7 +1,7 @@ /* $Id$ */ #include -#include "external/stb_ds.h" +#include "../external/stb_ds.h" typedef struct msgbox { int key; diff --git a/src/widget/menu.c b/src/widget/menu.c index 97c51cf..bf9927e 100644 --- a/src/widget/menu.c +++ b/src/widget/menu.c @@ -1,7 +1,7 @@ /* $Id$ */ #include -#include "../external/stb_ds.h" +#include "../../external/stb_ds.h" static void set_xywh(MwWidget handle) { int height = 0; diff --git a/src/widget/submenu.c b/src/widget/submenu.c index d6fa2aa..d5d3d07 100644 --- a/src/widget/submenu.c +++ b/src/widget/submenu.c @@ -1,7 +1,7 @@ /* $Id$ */ #include -#include "../external/stb_ds.h" +#include "../../external/stb_ds.h" static int create(MwWidget handle) { MwLLShow(handle->lowlevel, 0); diff --git a/src/widget/vulkan.c b/src/widget/vulkan.c index 5cbdd06..0ec6ed1 100644 --- a/src/widget/vulkan.c +++ b/src/widget/vulkan.c @@ -31,7 +31,7 @@ #include -#include "../external/stb_ds.h" +#include "../../external/stb_ds.h" MwVulkanConfig vulkan_config = { .api_version = VK_API_VERSION_1_0,