diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2008-09-10 15:03:30 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2008-09-10 15:03:30 +0000 |
| commit | 68e943265edf04e63a8e8b8f62bab20f99d9c637 (patch) | |
| tree | ff8941a59662fc0c4622944b65f7b2d5e3bdd0c3 /libs/glibmm2 | |
| parent | e4372df05b7d74a6b80dbbf4b6c00cc2b31c4723 (diff) | |
merge from 2.0-ongoing @ 3581
git-svn-id: svn://localhost/ardour2/branches/3.0@3711 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/glibmm2')
| -rw-r--r-- | libs/glibmm2/SConscript | 2 | ||||
| -rw-r--r-- | libs/glibmm2/glib/glibmmconfig.h | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/libs/glibmm2/SConscript b/libs/glibmm2/SConscript index 66434396a3..bbf65ad228 100644 --- a/libs/glibmm2/SConscript +++ b/libs/glibmm2/SConscript @@ -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') diff --git a/libs/glibmm2/glib/glibmmconfig.h b/libs/glibmm2/glib/glibmmconfig.h index 4e4bfa308f..140cc376af 100644 --- a/libs/glibmm2/glib/glibmmconfig.h +++ b/libs/glibmm2/glib/glibmmconfig.h @@ -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 |