cmake: support for .res listings

FauxFaux · May 22, 2018 · 0ae0e9a · 0ae0e9a
1 parent d82540c
commit 0ae0e9a
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/mkcmake.py b/mkcmake.py
@@ -130,6 +130,7 @@ def main():
 
  if win:
  headers.append('windows/winstuff.h')
+ files.extend('windows/{}.rc'.format(x.split('.')[0]) for x in expanded if x.endswith('.res'))
  else:
  headers.append('unix/unix.h')
 
@@ -159,7 +160,8 @@ def expand(map, list):
 def to_path(dirs, items):
  for item in items:
  if '.' in item:
- sys.stderr.write('ignoring path {}\n'.format(item))
+ if not item.endswith('.lib') and not item.endswith('.res'):
+ sys.stderr.write('ignoring path {}\n'.format(item))
  else:
  yield find_c_file(dirs, item)
 

diff --git a/windows/windlg.c b/windows/windlg.c
@@ -265,6 +265,9 @@ static int SaneDialogBox(HINSTANCE hinst,
 
  hwnd = CreateDialog(hinst, tmpl, hwndparent, lpDialogFunc);
 
+ // a failure here means linking has gone wrong; resources are missing
+ assert(hwnd);
+
  SetWindowLongPtr(hwnd, BOXFLAGS, 0); /* flags */
  SetWindowLongPtr(hwnd, BOXRESULT, 0); /* result from SaneEndDialog */