From 4b5cf072255b0df834ba5871ce4db5076dc5db77 Mon Sep 17 00:00:00 2001 From: NishiOwO Date: Wed, 8 Oct 2025 11:22:35 +0000 Subject: [PATCH] stuff git-svn-id: http://svn2.nishi.boats/svn/milsko/trunk@220 b9cfdab3-6d41-4d17-bbe4-086880011989 --- NTMakefile | 56 ++++++++++++++++++++++++----------------------- src/backend/gdi.c | 2 +- src/backend/gdi.h | 2 +- tools/genmsvc.pl | 35 +++++++++++++++++------------ 4 files changed, 52 insertions(+), 43 deletions(-) mode change 100644 => 100755 tools/genmsvc.pl diff --git a/NTMakefile b/NTMakefile index 8e7d948..b9bbd38 100644 --- a/NTMakefile +++ b/NTMakefile @@ -1,27 +1,29 @@ -# $Id$ -CC = cl -LD = link - -OBJS = src\boldfont.obj src\core.obj src\default.obj src\draw.obj src\error.obj src\font.obj src\lowlevel.obj src\widget\button.obj src\widget\checkbox.obj src\widget\frame.obj src\widget\image.obj src\widget\label.obj src\widget\menu.obj src\widget\opengl.obj src\widget\scrollbar.obj src\widget\submenu.obj src\widget\window.obj src\external\ds.obj src\external\image.obj src\cursor\cross.obj src\cursor\default.obj src\backend\gdi.obj -OOOBJS = oosrc\base.obj oosrc\widget\button.obj oosrc\widget\checkbox.obj oosrc\widget\frame.obj oosrc\widget\image.obj oosrc\widget\label.obj oosrc\widget\menu.obj oosrc\widget\opengl.obj oosrc\widget\scrollbar.obj oosrc\widget\submenu.obj oosrc\widget\window.obj -CFLAGS = /nologo /DSTBI_NO_SIMD /D_MILSKO /DUSE_GDI /DUSE_STB_IMAGE /Iinclude -CXXFLAGS = /nologo /Iinclude -LDFLAGS = /nologo /DLL /LIBPATH:src /LIBPATH:oosrc - -all: src\Mw.dll oosrc\MwOO.dll - -.SUFFIXES: .cc .c .obj - -.c.obj: - $(CC) $(CFLAGS) /TC /c /Fo$@ $< - -.cc.obj: - $(CC) $(CXXFLAGS) /TP /c /Fo$@ $< - -src\Mw.dll: $(OBJS) - $(LD) $(LDFLAGS) /OUT:src\Mw.dll $(OBJS) gdi32.lib user32.lib -oosrc\MwOO.dll: $(OOOBJS) - $(LD) $(LDFLAGS) /OUT:oosrc\MwOO.dll $(OOOBJS) Mw.lib - -clean: - del /q $(OBJS) $(OOOBJS) src\Mw.dll src\Mw.lib src\Mw.exp oosrc\MwOO.dll oosrc\MwOO.lib oosrc\MwOO.exp +# $Id$ +CC = cl +LD = link + +OBJS = src\core.obj src\draw.obj src\default.obj src\lowlevel.obj src\error.obj src\font.obj src\boldfont.obj src\widget\button.obj src\widget\frame.obj src\widget\opengl.obj src\widget\window.obj src\widget\menu.obj src\widget\submenu.obj src\widget\image.obj src\widget\scrollbar.obj src\widget\checkbox.obj src\widget\label.obj src\external\ds.obj src\external\image.obj src\cursor\default.obj src\cursor\cross.obj src\backend\gdi.obj +OOOBJS = oosrc\base.obj oosrc\widget\button.obj oosrc\widget\frame.obj oosrc\widget\image.obj oosrc\widget\menu.obj oosrc\widget\opengl.obj oosrc\widget\scrollbar.obj oosrc\widget\submenu.obj oosrc\widget\window.obj oosrc\widget\checkbox.obj oosrc\widget\label.obj +CFLAGS = /nologo /DSTBI_NO_SIMD /D_MILSKO /DUSE_GDI /DUSE_STB_IMAGE /Iinclude +CXXFLAGS = /nologo /Iinclude +LDFLAGS = /nologo /DLL /LIBPATH:src /LIBPATH:oosrc + +all: src\Mw.dll oosrc\MwOO.dll + +.SUFFIXES: .cc .c .obj + +.c.obj: + $(CC) $(CFLAGS) /TC /c /Fo$@ $< + +.cc.obj: + $(CC) $(CXXFLAGS) /TP /c /Fo$@ $< + +src\Mw.dll: $(OBJS) + $(LD) $(LDFLAGS) /OUT:src\Mw.dll $(OBJS) gdi32.lib user32.lib +oosrc\MwOO.dll: $(OOOBJS) + $(LD) $(LDFLAGS) /OUT:oosrc\MwOO.dll $(OOOBJS) Mw.lib + +clean: + del /q $(OBJS) + del /q $(OOOBJS) + del /q src\Mw.dll src\Mw.lib src\Mw.exp oosrc\MwOO.dll oosrc\MwOO.lib oosrc\MwOO.exp diff --git a/src/backend/gdi.c b/src/backend/gdi.c index 8356667..f585854 100644 --- a/src/backend/gdi.c +++ b/src/backend/gdi.c @@ -371,7 +371,7 @@ void MwLLSetCursor(MwLL handle, MwCursor* image, MwCursor* mask) { } void MwLLDetach(MwLL handle, MwPoint* point) { - RECT rc, rc2; + RECT rc, rc2; LPARAM style = GetWindowLongPtr(handle->hWnd, GWL_STYLE); style |= WS_OVERLAPPEDWINDOW; diff --git a/src/backend/gdi.h b/src/backend/gdi.h index f428ada..9253d3b 100644 --- a/src/backend/gdi.h +++ b/src/backend/gdi.h @@ -17,7 +17,7 @@ #define SetClassLongPtr SetClassLong #define GetClassLongPtr GetClassLong #endif - + struct _MwLL { HINSTANCE hInstance; HWND hWnd; diff --git a/tools/genmsvc.pl b/tools/genmsvc.pl old mode 100644 new mode 100755 index 726d654..af039da --- a/tools/genmsvc.pl +++ b/tools/genmsvc.pl @@ -2,17 +2,17 @@ # $Id$ sub scan { - opendir(DIR, $_[0]); - my @files = readdir(DIR); - foreach my $f (@files){ - if(!($f =~ /^vulkan\.cc?$/) && ($f =~ /\.cc?$/)){ - $f =~ s/\.cc?$/.obj/g; - my $p = $_[0] . "/" . $f; - $p =~ s/\//\\/g; - print(OUT " $p"); - } - } - closedir(DIR); + opendir(DIR, $_[0]); + my @files = readdir(DIR); + foreach my $f (@files) { + if (!($f =~ /^vulkan\.cc?$/) && ($f =~ /\.cc?$/)) { + $f =~ s/\.cc?$/.obj/g; + my $p = $_[0] . "/" . $f; + $p =~ s/\//\\/g; + print(OUT " $p"); + } + } + closedir(DIR); } open(OUT, ">", "NTMakefile"); @@ -30,7 +30,9 @@ print(OUT "OOOBJS ="); scan("oosrc"); scan("oosrc/widget"); print(OUT "\n"); -print(OUT "CFLAGS = /nologo /DSTBI_NO_SIMD /D_MILSKO /DUSE_GDI /DUSE_STB_IMAGE /Iinclude\n"); +print(OUT +"CFLAGS = /nologo /DSTBI_NO_SIMD /D_MILSKO /DUSE_GDI /DUSE_STB_IMAGE /Iinclude\n" +); print(OUT "CXXFLAGS = /nologo /Iinclude\n"); print(OUT "LDFLAGS = /nologo /DLL /LIBPATH:src /LIBPATH:oosrc\n"); print(OUT "\n"); @@ -45,10 +47,15 @@ print(OUT ".cc.obj:\n"); print(OUT "\t\$(CC) \$(CXXFLAGS) /TP /c /Fo\$@ \$<\n"); print(OUT "\n"); print(OUT "src\\Mw.dll: \$(OBJS)\n"); -print(OUT "\t\$(LD) \$(LDFLAGS) /OUT:src\\Mw.dll \$(OBJS) gdi32.lib user32.lib\n"); +print(OUT + "\t\$(LD) \$(LDFLAGS) /OUT:src\\Mw.dll \$(OBJS) gdi32.lib user32.lib\n"); print(OUT "oosrc\\MwOO.dll: \$(OOOBJS)\n"); print(OUT "\t\$(LD) \$(LDFLAGS) /OUT:oosrc\\MwOO.dll \$(OOOBJS) Mw.lib\n"); print(OUT "\n"); print(OUT "clean:\n"); -print(OUT "\tdel /q \$(OBJS) \$(OOOBJS) src\\Mw.dll src\\Mw.lib src\\Mw.exp oosrc\\MwOO.dll oosrc\\MwOO.lib oosrc\\MwOO.exp\n"); +print(OUT "\tdel /q \$(OBJS)\n"); +print(OUT "\tdel /q \$(OOOBJS)\n"); +print(OUT +"\tdel /q src\\Mw.dll src\\Mw.lib src\\Mw.exp oosrc\\MwOO.dll oosrc\\MwOO.lib oosrc\\MwOO.exp\n" +); close(OUT);