diff options
| -rw-r--r-- | configure.ac | 8 | ||||
| -rw-r--r-- | src/Makefile.am | 9 | ||||
| -rw-r--r-- | src/UpdateGUI.cpp | 7 | ||||
| -rw-r--r-- | src/utool-res.rc | 23 | ||||
| -rw-r--r-- | src/wxglade.ico | bin | 0 -> 766 bytes |
5 files changed, 47 insertions, 0 deletions
diff --git a/configure.ac b/configure.ac index a6d19bc..bb89415 100644 --- a/configure.ac +++ b/configure.ac @@ -80,12 +80,17 @@ else utool_wxdir="" fi +AC_ARG_VAR(WINDRES, [Windows resource compiler command]) + ut_cflags="" ut_libs="" PROGRAM_EXT= +windres= case "${host}" in *-*-cygwin* | *-*-mingw32* ) + AC_CHECK_TOOL(WINDRES, [windres]) PROGRAM_EXT=".exe" + windres="${host_alias}-windres" ut_use_msw=yes ut_cflags="${ut_cflags} -D_UNICODE=1 -municode" ut_libs="${ut_libs} -static -lws2_32 -dynamic" @@ -115,10 +120,12 @@ else fi AM_CONDITIONAL([UT_BUILDGUI], [test x"${ut_buildgui}" = xyes]) +AM_CONDITIONAL([HAVE_WINDRES], [test x"${windres}" != x]) AC_SUBST([UT_CFLAGS], [${ut_cflags}]) AC_SUBST([UT_LIBS], [${ut_libs}]) AC_SUBST([WX_CFLAGS], [${wx_cflags}]) AC_SUBST([WX_LIBS], [${wx_libs}]) +AC_SUBST([WINDRES], [${windres}]) AC_CONFIG_HEADERS([src/config.h:src/config.h.in]) AC_OUTPUT @@ -130,6 +137,7 @@ UpdateTool was configured with: CFLAGS/CXXFLAGS..........: ${ut_cflags} Build GUI................: ${ut_buildgui:-disabled} Build for Windows........: ${ut_use_msw:-disabled} + Have windres.............: ${windres:-disabled} Host wxWidgets...........: ${enable_host_wxwidgets:-disabled} wxWidgets Version........: ${wx_version:-unknown} wxWidgets CFLAGS/CXXFLAGS: ${wx_cflags} diff --git a/src/Makefile.am b/src/Makefile.am index b5b9b8e..d984a1a 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -15,3 +15,12 @@ utool_SOURCES += \ UpdateGUI.cpp \ JobQueue.cpp endif + +if HAVE_WINDRES +utool_SOURCES += utool-res.rc + +.rc.o: + $(WINDRES) $^ -o $@ +.o : .rc + $(WINDRES) $^ -o $@ +endif diff --git a/src/UpdateGUI.cpp b/src/UpdateGUI.cpp index b105884..076c211 100644 --- a/src/UpdateGUI.cpp +++ b/src/UpdateGUI.cpp @@ -44,6 +44,13 @@ UpdateGUIFrame::UpdateGUIFrame(const wxString& title, const wxPoint& pos, const : wxFrame(NULL, wxID_ANY, title, pos, size) { SetBackgroundColour(wxColour(220, 220, 220)); +#ifdef WIN32 + /* Set a pretty GUI icon (left-top window bar). + * This requires the Icon to be compiled in a + * resources section with the windres compiler! + */ + SetIcon(wxICON(APPICON)); +#endif wxMenu *menuFile = new wxMenu; menuFile->Append(wxID_UPDATEFILE, diff --git a/src/utool-res.rc b/src/utool-res.rc new file mode 100644 index 0000000..5766a80 --- /dev/null +++ b/src/utool-res.rc @@ -0,0 +1,23 @@ +APPICON ICON "wxglade.ico" +1 VERSIONINFO +FILEVERSION 1,0,0,0 +PRODUCTVERSION 1,0,0,0 +BEGIN + BLOCK "StringFileInfo" + BEGIN + BLOCK "080904E4" + BEGIN + VALUE "FileDescription", "A simple firmware update tool for Energy Manager firmware." + VALUE "FileVersion", "1.0.0" + VALUE "InternalName", "utool" + VALUE "LegalCopyright", "Toni Uhlig" + VALUE "OriginalFilename", "UpdateTool.exe" + VALUE "ProductName", "UpdateTool" + VALUE "ProductVersion", "1.0.0" + END + END + BLOCK "VarFileInfo" + BEGIN + VALUE "Translation", 0x809, 1252 + END +END diff --git a/src/wxglade.ico b/src/wxglade.ico Binary files differnew file mode 100644 index 0000000..2310c5d --- /dev/null +++ b/src/wxglade.ico |