diff options
| author | Damien Lespiau <damien.lespiau@intel.com> | 2012-12-29 02:45:44 +0000 |
|---|---|---|
| committer | Damien Lespiau <damien.lespiau@intel.com> | 2013-01-04 20:29:36 +0000 |
| commit | 7053a8068676331b15a8402e5ff81293c77197d7 (patch) | |
| tree | 8d588d2e0e7fe98170efecfa8c3a08fce6e138b2 | |
| parent | c03bb3d4c5c1ad961391362beeb8f01bcb0e651c (diff) | |
| download | cogl-7053a8068676331b15a8402e5ff81293c77197d7.tar.gz | |
cogl-sharp: Compile cogl-sharp with the defines collected from configure
The cogl-sharp assembly can now use defines to compile in/out part of
it.
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | cogl-sharp/cogl2-sharp.rsp.in (renamed from cogl-sharp/cogl2-sharp.rsp) | 1 | ||||
| -rw-r--r-- | configure.ac | 8 |
3 files changed, 10 insertions, 0 deletions
@@ -33,6 +33,7 @@ stamp-marshal /cogl-pango/cogl-pango.rc /cogl-sharp/AssemblyInfo.cs /cogl-sharp/TestResult.xml +/cogl-sharp/cogl2-sharp.rsp /cogl-sharp/tests/Config.cs /cogl/cogl.rc /cogl/cogl-defines.h diff --git a/cogl-sharp/cogl2-sharp.rsp b/cogl-sharp/cogl2-sharp.rsp.in index 9820937a..ecf4ff43 100644 --- a/cogl-sharp/cogl2-sharp.rsp +++ b/cogl-sharp/cogl2-sharp.rsp.in @@ -1,2 +1,3 @@ /target:library /out:cogl2-sharp.dll +@COGL_SHARP_DEFINES@ diff --git a/configure.ac b/configure.ac index 85502ba5..c6e5057b 100644 --- a/configure.ac +++ b/configure.ac @@ -1219,6 +1219,13 @@ AS_IF([test "$enable_cogl_sharp" = "yes" -a "$have_nunit" = "yes"], [enable_nunit=yes], [enable_nunit=no]) AM_CONDITIONAL(BUILD_NUNIT_TESTS, [test "$enable_nunit" = "yes"]) +for x in $COGL_DEFINES_SYMBOLS; do + COGL_SHARP_DEFINES="$COGL_SHARP_DEFINES +/define:$x" +done; +AC_SUBST(COGL_SHARP_DEFINES) +AM_SUBST_NOTMAKE(COGL_SHARP_DEFINES) + dnl ================================================================ dnl What needs to be substituted in other files dnl ================================================================ @@ -1287,6 +1294,7 @@ cogl-gles2/cogl-gles2-experimental.pc cogl-sharp/Makefile cogl-sharp/AssemblyInfo.cs cogl-sharp/cogl2-sharp.pc +cogl-sharp/cogl2-sharp.rsp doc/Makefile doc/reference/Makefile doc/reference/cogl2/Makefile |