ardour/livetrax
13
0
Fork 0
Code

minimize rebuild after reconfigure:

Browse Source 
Don't add VERSIONSTRING to the c-flags of
gtk2_ardour, use a dedicated file instead.
This commit is contained in:
Robin Gareus 2014-09-06 17:59:53 +02:00
parent 404a77adb8
commit eb8ae5053f
7 changed files with 24 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gtk2_ardour/about.cc
View File

@ -39,6 +39,10 @@
#include "i18n.h"
#ifdef WAF_BUILD
#include "gtk2ardour-version.h"
#endif
using namespace Gtk;
using namespace Gdk;
using namespace std;

1
gtk2_ardour/ardour_ui.cc
View File

@ -19,6 +19,7 @@
#ifdef WAF_BUILD
#include "gtk2ardour-config.h"
#include "gtk2ardour-version.h"
#endif
#include <algorithm>

4
gtk2_ardour/main.cc
View File

@ -60,6 +60,10 @@
#include <fcntl.h> // Needed for '_fmode'
#endif
#ifdef WAF_BUILD
#include "gtk2ardour-version.h"
#endif
using namespace std;
using namespace Gtk;
using namespace ARDOUR_COMMAND_LINE;

1
gtk2_ardour/startup.cc
View File

@ -19,6 +19,7 @@
#ifdef WAF_BUILD
#include "gtk2ardour-config.h"
#include "gtk2ardour-version.h"
#endif
#include <fstream>

9
gtk2_ardour/utils_videotl.cc
View File

@ -29,6 +29,13 @@
#include "video_image_frame.h"
#include "utils_videotl.h"
#ifdef WAF_BUILD
#include "gtk2ardour-version.h"
#endif
#ifndef ARDOUR_CURL_TIMEOUT
#define ARDOUR_CURL_TIMEOUT (60)
#endif
#include "i18n.h"
using namespace Gtk;
@ -337,7 +344,7 @@ extern "C" {
curl_easy_setopt(curl, CURLOPT_WRITEDATA, (void *)&chunk);
curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, WriteMemoryCallback);
curl_easy_setopt(curl, CURLOPT_USERAGENT, ARDOUR_USER_AGENT);
curl_easy_setopt(curl, CURLOPT_USERAGENT, PROGRAM_NAME VERSIONSTRING);
curl_easy_setopt(curl, CURLOPT_TIMEOUT, ARDOUR_CURL_TIMEOUT);
curl_easy_setopt(curl, CURLOPT_NOSIGNAL, 1);
#ifdef CURLERRORDEBUG

3
gtk2_ardour/video_image_frame.h
View File

@ -20,9 +20,6 @@
#ifndef __ardour_video_image_frame_h__
#define __ardour_video_image_frame_h__
#define ARDOUR_USER_AGENT (PROGRAM_NAME VERSIONSTRING)
#define ARDOUR_CURL_TIMEOUT (60)
#include <string>
#include <glib.h>

7
gtk2_ardour/wscript
View File

@ -281,6 +281,12 @@ def configure(conf):
conf.write_config_header('gtk2ardour-config.h', remove=False)
bak = conf.env['define_key']
conf.define('VERSIONSTRING', str (conf.env['VERSION']))
conf.env['define_key'] = {'VERSIONSTRING'}
conf.write_config_header('gtk2ardour-version.h')
conf.env['define_key'] = bak;
# Boost headers
autowaf.check_header(conf, 'cxx', 'boost/shared_ptr.hpp')
autowaf.check_header(conf, 'cxx', 'boost/weak_ptr.hpp')
@ -417,7 +423,6 @@ def build(bld):
obj.defines = [
'PACKAGE="' + I18N_PACKAGE + '"',
'VERSIONSTRING="' + str (bld.env['VERSION']) + '"',
'DATA_DIR="' + os.path.normpath(bld.env['DATADIR']) + '"',
'CONFIG_DIR="' + os.path.normpath(bld.env['SYSCONFDIR']) + '"',
'LOCALEDIR="' + os.path.join(os.path.normpath(bld.env['DATADIR']), 'locale') + '"',