LADI
/
ladish
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Support building locally against header-only libraries in autowaf. 

Remove CONFIG_H_PATH define and replace with just "config.h" (define messed up dependency tracking).


git-svn-id: http://svn.drobilla.net/lad/trunk/patchage@1600 a436a847-0d15-0410-975c-d299462d15a1
This commit is contained in:
drobilla 2008-10-03 01:10:58 +00:00
parent 5f855643fe
commit 3cf0f7a849
12 changed files with 12 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/JackDbusDriver.cpp
View File

@ -22,7 +22,7 @@
#include <set>
#include <iostream>
#include CONFIG_H_PATH
#include "config.h"
#include <glib.h>
#include <dbus/dbus.h>

2
src/JackDriver.cpp
View File

@ -20,7 +20,7 @@
#include <string>
#include <set>
#include <iostream>
#include CONFIG_H_PATH
#include "config.h"
#include <jack/jack.h>
#include <jack/statistics.h>
#include <jack/thread.h>

2
src/Patchage.cpp
View File

@ -24,7 +24,7 @@
#include <gtk/gtkwindow.h>
#include <raul/SharedPtr.hpp>
#include CONFIG_H_PATH
#include "config.h"
#include "GladeFile.hpp"
#if defined(HAVE_JACK_DBUS)
#include "JackDbusDriver.hpp"

2
src/Patchage.hpp
View File

@ -22,7 +22,7 @@
#include <boost/shared_ptr.hpp>
#include <libgnomecanvasmm.h>
#include <libglademm/xml.h>
#include CONFIG_H_PATH
#include "config.h"
#include "Widget.hpp"
class PatchageCanvas;

2
src/PatchageCanvas.cpp
View File

@ -16,7 +16,7 @@
*/
#include <raul/SharedPtr.hpp>
#include CONFIG_H_PATH
#include "config.h"
#include "PatchageCanvas.hpp"
#include "Patchage.hpp"
#if defined(HAVE_JACK_DBUS)

2
src/PatchageCanvas.hpp
View File

@ -18,7 +18,7 @@
#ifndef PATCHAGE_PATCHAGECANVAS_HPP
#define PATCHAGE_PATCHAGECANVAS_HPP
#include CONFIG_H_PATH
#include "config.h"
#include <string>
#ifdef HAVE_ALSA
#include <alsa/asoundlib.h>

2
src/PatchageEvent.cpp
View File

@ -15,7 +15,7 @@
* 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#include CONFIG_H_PATH
#include "config.h"
#include <raul/SharedPtr.hpp>
#include "Patchage.hpp"
#include "PatchageCanvas.hpp"

2
src/PatchageEvent.hpp
View File

@ -22,7 +22,7 @@
#ifdef HAVE_JACK
#include <jack/jack.h>
#endif
#include CONFIG_H_PATH
#include "config.h"
#ifdef HAVE_ALSA
#include <alsa/asoundlib.h>
#endif

2
src/PatchagePort.hpp
View File

@ -18,7 +18,7 @@
#ifndef PATCHAGE_PATCHAGEPORT_HPP
#define PATCHAGE_PATCHAGEPORT_HPP
#include CONFIG_H_PATH
#include "config.h"
#include <string>
#include <boost/shared_ptr.hpp>
#include <flowcanvas/Port.hpp>

2
src/PortID.hpp
View File

@ -18,7 +18,7 @@
#ifndef PATCHAGE_PORTID_HPP
#define PATCHAGE_PORTID_HPP
#include CONFIG_H_PATH
#include "config.h"
#include <cstring>
#ifdef HAVE_JACK

2
src/main.cpp
View File

@ -15,7 +15,7 @@
* 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#include CONFIG_H_PATH
#include "config.h"
#include <iostream>
#include <libgnomecanvasmm.h>

4
wscript
View File

@ -72,15 +72,13 @@ def configure(conf):
autowaf.check_header(conf, 'boost/weak_ptr.hpp', mandatory=True)
conf.env['PATCHAGE_VERSION'] = PATCHAGE_VERSION
conf.env.append_value('CCFLAGS', '-DCONFIG_H_PATH=\\\"waf-config.h\\\"')
conf.env.append_value('CXXFLAGS', '-DCONFIG_H_PATH=\\\"waf-config.h\\\"')
conf.env['APP_INSTALL_NAME'] = Params.g_options.app_install_name
conf.env['APP_HUMAN_NAME'] = Params.g_options.app_human_name
conf.define('DATA_DIR', os.path.normpath(
conf.env['PREFIX'] + '/share/' + conf.env['APP_INSTALL_NAME']))
conf.write_config_header('waf-config.h')
conf.write_config_header('config.h')
autowaf.print_summary(conf)
autowaf.display_header('Patchage Configuration')