summaryrefslogtreecommitdiff
path: root/src/Makefile_Evas.am
diff options
context:
space:
mode:
authorMike Blumenkrantz <zmike@samsung.com>2018-07-25 11:44:21 -0400
committerStefan Schmidt <s.schmidt@samsung.com>2018-09-14 10:54:09 +0200
commit298b97b0b5b102b8ad6e8a3f9e388c49b6b4c4b4 (patch)
treed027f4a665f0181f9521e02ff99d4b15e64a5c3e /src/Makefile_Evas.am
parent0a58590934db289ce15d5af0c5d4e82c2793ffc8 (diff)
build: break out ddraw and cocoa static engine builds into utility libraries
these engines include c++ and objc files, meaning the final evas library will use cxx/objc compilers for linking--even if they are not enabled--as long as they are added to libevas.la in any condition by compiling them into separate libraries and linking those into libevas.la, cc can be used for linking in all cases fix T2838 Differential Revision: https://phab.enlightenment.org/D6682
Diffstat (limited to 'src/Makefile_Evas.am')
-rw-r--r--src/Makefile_Evas.am27
1 files changed, 18 insertions, 9 deletions
diff --git a/src/Makefile_Evas.am b/src/Makefile_Evas.am
index b583c19..7866a16 100644
--- a/src/Makefile_Evas.am
+++ b/src/Makefile_Evas.am
@@ -514,8 +514,6 @@ $(lib_evas_libevas_la_CPPFLAGS) \
514lib_evas_common_libevas_convert_rgb_32_la_LIBADD = @EVAS_LIBS@ 514lib_evas_common_libevas_convert_rgb_32_la_LIBADD = @EVAS_LIBS@
515lib_evas_common_libevas_convert_rgb_32_la_DEPENDENCIES = @EVAS_INTERNAL_LIBS@ 515lib_evas_common_libevas_convert_rgb_32_la_DEPENDENCIES = @EVAS_INTERNAL_LIBS@
516 516
517lib_evas_libevas_la_CXXFLAGS =
518
519lib_evas_libevas_la_LIBADD = \ 517lib_evas_libevas_la_LIBADD = \
520lib/evas/common/libevas_op_blend_sse3.la \ 518lib/evas/common/libevas_op_blend_sse3.la \
521lib/evas/common/libevas_convert_rgb_32.la \ 519lib/evas/common/libevas_convert_rgb_32.la \
@@ -1022,9 +1020,12 @@ modules/evas/engines/gl_cocoa/evas_outbuf.m \
1022modules/evas/engines/gl_cocoa/evas_engine.h \ 1020modules/evas/engines/gl_cocoa/evas_engine.h \
1023modules/evas/engines/gl_cocoa/Evas_Engine_GL_Cocoa.h 1021modules/evas/engines/gl_cocoa/Evas_Engine_GL_Cocoa.h
1024if EVAS_STATIC_BUILD_GL_COCOA 1022if EVAS_STATIC_BUILD_GL_COCOA
1025lib_evas_libevas_la_SOURCES += $(GL_COCOA_SOURCES) 1023noinst_LTLIBRARIES += modules/evas/engines/gl_cocoa/libglcocoa.la
1026lib_evas_libevas_la_CPPFLAGS += @evas_engine_gl_cocoa_cflags@ 1024lib_evas_libevas_la_LIBADD += modules/evas/engines/gl_cocoa/libglcocoa.la
1027lib_evas_libevas_la_LIBADD += @evas_engine_gl_cocoa_libs@ 1025lib_evas_libevas_la_DEPENDENCIES += modules/evas/engines/gl_cocoa/libglcocoa.la
1026modules_evas_engines_gl_cocoa_libglcocoa_la_SOURCES = $(GL_COCOA_SOURCES)
1027modules_evas_engines_gl_cocoa_libglcocoa_la_CPPFLAGS = @evas_engine_gl_cocoa_cflags@
1028modules_evas_engines_gl_cocoa_libglcocoa_la_LIBADD = @evas_engine_gl_cocoa_libs@
1028else 1029else
1029engineglcocoapkgdir = $(libdir)/evas/modules/engines/gl_cocoa/$(MODULE_ARCH) 1030engineglcocoapkgdir = $(libdir)/evas/modules/engines/gl_cocoa/$(MODULE_ARCH)
1030engineglcocoapkg_LTLIBRARIES = modules/evas/engines/gl_cocoa/module.la 1031engineglcocoapkg_LTLIBRARIES = modules/evas/engines/gl_cocoa/module.la
@@ -1128,10 +1129,18 @@ modules/evas/engines/software_ddraw/evas_ddraw_main.cpp \
1128modules/evas/engines/software_ddraw/evas_engine.h \ 1129modules/evas/engines/software_ddraw/evas_engine.h \
1129modules/evas/engines/software_ddraw/Evas_Engine_Software_DDraw.h 1130modules/evas/engines/software_ddraw/Evas_Engine_Software_DDraw.h
1130if EVAS_STATIC_BUILD_SOFTWARE_DDRAW 1131if EVAS_STATIC_BUILD_SOFTWARE_DDRAW
1131lib_evas_libevas_la_SOURCES += $(SOFTWARE_DDRAW_SOURCES) 1132lib_evas_libevas_la_LIBADD += modules/evas/engines/software_ddraw/libswddraw.la
1132lib_evas_libevas_la_CPPFLAGS += @evas_engine_software_ddraw_cflags@ 1133lib_evas_libevas_la_DEPENDENCIES += modules/evas/engines/software_ddraw/libswddraw.la
1133lib_evas_libevas_la_CXXFLAGS += -fno-rtti -fno-exceptions 1134noinst_LTLIBRARIES += modules/evas/engines/software_ddraw/libswddraw.la
1134lib_evas_libevas_la_LIBADD += @evas_engine_software_ddraw_libs@ 1135modules_evas_engines_software_ddraw_libswddraw_la_SOURCES = $(SOFTWARE_DDRAW_SOURCES)
1136modules_evas_engines_software_ddraw_libswddraw_la_CPPFLAGS = \
1137@evas_engine_software_ddraw_cflags@ \
1138-I$(top_builddir)/src/lib/efl \
1139-I$(top_srcdir)/src/lib/evas/include \
1140-I$(top_srcdir)/src/lib/evas/cserve2 \
1141@EVAS_CFLAGS@
1142modules_evas_engines_software_ddraw_libswddraw_la_CXXFLAGS = -fno-rtti -fno-exceptions
1143modules_evas_engines_software_ddraw_libswddraw_la_LIBADD = @evas_engine_software_ddraw_libs@
1135else 1144else
1136enginesoftwareddrawpkgdir = $(libdir)/evas/modules/engines/software_ddraw/$(MODULE_ARCH) 1145enginesoftwareddrawpkgdir = $(libdir)/evas/modules/engines/software_ddraw/$(MODULE_ARCH)
1137enginesoftwareddrawpkg_LTLIBRARIES = modules/evas/engines/software_ddraw/module.la 1146enginesoftwareddrawpkg_LTLIBRARIES = modules/evas/engines/software_ddraw/module.la