fix
This commit is contained in:
parent
21911dd899
commit
dfa8c22f1a
3 changed files with 5 additions and 22 deletions
4
NTMakefile
generated
4
NTMakefile
generated
|
|
@ -1,8 +1,8 @@
|
|||
CC = cl /TC /c /nologo
|
||||
LD = link /nologo
|
||||
|
||||
!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">d3d9flags.mk]
|
||||
!if [where /R "%DXSDK_DIR%\\Include" d3d9.h >nul 2>nul]
|
||||
!if [for /f "delims=" %P in ('where /R "%DXSDK_DIR%\\Include" d3d9.h 2^>nul') do @echo DX9_FLAGS = /DMW_DIRECT3D9 /I"%~dpP">d3d9flags.mk]
|
||||
!endif
|
||||
!else
|
||||
!if [echo DX9_FLAGS =>d3d9flags.mk]
|
||||
|
|
|
|||
16
WatMakefile
generated
16
WatMakefile
generated
|
|
@ -1,20 +1,7 @@
|
|||
CC = wcc386 -bt=nt -q
|
||||
LD = wlink option quiet
|
||||
|
||||
!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">d3d9flags.mk]
|
||||
!endif
|
||||
!else
|
||||
!if [echo DX9_FLAGS =>d3d9flags.mk]
|
||||
!endif
|
||||
!endif
|
||||
!if exist("d3d9flags.mk")
|
||||
!include "d3d9flags.mk"
|
||||
!else
|
||||
DX9_FLAGS =
|
||||
!endif
|
||||
|
||||
MW_CFLAGS = -bd -i=include -i=external/libz/include -d_MILSKO -d_MILSKO_BUILD -dUSE_GDI -dUSE_STB_IMAGE -dSTBI_NO_SIMD -dUSE_GDI_TEXT -dMW_OPENGL $(DX9_FLAGS)
|
||||
MW_CFLAGS = -bd -i=include -i=external/libz/include -d_MILSKO -d_MILSKO_BUILD -dUSE_GDI -dUSE_STB_IMAGE -dSTBI_NO_SIMD -dUSE_GDI_TEXT -dMW_OPENGL
|
||||
MW_LDFLAGS = system nt_dll
|
||||
EXE_CFLAGS = -i=include
|
||||
EXE_LDFLAGS = system nt
|
||||
|
|
@ -121,7 +108,6 @@ clean: .SYMBOLIC
|
|||
%erase src/widget/window.obj
|
||||
%erase src/Mw.dll
|
||||
%erase src/Mw.lib
|
||||
%erase d3d9flags.mk
|
||||
%erase examples/basic/box.obj
|
||||
%erase examples/basic/calculator.obj
|
||||
%erase examples/basic/checkbox.obj
|
||||
|
|
|
|||
|
|
@ -44,8 +44,8 @@ sub cobjs {
|
|||
|
||||
sub d3d9_detect_block {
|
||||
return <<'EOF';
|
||||
!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">d3d9flags.mk]
|
||||
!if [where /R "%DXSDK_DIR%\\Include" d3d9.h >nul 2>nul]
|
||||
!if [for /f "delims=" %P in ('where /R "%DXSDK_DIR%\\Include" d3d9.h 2^>nul') do @echo DX9_FLAGS = /DMW_DIRECT3D9 /I"%~dpP">d3d9flags.mk]
|
||||
!endif
|
||||
!else
|
||||
!if [echo DX9_FLAGS =>d3d9flags.mk]
|
||||
|
|
@ -131,9 +131,6 @@ sub generate {
|
|||
$prefobj = "file ";
|
||||
$needlibs = "${lib}clib3r.lib";
|
||||
$c_dllout = "option implib=src${dir}Mw.lib";
|
||||
|
||||
$d3d9_flags = "\$(DX9_FLAGS)";
|
||||
$d3d9_block = d3d9_detect_block();
|
||||
}
|
||||
|
||||
open(OUT, ">", $output);
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue