Changes to mamemingw makefile to work without the special mkdir command and also a small fix for gcc10

This commit is contained in:
tmaul 2020-05-20 23:03:23 +01:00
parent 7006155d16
commit 95973d12ad
2 changed files with 9 additions and 4 deletions

View File

@ -95,8 +95,11 @@ ifdef UNICODE
# lib = -lunicows
endif
lib += -luser32 -lgdi32 -lcomdlg32 -lcomctl32 -lshell32 -lwinmm -lshlwapi -ladvapi32 -lsetupapi -lole32 -luuid -lwininet
lib += -luser32 -lgdi32 -lcomdlg32 -lcomctl32 -lshell32 -lwinmm -lshlwapi -ladvapi32 -lsetupapi -lole32 -luuid -lwininet
ifdef INCLUDE_AVI_RECORDING
lib += -lvfw32
endif
depobj += resource.o \
@ -632,8 +635,10 @@ else
@echo Making normal build...
endif
@echo
@mingw-mkdir -p $(foreach dir, $(alldir),$(objdir)$(dir))
@mingw-mkdir -p $(srcdir)dep/generated
-@cmd /q /e:on /c for %i in ($(foreach dir,$(alldir),$(subst /,\,$(objdir)$(dir))),) do mkdir %i \>nul 2\>nul
-@cmd /q /e:on /c mkdir $(subst /,\,$(srcdir))dep\generated
cleandep:
@echo Removing depend files from $(objdir)...

View File

@ -467,7 +467,7 @@ static INT_PTR CALLBACK DialogProc(HWND hDlg, UINT Msg, WPARAM wParam, LPARAM lP
if ((HWND)lParam == GetDlgItem(hDlg, IDC_INPS_CONTROL) ||
(HWND)lParam == GetDlgItem(hDlg, IDC_INPS_CONTROL_S2))
{
return (BOOL)hWhiteBGBrush;
return (INT_PTR)hWhiteBGBrush;
}
}
return 0;