Skip to content

Commit 7602fa0

Browse files
committed
FLTK: fix build for osx
1 parent 901f6ca commit 7602fa0

File tree

2 files changed

+13
-4
lines changed

2 files changed

+13
-4
lines changed

configure.ac

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -344,7 +344,7 @@ function buildFLTK() {
344344

345345
FLTK_CXXFLAGS="${PACKAGE_CFLAGS} `fltk-config --cxxflags`"
346346
FLTK_CXXFLAGS="${FLTK_CXXFLAGS} -fno-exceptions -fno-rtti -std=c++11 -Wno-unknown-pragmas"
347-
PACKAGE_LIBS="${PACKAGE_LIBS} `fltk-config --ldstaticflags --use-images` -no-pie"
347+
PACKAGE_LIBS="${PACKAGE_LIBS} `fltk-config --ldstaticflags --use-images`"
348348

349349
dnl do not depend on cygwin.dll under cygwin build
350350
case "${host_os}" in
@@ -354,9 +354,14 @@ function buildFLTK() {
354354
AC_DEFINE(_Win32, 1, [Windows build])
355355
;;
356356

357+
*darwin*)
358+
(cd images && xxd -i sb-desktop-128x128.png > ../src/platform/fltk/icon.h)
359+
;;
360+
357361
*)
358362
(cd images && xxd -i sb-desktop-128x128.png > ../src/platform/fltk/icon.h)
359-
xxd
363+
PACKAGE_LIBS="${PACKAGE_LIBS} -no-pie"
364+
;;
360365
esac
361366

362367
defaultConditionals

src/platform/fltk/FileWidget.cxx

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -416,9 +416,13 @@ void FileWidget::displayPath() {
416416
html.append(fileNode->_isdir ? 0 : (int)fileNode->_size);
417417
}
418418
html.append("</td>");
419-
strftime(modifedTime, sizeof(modifedTime), "%Y-%m-%d %I:%M %p",
419+
if ((int)fileNode->_m_time > 0) {
420+
strftime(modifedTime, sizeof(modifedTime), "%Y-%m-%d %I:%M %p",
420421
localtime(&fileNode->_m_time));
421-
html.append("<td>").append(modifedTime).append("</td></tr>");
422+
html.append("<td>").append(modifedTime).append("</td></tr>");
423+
} else {
424+
html.append("<td>?</td></tr>");
425+
}
422426
}
423427

424428
html.append("</table>");

0 commit comments

Comments
 (0)