correct names
All checks were successful
pyrite-dev/milsko/pipeline/head This commit looks good

This commit is contained in:
Nishi 2026-09-18 16:49:06 +09:00
commit 9de7b9c987
3 changed files with 26 additions and 26 deletions

10
NTMakefile generated
View file

@ -2,14 +2,14 @@ CC = cl /TC /c /nologo
LD = link /nologo LD = link /nologo
!if [where d3d9.h >nul 2>nul] !if [where d3d9.h >nul 2>nul]
!if [for /f "delims=" %P in ('where d3d9.h 2^>nul') do @echo DX9_FLAGS = /DMW_DIRECT3D9 /I"%~dpP">dx9flags.mk] !if [for /f "delims=" %P in ('where d3d9.h 2^>nul') do @echo DX9_FLAGS = /DMW_DIRECT3D9 /I"%~dpP">d3d9flags.mk]
!endif !endif
!else !else
!if [echo DX9_FLAGS =>dx9flags.mk] !if [echo DX9_FLAGS =>d3d9flags.mk]
!endif !endif
!endif !endif
!if exist("dx9flags.mk") !if exist("d3d9flags.mk")
!include "dx9flags.mk" !include "d3d9flags.mk"
!else !else
DX9_FLAGS = DX9_FLAGS =
!endif !endif
@ -122,7 +122,7 @@ clean:
del /f /q src\widget\window.obj del /f /q src\widget\window.obj
del /f /q src\Mw.dll del /f /q src\Mw.dll
del /f /q src\Mw.lib del /f /q src\Mw.lib
del /f /q dx9flags.mk del /f /q d3d9flags.mk
del /f /q examples\basic\box.obj del /f /q examples\basic\box.obj
del /f /q examples\basic\calculator.obj del /f /q examples\basic\calculator.obj
del /f /q examples\basic\checkbox.obj del /f /q examples\basic\checkbox.obj

10
WatMakefile generated
View file

@ -2,14 +2,14 @@ CC = wcc386 -bt=nt -q
LD = wlink option quiet LD = wlink option quiet
!if [where d3d9.h >nul 2>nul] !if [where d3d9.h >nul 2>nul]
!if [for /f "delims=" %P in ('where d3d9.h 2^>nul') do @echo DX9_FLAGS = /DMW_DIRECT3D9 /I"%~dpP">dx9flags.mk] !if [for /f "delims=" %P in ('where d3d9.h 2^>nul') do @echo DX9_FLAGS = /DMW_DIRECT3D9 /I"%~dpP">d3d9flags.mk]
!endif !endif
!else !else
!if [echo DX9_FLAGS =>dx9flags.mk] !if [echo DX9_FLAGS =>d3d9flags.mk]
!endif !endif
!endif !endif
!if exist("dx9flags.mk") !if exist("d3d9flags.mk")
!include "dx9flags.mk" !include "d3d9flags.mk"
!else !else
DX9_FLAGS = DX9_FLAGS =
!endif !endif
@ -121,7 +121,7 @@ clean: .SYMBOLIC
%erase src/widget/window.obj %erase src/widget/window.obj
%erase src/Mw.dll %erase src/Mw.dll
%erase src/Mw.lib %erase src/Mw.lib
%erase dx9flags.mk %erase d3d9flags.mk
%erase examples/basic/box.obj %erase examples/basic/box.obj
%erase examples/basic/calculator.obj %erase examples/basic/calculator.obj
%erase examples/basic/checkbox.obj %erase examples/basic/checkbox.obj

View file

@ -42,17 +42,17 @@ sub cobjs {
return $r; return $r;
} }
sub dx9_detect_block { sub d3d9_detect_block {
return <<'EOF'; return <<'EOF';
!if [where d3d9.h >nul 2>nul] !if [where d3d9.h >nul 2>nul]
!if [for /f "delims=" %P in ('where d3d9.h 2^>nul') do @echo DX9_FLAGS = /DMW_DIRECT3D9 /I"%~dpP">dx9flags.mk] !if [for /f "delims=" %P in ('where d3d9.h 2^>nul') do @echo DX9_FLAGS = /DMW_DIRECT3D9 /I"%~dpP">d3d9flags.mk]
!endif !endif
!else !else
!if [echo DX9_FLAGS =>dx9flags.mk] !if [echo DX9_FLAGS =>d3d9flags.mk]
!endif !endif
!endif !endif
!if exist("dx9flags.mk") !if exist("d3d9flags.mk")
!include "dx9flags.mk" !include "d3d9flags.mk"
!else !else
DX9_FLAGS = DX9_FLAGS =
!endif !endif
@ -82,8 +82,8 @@ sub generate {
my $lib = ""; my $lib = "";
my $c_dllout = ""; my $c_dllout = "";
my $c_dllafter = ""; my $c_dllafter = "";
my $dx9_flags = ""; my $d3d9_flags = "";
my $dx9_block = ""; my $d3d9_block = "";
if ($type eq "Borland") { if ($type eq "Borland") {
$cc = "bcc32 -c"; $cc = "bcc32 -c";
@ -108,8 +108,8 @@ sub generate {
$inc = "/I"; $inc = "/I";
$dll = "/DLL"; $dll = "/DLL";
$dx9_flags = "\$(DX9_FLAGS)"; $d3d9_flags = "\$(DX9_FLAGS)";
$dx9_block = dx9_detect_block(); $d3d9_block = d3d9_detect_block();
} }
elsif ($type eq "Watcom") { elsif ($type eq "Watcom") {
$cc = "wcc386 -bt=nt -q"; $cc = "wcc386 -bt=nt -q";
@ -132,20 +132,20 @@ sub generate {
$needlibs = "${lib}clib3r.lib"; $needlibs = "${lib}clib3r.lib";
$c_dllout = "option implib=src${dir}Mw.lib"; $c_dllout = "option implib=src${dir}Mw.lib";
$dx9_flags = "\$(DX9_FLAGS)"; $d3d9_flags = "\$(DX9_FLAGS)";
$dx9_block = dx9_detect_block(); $d3d9_block = d3d9_detect_block();
} }
open(OUT, ">", $output); open(OUT, ">", $output);
print(OUT "CC = $cc\n"); print(OUT "CC = $cc\n");
print(OUT "LD = $link\n"); print(OUT "LD = $link\n");
print(OUT "\n"); print(OUT "\n");
if ($dx9_block ne "") { if ($d3d9_block ne "") {
print(OUT $dx9_block); print(OUT $d3d9_block);
print(OUT "\n"); print(OUT "\n");
} }
print(OUT print(OUT
"MW_CFLAGS = ${cdll} ${inc}include ${inc}external${dir}libz${dir}include ${def}_MILSKO ${def}_MILSKO_BUILD ${def}USE_GDI ${def}USE_STB_IMAGE ${def}STBI_NO_SIMD ${def}USE_GDI_TEXT ${def}MW_OPENGL ${dx9_flags}\n" "MW_CFLAGS = ${cdll} ${inc}include ${inc}external${dir}libz${dir}include ${def}_MILSKO ${def}_MILSKO_BUILD ${def}USE_GDI ${def}USE_STB_IMAGE ${def}STBI_NO_SIMD ${def}USE_GDI_TEXT ${def}MW_OPENGL ${d3d9_flags}\n"
); );
print(OUT "MW_LDFLAGS = $dll\n"); print(OUT "MW_LDFLAGS = $dll\n");
print(OUT "EXE_CFLAGS = ${inc}include\n"); print(OUT "EXE_CFLAGS = ${inc}include\n");
@ -181,8 +181,8 @@ sub generate {
} }
print(OUT " $del src${dir}Mw.dll\n"); print(OUT " $del src${dir}Mw.dll\n");
print(OUT " $del src${dir}Mw.lib\n"); print(OUT " $del src${dir}Mw.lib\n");
if ($dx9_block ne "") { if ($d3d9_block ne "") {
print(OUT " $del dx9flags.mk\n"); print(OUT " $del d3d9flags.mk\n");
} }
foreach my $f (@examples) { foreach my $f (@examples) {
my $b = $f; my $b = $f;