ardour/livetrax
13
0
Fork 0
Code

windows application icon

Browse Source
This commit is contained in:
Robin Gareus 2014-10-05 02:12:25 +02:00
parent c57f309d7c
commit d1564669cf
4 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
gtk2_ardour/windows_icon.rc Normal file
View File

@ -0,0 +1 @@
IDI_ICON1 ICON DISCARDABLE "icons/ardour.ico"

5
gtk2_ardour/wscript
View File

@ -8,6 +8,7 @@ import sys
import re import re
import time import time
from waflib.Task import Task from waflib.Task import Task
from waflib.Tools import winres
I18N_PACKAGE = 'gtk2_ardour3' I18N_PACKAGE = 'gtk2_ardour3'
@ -398,6 +399,9 @@ def build(bld):
obj.target = 'gtk2_ardour' obj.target = 'gtk2_ardour'
else: else:
# just the normal executable version of the GTK GUI # just the normal executable version of the GTK GUI
if bld.env['build_target'] == 'mingw':
obj = bld (features = 'cxx c cxxprogram winres')
else:
obj = bld (features = 'cxx c cxxprogram') obj = bld (features = 'cxx c cxxprogram')
obj.source = gtk2_ardour_sources obj.source = gtk2_ardour_sources
obj.target = 'ardour-' + str (bld.env['VERSION']) obj.target = 'ardour-' + str (bld.env['VERSION'])
@ -438,6 +442,7 @@ def build(bld):
obj.source += [ 'cocoacarbon.mm', 'bundle_env_cocoa.cc' ] obj.source += [ 'cocoacarbon.mm', 'bundle_env_cocoa.cc' ]
elif bld.env['build_target'] == 'mingw': elif bld.env['build_target'] == 'mingw':
obj.source += [ 'bundle_env_mingw.cc' ] obj.source += [ 'bundle_env_mingw.cc' ]
obj.source += [ 'windows_icon.rc' ]
else: else:
obj.source += [ 'bundle_env_linux.cc' ] obj.source += [ 'bundle_env_linux.cc' ]

1
tools/x-mingw.sh
View File

@ -546,6 +546,7 @@ export LD=${XPREFIX}-ld
export NM=${XPREFIX}-nm export NM=${XPREFIX}-nm
export AS=${XPREFIX}-as export AS=${XPREFIX}-as
export STRIP=${XPREFIX}-strip export STRIP=${XPREFIX}-strip
export WINRC=${XPREFIX}-windres
export RANLIB=${XPREFIX}-ranlib export RANLIB=${XPREFIX}-ranlib
export DLLTOOL=${XPREFIX}-dlltool export DLLTOOL=${XPREFIX}-dlltool

4
wscript
View File

@ -7,6 +7,7 @@ import string
import subprocess import subprocess
import sys import sys
import platform as PLATFORM import platform as PLATFORM
from waflib.Tools import winres
def fetch_git_revision (): def fetch_git_revision ():
cmd = "git describe HEAD" cmd = "git describe HEAD"
@ -508,6 +509,9 @@ def sub_config_and_use(conf, name, has_objects = True):
def configure(conf): def configure(conf):
conf.load('compiler_c') conf.load('compiler_c')
conf.load('compiler_cxx') conf.load('compiler_cxx')
if Options.options.dist_target == 'mingw':
conf.load('winres')
conf.env['VERSION'] = VERSION conf.env['VERSION'] = VERSION
conf.env['MAJOR'] = MAJOR conf.env['MAJOR'] = MAJOR
conf.env['MINOR'] = MINOR conf.env['MINOR'] = MINOR