dragonleo/NSIS
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Make sure the architecture define is always set

Browse source 
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@7026 212acab6-be3b-0410-9dea-997c60f758d6
This commit is contained in:
anders_k 2018-10-25 18:40:05 +00:00
parent cce4695977
commit 917a77f671
2 changed files with 4 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Contrib/Makensisw/toolbar.cpp
View file

@ -196,7 +196,7 @@ static UINT GetToolbarDropdownMenuPos(HWND hTB, UINT Id, POINT&pt)
static void ShowToolbarDropdownMenu(const NMTOOLBAR&nmtb, HWND hNotifyWnd, HMENU hParentMenu, UINT SubMenuId = -1) static void ShowToolbarDropdownMenu(const NMTOOLBAR&nmtb, HWND hNotifyWnd, HMENU hParentMenu, UINT SubMenuId = -1)
{ {
POINT pt; POINT pt;
HMENU hMenu = SubMenuId == -1 ? hParentMenu : FindSubMenu(hParentMenu, SubMenuId); HMENU hMenu = SubMenuId == static_cast<UINT>(-1) ? hParentMenu : FindSubMenu(hParentMenu, SubMenuId);
UINT tpmf = GetToolbarDropdownMenuPos(nmtb.hdr.hwndFrom, nmtb.iItem, pt); UINT tpmf = GetToolbarDropdownMenuPos(nmtb.hdr.hwndFrom, nmtb.iItem, pt);
TrackPopupMenu(hMenu, tpmf, pt.x, pt.y, 0, hNotifyWnd, NULL); TrackPopupMenu(hMenu, tpmf, pt.x, pt.y, 0, hNotifyWnd, NULL);
} }

5
Source/build.cpp
View file

@ -3863,9 +3863,10 @@ int CEXEBuild::set_target_architecture_data()
{ TARGET_ARM64, _T("NSIS_ARM64"), _T("1") } { TARGET_ARM64, _T("NSIS_ARM64"), _T("1") }
}; };
for (i = 0; i < COUNTOF(tdef); ++i) definedlist.del(tdef[i].def); for (i = 0; i < COUNTOF(tdef); ++i) definedlist.del(tdef[i].def);
for (i = 0; i < COUNTOF(tdef); ++i) if (tdef[i].tt == m_target_type) definedlist.set(tdef[i].def, tdef[i].val); unsigned int success = false;
for (i = 0; i < COUNTOF(tdef); ++i) if (tdef[i].tt == m_target_type) definedlist.set(tdef[i].def, tdef[i].val), ++success;
return PS_OK; return success ? PS_OK : PS_ERROR;
} }
const TCHAR* CEXEBuild::get_target_suffix(CEXEBuild::TARGETTYPE tt, const TCHAR*defval) const const TCHAR* CEXEBuild::get_target_suffix(CEXEBuild::TARGETTYPE tt, const TCHAR*defval) const