From f6ac546fbbc6dfde45aafd75b166efd1ab743f3b Mon Sep 17 00:00:00 2001 From: Moritz Bunkus Date: Wed, 23 Nov 2011 20:30:00 +0100 Subject: [PATCH] Fix building mkvinfo's resource file if GUIs are disabled --- Rakefile | 3 ++- src/info/resources.rc | 2 ++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/Rakefile b/Rakefile index 3c5ba8524..0fcd57e6c 100644 --- a/Rakefile +++ b/Rakefile @@ -85,6 +85,7 @@ def setup_globals :cxxflags => "#{cflags_common} #{c(:STD_CXX0X)} -Wnon-virtual-dtor -Woverloaded-virtual -Wextra #{c(:WXWIDGETS_CFLAGS)} #{c(:QT_CFLAGS)} #{c(:BOOST_CPPFLAGS)} #{c(:CURL_CFLAGS)} #{c(:USER_CXXFLAGS)}", :cppflags => "#{c(:USER_CPPFLAGS)}", :ldflags => "#{c(:EBML_LDFLAGS)} #{c(:MATROSKA_LDFLAGS)} #{c(:EXTRA_LDFLAGS)} #{c(:PROFILING_LIBS)} #{c(:USER_LDFLAGS)} #{c(:LDFLAGS_RPATHS)} #{c(:BOOST_LDFLAGS)}", + :windres => c?(:USE_WXWIDGETS) ? c(:WXWIDGETS_INCLUDES) : '-DNOWXWIDGETS', } end @@ -157,7 +158,7 @@ rule '.o' => '.c' do |t| end rule '.o' => '.rc' do |t| - runq " WINDRES #{t.source}", "#{c(:WINDRES)} #{c(:WXWIDGETS_INCLUDES)} -Isrc/mmg -o #{t.name} #{t.sources.join(" ")}" + runq " WINDRES #{t.source}", "#{c(:WINDRES)} #{$flags[:windres]} -Isrc/mmg -o #{t.name} #{t.sources.join(" ")}" end rule '.mo' => '.po' do |t| diff --git a/src/info/resources.rc b/src/info/resources.rc index 15d711dd5..d285824e8 100644 --- a/src/info/resources.rc +++ b/src/info/resources.rc @@ -1,6 +1,8 @@ MATROSKAICON ICON "../../share/icons/windows/mkvinfo.ico" +#ifndef NOWXWIDGETS #include "wx/msw/wx.rc" +#endif 1 VERSIONINFO FILEVERSION 5, 0, 1, 0