[gimp/osx-build: 15/31] app: add some CPPFLAGS in core/Makefile.am to fix the build on OSX



commit 1b9c7db8108bca3f94bea7cc1a1a6ce9365464ac
Author: Michael Natterer <mitch gimp org>
Date:   Wed Dec 11 00:41:24 2013 +0100

    app: add some CPPFLAGS in core/Makefile.am to fix the build on OSX
    
    cherry-picked and adapted to gimp-2-8 from
    00cd9b4e47dea4b4f51da60cb03fa2d575dcdb88
    
    Resolved conflicts:
        app/core/Makefile.am

 app/core/Makefile.am |    9 ++++++++-
 1 files changed, 8 insertions(+), 1 deletions(-)
---
diff --git a/app/core/Makefile.am b/app/core/Makefile.am
index a879932..de6c124 100644
--- a/app/core/Makefile.am
+++ b/app/core/Makefile.am
@@ -1,7 +1,13 @@
 ## Process this file with automake to produce Makefile.in
 
+if PLATFORM_OSX
+xobjective_c = "-xobjective-c"
+endif
+
 AM_CPPFLAGS = \
+       -DGIMPDIR=\""$(gimpdir)"\"                      \
        -DGIMP_APP_VERSION=\"$(GIMP_APP_VERSION)\"      \
+       -DGIMP_USER_VERSION=\"$(GIMP_USER_VERSION)\"    \
        -DG_LOG_DOMAIN=\"Gimp-Core\"
 
 INCLUDES = \
@@ -12,7 +18,8 @@ INCLUDES = \
        $(CAIRO_CFLAGS)         \
        $(GEGL_CFLAGS)          \
        $(GDK_PIXBUF_CFLAGS)    \
-       -I$(includedir)
+       -I$(includedir)                                 \
+       $(xobjective_c)
 
 noinst_LIBRARIES = libappcore.a
 


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]