mirror of
https://github.com/Ardour/ardour.git
synced 2026-01-04 20:55:48 +01:00
merge from 2.0-ongoing @ 3581
git-svn-id: svn://localhost/ardour2/branches/3.0@3711 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
parent
e4372df05b
commit
68e943265e
283 changed files with 8269 additions and 3942 deletions
|
|
@ -9,7 +9,7 @@ glibmm2_files = glob.glob('glib/glibmm/*.cc')
|
|||
|
||||
Import('env libraries install_prefix')
|
||||
|
||||
glibmm2 = env.Copy()
|
||||
glibmm2 = env.Clone()
|
||||
glibmm2.Merge([libraries['sigc2'], libraries['glib2']])
|
||||
glibmm2.Append(LIBPATH='#libs/glibmm2',
|
||||
CPPPATH='#libs/glibmm2/glib')
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* glib/glibmmconfig.h. Generated from glibmmconfig.h.in by configure. */
|
||||
/* glib/glibmmconfig.h. Generated by configure. */
|
||||
#ifndef _GLIBMM_CONFIG_H
|
||||
#define _GLIBMM_CONFIG_H 1
|
||||
|
||||
|
|
@ -78,7 +78,7 @@
|
|||
#ifdef GLIBMM_DLL
|
||||
#if defined(GLIBMM_BUILD) && defined(_WINDLL)
|
||||
/* Do not dllexport as it is handled by gendef on MSVC */
|
||||
#define GLIBMM_API
|
||||
#define GLIBMM_API
|
||||
#elif !defined(GLIBMM_BUILD)
|
||||
#define GLIBMM_API __declspec(dllimport)
|
||||
#else
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue