From 8d75f5895821b21ce51cf09a8f106beb0d5af53e Mon Sep 17 00:00:00 2001 From: NishiOwO Date: Fri, 31 Oct 2025 21:09:30 +0000 Subject: [PATCH] move files git-svn-id: http://svn2.nishi.boats/svn/milsko/trunk@537 b9cfdab3-6d41-4d17-bbe4-086880011989 --- .gitattributes | 2 ++ BorMakefile | 16 +++++++++------- GNUmakefile | 4 ++-- NTMakefile | 16 +++++++++------- WatMakefile | 30 ++++++++++++++++++------------ include/Mw/BaseTypes.h | 26 +++++++++++++------------- src/{text => font}/boldfont.c | 0 src/{text => font}/boldttf.c | 0 src/{text => font}/font.c | 0 src/{text => font}/ttf.c | 0 src/{text/draw.c => text.c} | 2 +- tools/genmk.pl | 1 + tools/ttf.sh | 4 ++-- 13 files changed, 57 insertions(+), 44 deletions(-) rename src/{text => font}/boldfont.c (100%) rename src/{text => font}/boldttf.c (100%) rename src/{text => font}/font.c (100%) rename src/{text => font}/ttf.c (100%) rename src/{text/draw.c => text.c} (99%) diff --git a/.gitattributes b/.gitattributes index 0ceed05..2423425 100644 --- a/.gitattributes +++ b/.gitattributes @@ -10,3 +10,5 @@ /external/libpng/src/*.c linguist-generated /external/libpng/src/*.h linguist-generated /resource/doxygen-theme/* linguist-generated +/src/icon/*.c linguist-generated +/src/font/*.c linguist-generated diff --git a/BorMakefile b/BorMakefile index d9af66a..bca4623 100644 --- a/BorMakefile +++ b/BorMakefile @@ -8,6 +8,7 @@ LDFLAGS = -tWD all: src\Mw.dll clean: del /f /q src\core.obj + del /f /q src\text.obj del /f /q src\string.obj del /f /q src\draw.obj del /f /q src\default.obj @@ -54,16 +55,17 @@ clean: del /f /q src\widget\label.obj del /f /q src\widget\listbox.obj del /f /q src\widget\numberentry.obj - del /f /q src\text\font.obj - del /f /q src\text\draw.obj - del /f /q src\text\boldfont.obj - del /f /q src\text\ttf.obj - del /f /q src\text\boldttf.obj + del /f /q src\widget\progressbar.obj + del /f /q src\widget\radiobox.obj + del /f /q src\font\boldttf.obj + del /f /q src\font\ttf.obj + del /f /q src\font\boldfont.obj + del /f /q src\font\font.obj del /f /q src\backend\gdi.obj del /f /q src\Mw.dll -src\Mw.dll: src\core.obj src\string.obj src\draw.obj src\default.obj src\filechooser.obj src\lowlevel.obj src\error.obj src\unicode.obj src\color.obj src\directory.obj src\messagebox.obj external\stb_ds.obj external\stb_image.obj external\stb_truetype.obj src\icon\info.obj src\icon\note.obj src\icon\warning.obj src\icon\error.obj src\icon\news.obj src\icon\directory.obj src\icon\file.obj src\icon\back.obj src\icon\forward.obj src\icon\up.obj src\icon\computer.obj src\icon\search.obj src\icon\down.obj src\icon\left.obj src\icon\right.obj src\cursor\default.obj src\cursor\cross.obj src\cursor\text.obj src\cursor\hidden.obj src\widget\button.obj src\widget\frame.obj src\widget\opengl.obj src\widget\window.obj src\widget\menu.obj src\widget\entry.obj src\widget\submenu.obj src\widget\viewport.obj src\widget\image.obj src\widget\scrollbar.obj src\widget\checkbox.obj src\widget\label.obj src\widget\listbox.obj src\widget\numberentry.obj src\text\font.obj src\text\draw.obj src\text\boldfont.obj src\text\ttf.obj src\text\boldttf.obj src\backend\gdi.obj - $(LD) $(LDFLAGS) -e$@ src\core.obj src\string.obj src\draw.obj src\default.obj src\filechooser.obj src\lowlevel.obj src\error.obj src\unicode.obj src\color.obj src\directory.obj src\messagebox.obj external\stb_ds.obj external\stb_image.obj external\stb_truetype.obj src\icon\info.obj src\icon\note.obj src\icon\warning.obj src\icon\error.obj src\icon\news.obj src\icon\directory.obj src\icon\file.obj src\icon\back.obj src\icon\forward.obj src\icon\up.obj src\icon\computer.obj src\icon\search.obj src\icon\down.obj src\icon\left.obj src\icon\right.obj src\cursor\default.obj src\cursor\cross.obj src\cursor\text.obj src\cursor\hidden.obj src\widget\button.obj src\widget\frame.obj src\widget\opengl.obj src\widget\window.obj src\widget\menu.obj src\widget\entry.obj src\widget\submenu.obj src\widget\viewport.obj src\widget\image.obj src\widget\scrollbar.obj src\widget\checkbox.obj src\widget\label.obj src\widget\listbox.obj src\widget\numberentry.obj src\text\font.obj src\text\draw.obj src\text\boldfont.obj src\text\ttf.obj src\text\boldttf.obj src\backend\gdi.obj -lopengl32.lib -lgdi32.lib -luser32.lib +src\Mw.dll: src\core.obj src\text.obj src\string.obj src\draw.obj src\default.obj src\filechooser.obj src\lowlevel.obj src\error.obj src\unicode.obj src\color.obj src\directory.obj src\messagebox.obj external\stb_ds.obj external\stb_image.obj external\stb_truetype.obj src\icon\info.obj src\icon\note.obj src\icon\warning.obj src\icon\error.obj src\icon\news.obj src\icon\directory.obj src\icon\file.obj src\icon\back.obj src\icon\forward.obj src\icon\up.obj src\icon\computer.obj src\icon\search.obj src\icon\down.obj src\icon\left.obj src\icon\right.obj src\cursor\default.obj src\cursor\cross.obj src\cursor\text.obj src\cursor\hidden.obj src\widget\button.obj src\widget\frame.obj src\widget\opengl.obj src\widget\window.obj src\widget\menu.obj src\widget\entry.obj src\widget\submenu.obj src\widget\viewport.obj src\widget\image.obj src\widget\scrollbar.obj src\widget\checkbox.obj src\widget\label.obj src\widget\listbox.obj src\widget\numberentry.obj src\widget\progressbar.obj src\widget\radiobox.obj src\font\boldttf.obj src\font\ttf.obj src\font\boldfont.obj src\font\font.obj src\backend\gdi.obj + $(LD) $(LDFLAGS) -e$@ src\core.obj src\text.obj src\string.obj src\draw.obj src\default.obj src\filechooser.obj src\lowlevel.obj src\error.obj src\unicode.obj src\color.obj src\directory.obj src\messagebox.obj external\stb_ds.obj external\stb_image.obj external\stb_truetype.obj src\icon\info.obj src\icon\note.obj src\icon\warning.obj src\icon\error.obj src\icon\news.obj src\icon\directory.obj src\icon\file.obj src\icon\back.obj src\icon\forward.obj src\icon\up.obj src\icon\computer.obj src\icon\search.obj src\icon\down.obj src\icon\left.obj src\icon\right.obj src\cursor\default.obj src\cursor\cross.obj src\cursor\text.obj src\cursor\hidden.obj src\widget\button.obj src\widget\frame.obj src\widget\opengl.obj src\widget\window.obj src\widget\menu.obj src\widget\entry.obj src\widget\submenu.obj src\widget\viewport.obj src\widget\image.obj src\widget\scrollbar.obj src\widget\checkbox.obj src\widget\label.obj src\widget\listbox.obj src\widget\numberentry.obj src\widget\progressbar.obj src\widget\radiobox.obj src\font\boldttf.obj src\font\ttf.obj src\font\boldfont.obj src\font\font.obj src\backend\gdi.obj -lopengl32.lib -lgdi32.lib -luser32.lib implib src\Mw.lib src\Mw.dll .c.obj: diff --git a/GNUmakefile b/GNUmakefile index c104063..61ec66c 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -22,12 +22,12 @@ L_CFLAGS = $(DEPINC) $(CFLAGS) -fPIC -D_MILSKO L_LDFLAGS = $(LDFLAGS) L_LIBS = $(LIBS) -L_OBJS = src/core.o src/default.o src/draw.o src/lowlevel.o src/error.o src/unicode.o src/color.o src/messagebox.o src/directory.o src/string.o src/filechooser.o +L_OBJS = src/core.o src/default.o src/draw.o src/lowlevel.o src/error.o src/unicode.o src/color.o src/messagebox.o src/directory.o src/string.o src/filechooser.o src/text.o L_OBJS += external/stb_ds.o external/stb_image.o external/stb_truetype.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 src/widget/listbox.o src/widget/progressbar.o src/widget/radiobox.o L_OBJS += src/cursor/hidden.o src/cursor/default.o src/cursor/cross.o src/cursor/text.o L_OBJS += src/icon/warning.o src/icon/note.o src/icon/info.o src/icon/news.o src/icon/error.o src/icon/file.o src/icon/directory.o src/icon/back.o src/icon/forward.o src/icon/up.o src/icon/down.o src/icon/left.o src/icon/right.o src/icon/computer.o src/icon/search.o -L_OBJS += src/text/font.o src/text/boldfont.o src/text/ttf.o src/text/boldttf.o src/text/draw.o +L_OBJS += src/font/font.o src/font/boldfont.o src/font/ttf.o src/font/boldttf.o E_CFLAGS = $(CFLAGS) E_LDFLAGS = $(LDFLAGS) -Lsrc -Wl,-rpath,$(shell pwd)/src diff --git a/NTMakefile b/NTMakefile index 6b24fc3..4c0e171 100644 --- a/NTMakefile +++ b/NTMakefile @@ -8,6 +8,7 @@ LDFLAGS = /DLL all: src\Mw.dll clean: del /f /q src\core.obj + del /f /q src\text.obj del /f /q src\string.obj del /f /q src\draw.obj del /f /q src\default.obj @@ -54,16 +55,17 @@ clean: del /f /q src\widget\label.obj del /f /q src\widget\listbox.obj del /f /q src\widget\numberentry.obj - del /f /q src\text\font.obj - del /f /q src\text\draw.obj - del /f /q src\text\boldfont.obj - del /f /q src\text\ttf.obj - del /f /q src\text\boldttf.obj + del /f /q src\widget\progressbar.obj + del /f /q src\widget\radiobox.obj + del /f /q src\font\boldttf.obj + del /f /q src\font\ttf.obj + del /f /q src\font\boldfont.obj + del /f /q src\font\font.obj del /f /q src\backend\gdi.obj del /f /q src\Mw.dll -src\Mw.dll: src\core.obj src\string.obj src\draw.obj src\default.obj src\filechooser.obj src\lowlevel.obj src\error.obj src\unicode.obj src\color.obj src\directory.obj src\messagebox.obj external\stb_ds.obj external\stb_image.obj external\stb_truetype.obj src\icon\info.obj src\icon\note.obj src\icon\warning.obj src\icon\error.obj src\icon\news.obj src\icon\directory.obj src\icon\file.obj src\icon\back.obj src\icon\forward.obj src\icon\up.obj src\icon\computer.obj src\icon\search.obj src\icon\down.obj src\icon\left.obj src\icon\right.obj src\cursor\default.obj src\cursor\cross.obj src\cursor\text.obj src\cursor\hidden.obj src\widget\button.obj src\widget\frame.obj src\widget\opengl.obj src\widget\window.obj src\widget\menu.obj src\widget\entry.obj src\widget\submenu.obj src\widget\viewport.obj src\widget\image.obj src\widget\scrollbar.obj src\widget\checkbox.obj src\widget\label.obj src\widget\listbox.obj src\widget\numberentry.obj src\text\font.obj src\text\draw.obj src\text\boldfont.obj src\text\ttf.obj src\text\boldttf.obj src\backend\gdi.obj - $(LD) $(LDFLAGS) /OUT:$@ src\core.obj src\string.obj src\draw.obj src\default.obj src\filechooser.obj src\lowlevel.obj src\error.obj src\unicode.obj src\color.obj src\directory.obj src\messagebox.obj external\stb_ds.obj external\stb_image.obj external\stb_truetype.obj src\icon\info.obj src\icon\note.obj src\icon\warning.obj src\icon\error.obj src\icon\news.obj src\icon\directory.obj src\icon\file.obj src\icon\back.obj src\icon\forward.obj src\icon\up.obj src\icon\computer.obj src\icon\search.obj src\icon\down.obj src\icon\left.obj src\icon\right.obj src\cursor\default.obj src\cursor\cross.obj src\cursor\text.obj src\cursor\hidden.obj src\widget\button.obj src\widget\frame.obj src\widget\opengl.obj src\widget\window.obj src\widget\menu.obj src\widget\entry.obj src\widget\submenu.obj src\widget\viewport.obj src\widget\image.obj src\widget\scrollbar.obj src\widget\checkbox.obj src\widget\label.obj src\widget\listbox.obj src\widget\numberentry.obj src\text\font.obj src\text\draw.obj src\text\boldfont.obj src\text\ttf.obj src\text\boldttf.obj src\backend\gdi.obj opengl32.lib gdi32.lib user32.lib +src\Mw.dll: src\core.obj src\text.obj src\string.obj src\draw.obj src\default.obj src\filechooser.obj src\lowlevel.obj src\error.obj src\unicode.obj src\color.obj src\directory.obj src\messagebox.obj external\stb_ds.obj external\stb_image.obj external\stb_truetype.obj src\icon\info.obj src\icon\note.obj src\icon\warning.obj src\icon\error.obj src\icon\news.obj src\icon\directory.obj src\icon\file.obj src\icon\back.obj src\icon\forward.obj src\icon\up.obj src\icon\computer.obj src\icon\search.obj src\icon\down.obj src\icon\left.obj src\icon\right.obj src\cursor\default.obj src\cursor\cross.obj src\cursor\text.obj src\cursor\hidden.obj src\widget\button.obj src\widget\frame.obj src\widget\opengl.obj src\widget\window.obj src\widget\menu.obj src\widget\entry.obj src\widget\submenu.obj src\widget\viewport.obj src\widget\image.obj src\widget\scrollbar.obj src\widget\checkbox.obj src\widget\label.obj src\widget\listbox.obj src\widget\numberentry.obj src\widget\progressbar.obj src\widget\radiobox.obj src\font\boldttf.obj src\font\ttf.obj src\font\boldfont.obj src\font\font.obj src\backend\gdi.obj + $(LD) $(LDFLAGS) /OUT:$@ src\core.obj src\text.obj src\string.obj src\draw.obj src\default.obj src\filechooser.obj src\lowlevel.obj src\error.obj src\unicode.obj src\color.obj src\directory.obj src\messagebox.obj external\stb_ds.obj external\stb_image.obj external\stb_truetype.obj src\icon\info.obj src\icon\note.obj src\icon\warning.obj src\icon\error.obj src\icon\news.obj src\icon\directory.obj src\icon\file.obj src\icon\back.obj src\icon\forward.obj src\icon\up.obj src\icon\computer.obj src\icon\search.obj src\icon\down.obj src\icon\left.obj src\icon\right.obj src\cursor\default.obj src\cursor\cross.obj src\cursor\text.obj src\cursor\hidden.obj src\widget\button.obj src\widget\frame.obj src\widget\opengl.obj src\widget\window.obj src\widget\menu.obj src\widget\entry.obj src\widget\submenu.obj src\widget\viewport.obj src\widget\image.obj src\widget\scrollbar.obj src\widget\checkbox.obj src\widget\label.obj src\widget\listbox.obj src\widget\numberentry.obj src\widget\progressbar.obj src\widget\radiobox.obj src\font\boldttf.obj src\font\ttf.obj src\font\boldfont.obj src\font\font.obj src\backend\gdi.obj opengl32.lib gdi32.lib user32.lib .c.obj: diff --git a/WatMakefile b/WatMakefile index a236b24..45272c4 100644 --- a/WatMakefile +++ b/WatMakefile @@ -7,6 +7,7 @@ LDFLAGS = system nt_dll all: src/Mw.dll clean: .SYMBOLIC %erase src/core.obj + %erase src/text.obj %erase src/string.obj %erase src/draw.obj %erase src/default.obj @@ -53,21 +54,24 @@ clean: .SYMBOLIC %erase src/widget/label.obj %erase src/widget/listbox.obj %erase src/widget/numberentry.obj - %erase src/text/font.obj - %erase src/text/draw.obj - %erase src/text/boldfont.obj - %erase src/text/ttf.obj - %erase src/text/boldttf.obj + %erase src/widget/progressbar.obj + %erase src/widget/radiobox.obj + %erase src/font/boldttf.obj + %erase src/font/ttf.obj + %erase src/font/boldfont.obj + %erase src/font/font.obj %erase src/backend/gdi.obj %erase src/Mw.dll -src/Mw.dll: src/core.obj src/string.obj src/draw.obj src/default.obj src/filechooser.obj src/lowlevel.obj src/error.obj src/unicode.obj src/color.obj src/directory.obj src/messagebox.obj external/stb_ds.obj external/stb_image.obj external/stb_truetype.obj src/icon/info.obj src/icon/note.obj src/icon/warning.obj src/icon/error.obj src/icon/news.obj src/icon/directory.obj src/icon/file.obj src/icon/back.obj src/icon/forward.obj src/icon/up.obj src/icon/computer.obj src/icon/search.obj src/icon/down.obj src/icon/left.obj src/icon/right.obj src/cursor/default.obj src/cursor/cross.obj src/cursor/text.obj src/cursor/hidden.obj src/widget/button.obj src/widget/frame.obj src/widget/opengl.obj src/widget/window.obj src/widget/menu.obj src/widget/entry.obj src/widget/submenu.obj src/widget/viewport.obj src/widget/image.obj src/widget/scrollbar.obj src/widget/checkbox.obj src/widget/label.obj src/widget/listbox.obj src/widget/numberentry.obj src/text/font.obj src/text/draw.obj src/text/boldfont.obj src/text/ttf.obj src/text/boldttf.obj src/backend/gdi.obj - $(LD) $(LDFLAGS) option implib=src/Mw.lib name $@ file src/core.obj file src/string.obj file src/draw.obj file src/default.obj file src/filechooser.obj file src/lowlevel.obj file src/error.obj file src/unicode.obj file src/color.obj file src/directory.obj file src/messagebox.obj file external/stb_ds.obj file external/stb_image.obj file external/stb_truetype.obj file src/icon/info.obj file src/icon/note.obj file src/icon/warning.obj file src/icon/error.obj file src/icon/news.obj file src/icon/directory.obj file src/icon/file.obj file src/icon/back.obj file src/icon/forward.obj file src/icon/up.obj file src/icon/computer.obj file src/icon/search.obj file src/icon/down.obj file src/icon/left.obj file src/icon/right.obj file src/cursor/default.obj file src/cursor/cross.obj file src/cursor/text.obj file src/cursor/hidden.obj file src/widget/button.obj file src/widget/frame.obj file src/widget/opengl.obj file src/widget/window.obj file src/widget/menu.obj file src/widget/entry.obj file src/widget/submenu.obj file src/widget/viewport.obj file src/widget/image.obj file src/widget/scrollbar.obj file src/widget/checkbox.obj file src/widget/label.obj file src/widget/listbox.obj file src/widget/numberentry.obj file src/text/font.obj file src/text/draw.obj file src/text/boldfont.obj file src/text/ttf.obj file src/text/boldttf.obj file src/backend/gdi.obj library clib3r.lib library opengl32.lib library gdi32.lib library user32.lib +src/Mw.dll: src/core.obj src/text.obj src/string.obj src/draw.obj src/default.obj src/filechooser.obj src/lowlevel.obj src/error.obj src/unicode.obj src/color.obj src/directory.obj src/messagebox.obj external/stb_ds.obj external/stb_image.obj external/stb_truetype.obj src/icon/info.obj src/icon/note.obj src/icon/warning.obj src/icon/error.obj src/icon/news.obj src/icon/directory.obj src/icon/file.obj src/icon/back.obj src/icon/forward.obj src/icon/up.obj src/icon/computer.obj src/icon/search.obj src/icon/down.obj src/icon/left.obj src/icon/right.obj src/cursor/default.obj src/cursor/cross.obj src/cursor/text.obj src/cursor/hidden.obj src/widget/button.obj src/widget/frame.obj src/widget/opengl.obj src/widget/window.obj src/widget/menu.obj src/widget/entry.obj src/widget/submenu.obj src/widget/viewport.obj src/widget/image.obj src/widget/scrollbar.obj src/widget/checkbox.obj src/widget/label.obj src/widget/listbox.obj src/widget/numberentry.obj src/widget/progressbar.obj src/widget/radiobox.obj src/font/boldttf.obj src/font/ttf.obj src/font/boldfont.obj src/font/font.obj src/backend/gdi.obj + $(LD) $(LDFLAGS) option implib=src/Mw.lib name $@ file src/core.obj file src/text.obj file src/string.obj file src/draw.obj file src/default.obj file src/filechooser.obj file src/lowlevel.obj file src/error.obj file src/unicode.obj file src/color.obj file src/directory.obj file src/messagebox.obj file external/stb_ds.obj file external/stb_image.obj file external/stb_truetype.obj file src/icon/info.obj file src/icon/note.obj file src/icon/warning.obj file src/icon/error.obj file src/icon/news.obj file src/icon/directory.obj file src/icon/file.obj file src/icon/back.obj file src/icon/forward.obj file src/icon/up.obj file src/icon/computer.obj file src/icon/search.obj file src/icon/down.obj file src/icon/left.obj file src/icon/right.obj file src/cursor/default.obj file src/cursor/cross.obj file src/cursor/text.obj file src/cursor/hidden.obj file src/widget/button.obj file src/widget/frame.obj file src/widget/opengl.obj file src/widget/window.obj file src/widget/menu.obj file src/widget/entry.obj file src/widget/submenu.obj file src/widget/viewport.obj file src/widget/image.obj file src/widget/scrollbar.obj file src/widget/checkbox.obj file src/widget/label.obj file src/widget/listbox.obj file src/widget/numberentry.obj file src/widget/progressbar.obj file src/widget/radiobox.obj file src/font/boldttf.obj file src/font/ttf.obj file src/font/boldfont.obj file src/font/font.obj file src/backend/gdi.obj library clib3r.lib library opengl32.lib library gdi32.lib library user32.lib src/core.obj: src/core.c $(CC) $(CFLAGS) -fo=$@ $< +src/text.obj: src/text.c + $(CC) $(CFLAGS) -fo=$@ $< src/string.obj: src/string.c $(CC) $(CFLAGS) -fo=$@ $< src/draw.obj: src/draw.c @@ -160,15 +164,17 @@ src/widget/listbox.obj: src/widget/listbox.c $(CC) $(CFLAGS) -fo=$@ $< src/widget/numberentry.obj: src/widget/numberentry.c $(CC) $(CFLAGS) -fo=$@ $< -src/text/font.obj: src/text/font.c +src/widget/progressbar.obj: src/widget/progressbar.c $(CC) $(CFLAGS) -fo=$@ $< -src/text/draw.obj: src/text/draw.c +src/widget/radiobox.obj: src/widget/radiobox.c $(CC) $(CFLAGS) -fo=$@ $< -src/text/boldfont.obj: src/text/boldfont.c +src/font/boldttf.obj: src/font/boldttf.c $(CC) $(CFLAGS) -fo=$@ $< -src/text/ttf.obj: src/text/ttf.c +src/font/ttf.obj: src/font/ttf.c $(CC) $(CFLAGS) -fo=$@ $< -src/text/boldttf.obj: src/text/boldttf.c +src/font/boldfont.obj: src/font/boldfont.c + $(CC) $(CFLAGS) -fo=$@ $< +src/font/font.obj: src/font/font.c $(CC) $(CFLAGS) -fo=$@ $< src/backend/gdi.obj: src/backend/gdi.c $(CC) $(CFLAGS) -fo=$@ $< diff --git a/include/Mw/BaseTypes.h b/include/Mw/BaseTypes.h index c842620..ecfd1d4 100644 --- a/include/Mw/BaseTypes.h +++ b/include/Mw/BaseTypes.h @@ -19,52 +19,52 @@ typedef unsigned char MwBool; #if __STDC_VERSION__ >= 199901L #include -typedef int64_t MwI64; +typedef int64_t MwI64; typedef uint64_t MwU64; -typedef int32_t MwI32; +typedef int32_t MwI32; typedef uint32_t MwU32; -typedef int16_t MwI16; +typedef int16_t MwI16; typedef uint16_t MwU16; -typedef int8_t MwI8; +typedef int8_t MwI8; typedef uint8_t MwU8; #define OTHER_TYPES_DEFINED #elif __GNUC__ > 2 -typedef long long MwI64; +typedef long long MwI64; typedef unsigned long long MwU64; #elif defined(_MSC_VER) || defined(__BORLANDC__) || defined(__WATCOMC__) -typedef __int64 MwI64; +typedef __int64 MwI64; typedef unsigned __int64 MwU64; -typedef __int32 MwI32; +typedef __int32 MwI32; typedef unsigned __int32 MwU32; -typedef __int16 MwI16; +typedef __int16 MwI16; typedef unsigned __int16 MwU16; -typedef __int8 MwI8; +typedef __int8 MwI8; typedef unsigned __int8 MwU8; #define OTHER_TYPES_DEFINED #else /* out of hope */ -typedef long MwI64; +typedef long MwI64; typedef unsigned long MwU64; #endif #ifdef OTHER_TYPES_DEFINED #undef OTHER_TYPES_DEFINED #else -typedef int MwI32; +typedef int MwI32; typedef unsigned int MwU32; -typedef short MwI16; +typedef short MwI16; typedef unsigned short MwU16; -typedef signed char MwI8; +typedef signed char MwI8; typedef unsigned char MwU8; #endif diff --git a/src/text/boldfont.c b/src/font/boldfont.c similarity index 100% rename from src/text/boldfont.c rename to src/font/boldfont.c diff --git a/src/text/boldttf.c b/src/font/boldttf.c similarity index 100% rename from src/text/boldttf.c rename to src/font/boldttf.c diff --git a/src/text/font.c b/src/font/font.c similarity index 100% rename from src/text/font.c rename to src/font/font.c diff --git a/src/text/ttf.c b/src/font/ttf.c similarity index 100% rename from src/text/ttf.c rename to src/font/ttf.c diff --git a/src/text/draw.c b/src/text.c similarity index 99% rename from src/text/draw.c rename to src/text.c index 71c97c3..f98dffb 100644 --- a/src/text/draw.c +++ b/src/text.c @@ -13,7 +13,7 @@ typedef struct ttf { #define TTF #elif defined(USE_STB_TRUETYPE) -#include "../../external/stb_truetype.h" +#include "../external/stb_truetype.h" typedef struct ttf { stbtt_fontinfo font; diff --git a/tools/genmk.pl b/tools/genmk.pl index f0d3d94..79db1af 100755 --- a/tools/genmk.pl +++ b/tools/genmk.pl @@ -149,6 +149,7 @@ scan("src/icon"); scan("src/cursor"); scan("src/widget"); scan("src/text"); +scan("src/font"); push(@cfiles, "src/backend/gdi.c"); generate("BorMakefile", "Borland"); diff --git a/tools/ttf.sh b/tools/ttf.sh index ee11c18..928b909 100755 --- a/tools/ttf.sh +++ b/tools/ttf.sh @@ -7,8 +7,8 @@ for out in src/text/ttf.c src/text/boldttf.c; do echo '' >> $out echo '#if defined(USE_STB_TRUETYPE) || defined(USE_FREETYPE2)' >> $out done -xxd -n MwTTFData -i resource/IBMPlexMono.ttf | sed s/_len/Size/ >> src/text/ttf.c -xxd -n MwBoldTTFData -i resource/IBMPlexMono-Bold.ttf | sed s/_len/Size/ >> src/text/boldttf.c +xxd -n MwTTFData -i resource/IBMPlexMono.ttf | sed s/_len/Size/ >> src/font/ttf.c +xxd -n MwBoldTTFData -i resource/IBMPlexMono-Bold.ttf | sed s/_len/Size/ >> src/font/boldttf.c for out in src/text/ttf.c src/text/boldttf.c; do echo '#endif' >> $out done