X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=wscript;h=89505484572faf032e7df97ad32ff3088f17f34a;hb=76f6ff178e24a9882f7f455c4cf4039e44bfe442;hp=d6741144775fa63bc0766c6a6a95521fef303438;hpb=09687c171239977021af42a7d706af39d0df0173;p=ardour.git

diff --git a/wscript b/wscript
index d674114477..8950548457 100644
--- a/wscript
+++ b/wscript
@@ -9,6 +9,24 @@ import sys
 import platform as PLATFORM
 from waflib.Tools import winres
 
+from waflib.Build import BuildContext
+class i18n(BuildContext):
+        cmd = 'i18n'
+        fun = 'i18n'
+
+class i18n_pot(BuildContext):
+        cmd = 'i18n_pot'
+        fun = 'i18n_pot'
+
+class i18n_po(BuildContext):
+        cmd = 'i18n_po'
+        fun = 'i18n_po'
+
+class i18n_mo(BuildContext):
+        cmd = 'i18n_mo'
+        fun = 'i18n_mo'
+
+
 compiler_flags_dictionaries= {
     'gcc' : {
         # Flags required when building a debug build
@@ -55,16 +73,17 @@ compiler_flags_dictionaries= {
         'c99': '-std=c99',
     },
     'msvc' : {
-        'debuggable' : ['/Od', '/Zi', '/MTd'],
-        'linker-debuggable' : ['/DEBUG' ],
-        'nondebuggable' : [ '/MD', '-DNDEBUG' ],
+        'debuggable' : ['/DDEBUG', '/Od', '/Zi', '/MDd', '/Gd', '/EHsc'],
+        'linker-debuggable' : ['/DEBUG', '/INCREMENTAL' ],
+        'nondebuggable' : ['/DNDEBUG', '/Ob1', '/MD', '/Gd', '/EHsc'],
         'profile' : '',
+        'sse' : '/arch:SSE',
         'silence-unused-arguments' : '',
         'sse' : '',
-        'fpmath-see' : '',
+        'fpmath-sse' : '',
         'xmmintrinsics' : '',
         'pipe' : '',
-        'full-optimization' : '',
+        'full-optimization' : '/O2',
         'no-frame-pointer' : '',
         'fast-math' : '',
         'strength-reduce' : '',
@@ -78,7 +97,7 @@ compiler_flags_dictionaries= {
         'c-strict' : '',
         'cxx-strict' : '',
         'strict' : '',
-        'c99': '-TP',
+        'c99': '/TP',
     },
 }
 
@@ -128,16 +147,16 @@ else:
     rev = fetch_tarball_revision ()
 
 #
-# rev is now of the form MAJOR.MINOR-rev-commit
-# or, if right at the same rev as a release, MAJOR.MINOR
+# rev is now of the form MAJOR.MINOR[-rcX]-rev-commit
+# or, if right at the same rev as a release, MAJOR.MINOR[-rcX]
 #
 
-parts = rev.split ('.')
+parts = rev.split ('.', 1)
 MAJOR = parts[0]
-other = parts[1].split ('-')
+other = parts[1].split('-', 1)
 MINOR = other[0]
 if len(other) > 1:
-    MICRO = other[1]
+    MICRO = other[1].rsplit('-',1)[0].replace('-','.')
 else:
     MICRO = '0'
 
@@ -593,6 +612,8 @@ def options(opt):
                     help='Compile with support for linuxVST plugins')
     opt.add_option('--no-lxvst', action='store_false', dest='lxvst',
                     help='Compile without support for linuxVST plugins')
+    opt.add_option('--no-lrdf', action='store_true', dest='no_lrdf',
+                    help='Compile without support for LRDF LADSPA data even if present')
     opt.add_option('--nls', action='store_true', default=True, dest='nls',
                     help='Enable i18n (native language support) (default)')
     opt.add_option('--no-nls', action='store_false', dest='nls')
@@ -726,7 +747,7 @@ def configure(conf):
     if Options.options.lv2dir:
         conf.env['LV2DIR'] = Options.options.lv2dir
     else:
-        conf.env['LV2DIR'] = os.path.join(conf.env['LIBDIR'], 'lv2')
+        conf.env['LV2DIR'] = os.path.join(conf.env['LIBDIR'], 'ardour' + str(conf.env['MAJOR']), 'lv2')
 
     conf.env['LV2DIR'] = os.path.normpath(conf.env['LV2DIR'])
 
@@ -804,7 +825,8 @@ def configure(conf):
 
     # executing a test program is n/a when cross-compiling
     if Options.options.dist_target != 'mingw':
-        conf.check_cc(function_name='dlopen', header_name='dlfcn.h', lib='dl', uselib_store='DL')
+        if Options.options.dist_target != 'msvc':
+            conf.check_cc(function_name='dlopen', header_name='dlfcn.h', lib='dl', uselib_store='DL')
         conf.check_cxx(fragment = "#include <boost/version.hpp>\nint main(void) { return (BOOST_VERSION >= 103900 ? 0 : 1); }\n",
                   execute = "1",
                   mandatory = True,
@@ -815,7 +837,7 @@ def configure(conf):
     if re.search ("linux", sys.platform) != None and Options.options.dist_target != 'mingw':
         autowaf.check_pkg(conf, 'alsa', uselib_store='ALSA')
 
-    autowaf.check_pkg(conf, 'glib-2.0', uselib_store='GLIB', atleast_version='2.2', mandatory=True)
+    autowaf.check_pkg(conf, 'glib-2.0', uselib_store='GLIB', atleast_version='2.28', mandatory=True)
     autowaf.check_pkg(conf, 'gthread-2.0', uselib_store='GTHREAD', atleast_version='2.2', mandatory=True)
     autowaf.check_pkg(conf, 'glibmm-2.4', uselib_store='GLIBMM', atleast_version='2.32.0', mandatory=True)
     autowaf.check_pkg(conf, 'sndfile', uselib_store='SNDFILE', atleast_version='1.0.18', mandatory=True)
@@ -837,6 +859,7 @@ def configure(conf):
         # needed for at least libsmf
         conf.check_cc(function_name='htonl', header_name='winsock2.h', lib='ws2_32')
         conf.env.append_value('LIB', 'ws2_32')
+        conf.env.append_value('LIB', 'winmm')
         # needed for mingw64 packages, not harmful on normal mingw build
         conf.env.append_value('LIB', 'intl')
         conf.check_cc(function_name='regcomp', header_name='regex.h',
@@ -1031,7 +1054,7 @@ def build(bld):
     bld.path.find_dir ('libs/pbd/pbd')
 
     # set up target directories
-    lwrcase_dirname = 'ardour3'
+    lwrcase_dirname = 'ardour' + bld.env['MAJOR']
 
     if bld.is_defined ('TRX_BUILD'):
         lwrcase_dirname = 'trx'
@@ -1044,6 +1067,7 @@ def build(bld):
     bld.env['DLLDIR'] = os.path.join(bld.env['LIBDIR'], lwrcase_dirname)
     bld.env['LIBDIR'] = bld.env['DLLDIR']
     bld.env['LOCALEDIR'] = os.path.join(bld.env['DATADIR'], 'locale')
+    bld.env['lwrcase_dirname'] = lwrcase_dirname;
 
     autowaf.set_recursive()
 
@@ -1063,6 +1087,7 @@ def build(bld):
         bld.add_post_fun(test)
 
 def i18n(bld):
+    print(bld.env)
     bld.recurse (i18n_children)
 
 def i18n_pot(bld):