From b7415dd240e5182129c041911f42729f7abdf4b4 Mon Sep 17 00:00:00 2001
From: Nishi <nishi@nishi.boats>
Date: Fri, 15 May 2026 01:32:22 +0900
Subject: [PATCH] fix calling convention stuff

---
 NTMakefile           | 2 +-
 WatMakefile          | 2 +-
 configure            | 2 +-
 include/Mw/MachDep.h | 2 +-
 src/core.c           | 5 +++--
 tools/genmk.pl       | 2 +-
 6 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/NTMakefile b/NTMakefile
index 62cf84b..b4943e7 100644
--- a/NTMakefile
+++ b/NTMakefile
@@ -1,7 +1,7 @@
 CC = cl /TC /c /nologo
 LD = link /nologo
 
-MW_CFLAGS =  /Iinclude /Iexternal\libz\include /D_MILSKO /DUSE_GDI /DUSE_STB_TRUETYPE /DUSE_STB_IMAGE /DSTBI_NO_SIMD
+MW_CFLAGS =  /Iinclude /Iexternal\libz\include /D_MILSKO /D_MILSKO_BUILD /DUSE_GDI /DUSE_STB_TRUETYPE /DUSE_STB_IMAGE /DSTBI_NO_SIMD
 MW_LDFLAGS = /DLL
 EXE_CFLAGS = /Iinclude
 EXE_LDFLAGS = 
diff --git a/WatMakefile b/WatMakefile
index 4e5a14a..bd32d9b 100644
--- a/WatMakefile
+++ b/WatMakefile
@@ -1,7 +1,7 @@
 CC = wcc386 -bt=nt -q
 LD = wlink option quiet
 
-MW_CFLAGS = -bd -i=include -i=external/libz/include -d_MILSKO -dUSE_GDI -dUSE_STB_TRUETYPE -dUSE_STB_IMAGE -dSTBI_NO_SIMD
+MW_CFLAGS = -bd -i=include -i=external/libz/include -d_MILSKO -d_MILSKO_BUILD -dUSE_GDI -dUSE_STB_TRUETYPE -dUSE_STB_IMAGE -dSTBI_NO_SIMD
 MW_LDFLAGS = system nt_dll
 EXE_CFLAGS = -i=include
 EXE_LDFLAGS = system nt
diff --git a/configure b/configure
index bf4699a..0192a22 100755
--- a/configure
+++ b/configure
@@ -16,7 +16,7 @@ our $cxx       = defined($ENV{CXX}) ? $ENV{CXX} : "*host*g++";
 our $ar       = defined($ENV{AR}) ? $ENV{AR} : "*host*ar";
 our $incdir   = "-I include";
 our $incdir2 = "";
-our $cflags   = "-fPIC -D_MILSKO -fvisibility=hidden";
+our $cflags   = "-fPIC -D_MILSKO -D_MILSKO_BUILD -fvisibility=hidden";
 our $libdir   = "";
 our $ldflags  = "";
 our $math     = "-lm";
diff --git a/include/Mw/MachDep.h b/include/Mw/MachDep.h
index 7fb94eb..0415b4c 100644
--- a/include/Mw/MachDep.h
+++ b/include/Mw/MachDep.h
@@ -89,7 +89,7 @@
 #endif
 
 /* Windows */
-#if defined(_MILSKO) && defined(_WIN32)
+#if defined(_MILSKO) && defined(_MILSKO_BUILD) && defined(_WIN32)
 #define MWDECL extern __declspec(dllexport)
 #elif defined(_WIN32)
 #define MWDECL extern __declspec(dllimport)
diff --git a/src/core.c b/src/core.c
index f1a6c3d..db81a2b 100644
--- a/src/core.c
+++ b/src/core.c
@@ -18,8 +18,8 @@
 		MwLLEndDraw(handle->lowlevel); \
 	}
 
-static void	MwVaListApply_Internal(MwWidget handle, va_list va, int only_early);
-static MwWidget MwCreateWidget_Internal(MwClass widget_class, const char* name, MwWidget parent, int x, int y, unsigned int width, unsigned int height, int do_prop, va_list prop);
+static void	MWAPI MwVaListApply_Internal(MwWidget handle, va_list va, int only_early);
+static MwWidget MWAPI MwCreateWidget_Internal(MwClass widget_class, const char* name, MwWidget parent, int x, int y, unsigned int width, unsigned int height, int do_prop, va_list prop);
 
 static void lldrawhandler(MwLL handle, void* data) {
 	MwWidget h = (MwWidget)handle->common.user;
@@ -850,6 +850,7 @@ static void MwVaListApply_Internal(MwWidget handle, va_list va, int only_early)
 		for(i = 0; keys[i] != NULL; i++) {
 			MwDispatch3(handle, prop_change, keys[i]);
 		}
+
 		MwDispatch3(handle, props_change, keys);
 	}
 
diff --git a/tools/genmk.pl b/tools/genmk.pl
index d0a4728..6977df2 100755
--- a/tools/genmk.pl
+++ b/tools/genmk.pl
@@ -116,7 +116,7 @@ sub generate {
     print(OUT "LD = $link\n");
     print(OUT "\n");
     print(OUT
-"MW_CFLAGS = ${cdll} ${inc}include ${inc}external${dir}libz${dir}include ${def}_MILSKO ${def}USE_GDI ${def}USE_STB_TRUETYPE ${def}USE_STB_IMAGE ${def}STBI_NO_SIMD\n"
+"MW_CFLAGS = ${cdll} ${inc}include ${inc}external${dir}libz${dir}include ${def}_MILSKO ${def}_MILSKO_BUILD ${def}USE_GDI ${def}USE_STB_TRUETYPE ${def}USE_STB_IMAGE ${def}STBI_NO_SIMD\n"
     );
     print(OUT "MW_LDFLAGS = $dll\n");
     print(OUT "EXE_CFLAGS = ${inc}include\n");