diff options
| author | Robin Gareus <robin@gareus.org> | 2014-10-05 02:12:25 +0200 |
|---|---|---|
| committer | Robin Gareus <robin@gareus.org> | 2014-10-05 02:12:25 +0200 |
| commit | d1564669cfd3508502a16d2f545c305d831e2fcd (patch) | |
| tree | 87619115332fb2a6ff6946ee7daa18250028fcd0 | |
| parent | c57f309d7c45229351a7f40d37c04e6889dbe0f4 (diff) | |
windows application icon
| -rw-r--r-- | gtk2_ardour/windows_icon.rc | 1 | ||||
| -rw-r--r-- | gtk2_ardour/wscript | 7 | ||||
| -rwxr-xr-x | tools/x-mingw.sh | 1 | ||||
| -rw-r--r-- | wscript | 4 |
4 files changed, 12 insertions, 1 deletions
diff --git a/gtk2_ardour/windows_icon.rc b/gtk2_ardour/windows_icon.rc new file mode 100644 index 0000000000..4fc17d0fd2 --- /dev/null +++ b/gtk2_ardour/windows_icon.rc @@ -0,0 +1 @@ +IDI_ICON1 ICON DISCARDABLE "icons/ardour.ico" diff --git a/gtk2_ardour/wscript b/gtk2_ardour/wscript index e97248e658..e8888f92d2 100644 --- a/gtk2_ardour/wscript +++ b/gtk2_ardour/wscript @@ -8,6 +8,7 @@ import sys import re import time from waflib.Task import Task +from waflib.Tools import winres I18N_PACKAGE = 'gtk2_ardour3' @@ -398,7 +399,10 @@ def build(bld): obj.target = 'gtk2_ardour' else: # just the normal executable version of the GTK GUI - obj = bld (features = 'cxx c cxxprogram') + if bld.env['build_target'] == 'mingw': + obj = bld (features = 'cxx c cxxprogram winres') + else: + obj = bld (features = 'cxx c cxxprogram') obj.source = gtk2_ardour_sources obj.target = 'ardour-' + str (bld.env['VERSION']) obj.includes = ['.'] @@ -438,6 +442,7 @@ def build(bld): obj.source += [ 'cocoacarbon.mm', 'bundle_env_cocoa.cc' ] elif bld.env['build_target'] == 'mingw': obj.source += [ 'bundle_env_mingw.cc' ] + obj.source += [ 'windows_icon.rc' ] else: obj.source += [ 'bundle_env_linux.cc' ] diff --git a/tools/x-mingw.sh b/tools/x-mingw.sh index 3234a4df7c..082110f37a 100755 --- a/tools/x-mingw.sh +++ b/tools/x-mingw.sh @@ -546,6 +546,7 @@ export LD=${XPREFIX}-ld export NM=${XPREFIX}-nm export AS=${XPREFIX}-as export STRIP=${XPREFIX}-strip +export WINRC=${XPREFIX}-windres export RANLIB=${XPREFIX}-ranlib export DLLTOOL=${XPREFIX}-dlltool @@ -7,6 +7,7 @@ import string import subprocess import sys import platform as PLATFORM +from waflib.Tools import winres def fetch_git_revision (): cmd = "git describe HEAD" @@ -508,6 +509,9 @@ def sub_config_and_use(conf, name, has_objects = True): def configure(conf): conf.load('compiler_c') conf.load('compiler_cxx') + if Options.options.dist_target == 'mingw': + conf.load('winres') + conf.env['VERSION'] = VERSION conf.env['MAJOR'] = MAJOR conf.env['MINOR'] = MINOR |