forked from enlightenment/efl
Evas: remove WIN32_CPPFLAGS and WIN32_CFLAGS are there are not used anymore. Move some headers in evas_common.h
SVN revision: 68100
This commit is contained in:
parent
393d25034e
commit
4060b7d96e
|
@ -517,20 +517,6 @@ EFL_ATTRIBUTE_UNUSED
|
|||
EFL_ATTRIBUTE_VECTOR
|
||||
EFL_ATTRIBUTE_ALWAYS_INLINE
|
||||
|
||||
WIN32_CPPFLAGS=""
|
||||
case "$host_os" in
|
||||
mingw32ce*)
|
||||
WIN32_CPPFLAGS="-D_WIN32_WCE=0x0420"
|
||||
;;
|
||||
mingw*)
|
||||
WIN32_CPPFLAGS="-D_WIN32_WINNT=0x0500"
|
||||
;;
|
||||
esac
|
||||
AC_SUBST(WIN32_CPPFLAGS)
|
||||
|
||||
WIN32_CFLAGS=""
|
||||
AC_SUBST(WIN32_CFLAGS)
|
||||
|
||||
|
||||
### Checks for linker characteristics
|
||||
lt_enable_auto_import=""
|
||||
|
|
|
@ -18,8 +18,6 @@ AM_CPPFLAGS = \
|
|||
@pthread_cflags@ \
|
||||
@PIXMAN_CFLAGS@
|
||||
|
||||
AM_CFLAGS = @WIN32_CFLAGS@
|
||||
|
||||
bin_PROGRAMS = evas_cserve evas_cserve_tool
|
||||
|
||||
evas_cserve_SOURCES = \
|
||||
|
|
|
@ -201,8 +201,6 @@ AM_CPPFLAGS = \
|
|||
@pthread_cflags@ \
|
||||
@PIXMAN_CFLAGS@
|
||||
|
||||
AM_CFLAGS = @WIN32_CFLAGS@
|
||||
|
||||
lib_LTLIBRARIES = libevas.la
|
||||
|
||||
includes_HEADERS = Evas.h Evas_GL.h
|
||||
|
|
|
@ -7,7 +7,6 @@ AM_CPPFLAGS = -I. \
|
|||
-DPACKAGE_BIN_DIR=\"$(bindir)\" \
|
||||
-DPACKAGE_LIB_DIR=\"$(libdir)\" \
|
||||
-DPACKAGE_DATA_DIR=\"$(datadir)/$(PACKAGE)\" \
|
||||
@WIN32_CPPFLAGS@ \
|
||||
@EVIL_CFLAGS@ \
|
||||
@FREETYPE_CFLAGS@ \
|
||||
@PIXMAN_CFLAGS@ \
|
||||
|
|
|
@ -8,7 +8,6 @@ AM_CPPFLAGS = \
|
|||
-DPACKAGE_BIN_DIR=\"$(bindir)\" \
|
||||
-DPACKAGE_LIB_DIR=\"$(libdir)\" \
|
||||
-DPACKAGE_DATA_DIR=\"$(datadir)/$(PACKAGE)\" \
|
||||
@WIN32_CPPFLAGS@ \
|
||||
@FREETYPE_CFLAGS@ \
|
||||
@EET_CFLAGS@ \
|
||||
@FONTCONFIG_CFLAGS@ \
|
||||
|
|
|
@ -13,7 +13,7 @@ AM_CPPFLAGS = -I. \
|
|||
@FREETYPE_CFLAGS@ @VALGRIND_CFLAGS@ \
|
||||
@PIXMAN_CFLAGS@ \
|
||||
@EET_CFLAGS@ @pthread_cflags@ \
|
||||
@WIN32_CFLAGS@ @EINA_CFLAGS@ \
|
||||
@EINA_CFLAGS@ \
|
||||
@FRIBIDI_CFLAGS@ @HARFBUZZ_CFLAGS@ \
|
||||
@PIXMAN_CFLAGS@
|
||||
|
||||
|
|
|
@ -40,11 +40,7 @@ libevas_engine_common_op_blend_master_sse3_la_CFLAGS = \
|
|||
@FREETYPE_CFLAGS@ @VALGRIND_CFLAGS@ \
|
||||
@PIXMAN_CFLAGS@ \
|
||||
@EET_CFLAGS@ @pthread_cflags@ \
|
||||
@WIN32_CFLAGS@ @EINA_CFLAGS@ \
|
||||
@EINA_CFLAGS@ \
|
||||
@FRIBIDI_CFLAGS@ @HARFBUZZ_CFLAGS@ \
|
||||
@PIXMAN_CFLAGS@ \
|
||||
@EVAS_SSE3_CFLAGS@
|
||||
|
||||
libevas_engine_common_op_blend_master_sse3_la_DEPENENCIES = \
|
||||
$(top_builddir)/config.h
|
||||
|
||||
|
|
|
@ -11,11 +11,8 @@ AM_CPPFLAGS = \
|
|||
@FREETYPE_CFLAGS@ \
|
||||
@EINA_CFLAGS@ \
|
||||
@EVIL_CFLAGS@ \
|
||||
@WIN32_CPPFLAGS@ \
|
||||
@PIXMAN_CFLAGS@
|
||||
|
||||
AM_CFLAGS = @WIN32_CFLAGS@
|
||||
|
||||
noinst_LTLIBRARIES = libevas_file.la
|
||||
libevas_file_la_SOURCES = \
|
||||
evas_path.c \
|
||||
|
|
|
@ -5,6 +5,45 @@
|
|||
#include "config.h" /* so that EAPI in Evas.h is correctly defined */
|
||||
//#endif
|
||||
|
||||
#ifdef STDC_HEADERS
|
||||
# include <stdlib.h>
|
||||
# include <stddef.h>
|
||||
#else
|
||||
# ifdef HAVE_STDLIB_H
|
||||
# include <stdlib.h>
|
||||
# endif
|
||||
#endif
|
||||
#ifdef HAVE_ALLOCA_H
|
||||
# include <alloca.h>
|
||||
#elif !defined alloca
|
||||
# ifdef __GNUC__
|
||||
# define alloca __builtin_alloca
|
||||
# elif defined _AIX
|
||||
# define alloca __alloca
|
||||
# elif defined _MSC_VER
|
||||
# include <malloc.h>
|
||||
# define alloca _alloca
|
||||
# elif !defined HAVE_ALLOCA
|
||||
# ifdef __cplusplus
|
||||
extern "C"
|
||||
# endif
|
||||
void *alloca (size_t);
|
||||
# endif
|
||||
#endif
|
||||
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
#include <sys/types.h>
|
||||
#include <sys/stat.h>
|
||||
#include <time.h>
|
||||
#include <ctype.h>
|
||||
|
||||
#ifndef _MSC_VER
|
||||
# include <stdint.h>
|
||||
#include <unistd.h>
|
||||
#endif
|
||||
|
||||
#ifdef HAVE_EVIL
|
||||
# include <Evil.h>
|
||||
#endif
|
||||
|
@ -21,10 +60,6 @@
|
|||
#include <pixman.h>
|
||||
#endif
|
||||
|
||||
#include <sys/types.h>
|
||||
#include <sys/stat.h>
|
||||
#include <unistd.h>
|
||||
|
||||
#ifndef HAVE_LROUND
|
||||
/* right now i dont care about rendering bugs on platforms without lround
|
||||
(e.g. windows/vc++... yay!)
|
||||
|
@ -171,35 +206,6 @@ extern EAPI int _evas_log_dom_global;
|
|||
|
||||
#endif
|
||||
|
||||
#ifdef HAVE_ALLOCA_H
|
||||
# include <alloca.h>
|
||||
#elif defined __GNUC__
|
||||
# define alloca __builtin_alloca
|
||||
#elif defined _AIX
|
||||
# define alloca __alloca
|
||||
#elif defined _MSC_VER
|
||||
# include <malloc.h>
|
||||
# define alloca _alloca
|
||||
#else
|
||||
# include <stddef.h>
|
||||
# ifdef __cplusplus
|
||||
extern "C"
|
||||
# endif
|
||||
void *alloca (size_t);
|
||||
#endif
|
||||
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
#include <sys/types.h>
|
||||
#include <sys/stat.h>
|
||||
#include <time.h>
|
||||
#include <ctype.h>
|
||||
|
||||
#ifndef _MSC_VER
|
||||
# include <stdint.h>
|
||||
#endif
|
||||
|
||||
#include <ft2build.h>
|
||||
#include FT_FREETYPE_H
|
||||
#include FT_GLYPH_H
|
||||
|
|
|
@ -10,8 +10,6 @@ AM_CPPFLAGS = \
|
|||
@FREETYPE_CFLAGS@ \
|
||||
@PIXMAN_CFLAGS@
|
||||
|
||||
AM_CFLAGS = @WIN32_CFLAGS@
|
||||
|
||||
if BUILD_ENGINE_BUFFER
|
||||
|
||||
BUFFER_SOURCES = \
|
||||
|
|
|
@ -11,8 +11,6 @@ AM_CPPFLAGS = \
|
|||
@EINA_CFLAGS@ \
|
||||
@evas_engine_directfb_cflags@
|
||||
|
||||
AM_CFLAGS = @WIN32_CFLAGS@
|
||||
|
||||
if BUILD_ENGINE_DIRECTFB
|
||||
|
||||
DIRECTFB_SOURCES = evas_engine.c polygon.c
|
||||
|
|
|
@ -10,8 +10,6 @@ AM_CPPFLAGS = \
|
|||
@PIXMAN_CFLAGS@ \
|
||||
@EINA_CFLAGS@
|
||||
|
||||
AM_CFLAGS = @WIN32_CFLAGS@
|
||||
|
||||
if BUILD_ENGINE_SOFTWARE_16
|
||||
|
||||
SOFTWARE_16_SOURCES = evas_engine.c
|
||||
|
|
|
@ -33,7 +33,6 @@ pkgdir = $(libdir)/evas/modules/engines/software_16_wince/$(MODULE_ARCH)
|
|||
pkg_LTLIBRARIES = module.la
|
||||
|
||||
module_la_SOURCES = $(SOFTWARE_16_WINCE_SOURCE)
|
||||
module_la_CFLAGS = @WIN32_CFLAGS@
|
||||
module_la_CXXFLAGS = -fno-rtti -fno-exceptions
|
||||
module_la_LIBADD = @EINA_LIBS@ $(top_builddir)/src/lib/libevas.la $(SOFTWARE_16_WINCE_LIBADD)
|
||||
module_la_LDFLAGS = -no-undefined @lt_enable_auto_import@ -module -avoid-version
|
||||
|
|
|
@ -10,8 +10,6 @@ AM_CPPFLAGS = \
|
|||
@PIXMAN_CFLAGS@ \
|
||||
@EINA_CFLAGS@
|
||||
|
||||
AM_CFLAGS = @WIN32_CFLAGS@
|
||||
|
||||
if BUILD_ENGINE_SOFTWARE_8
|
||||
|
||||
SOFTWARE_8_SOURCES = evas_engine.c
|
||||
|
|
|
@ -10,8 +10,6 @@ AM_CPPFLAGS = \
|
|||
@FREETYPE_CFLAGS@ \
|
||||
@PIXMAN_CFLAGS@
|
||||
|
||||
AM_CFLAGS = @WIN32_CFLAGS@
|
||||
|
||||
SOFTWARE_GENERIC_SOURCES = evas_engine.c
|
||||
|
||||
|
||||
|
|
|
@ -11,8 +11,6 @@ AM_CPPFLAGS = \
|
|||
@EINA_CFLAGS@ \
|
||||
@evas_engine_software_sdl_cflags@
|
||||
|
||||
AM_CFLAGS = @WIN32_CFLAGS@
|
||||
|
||||
if BUILD_ENGINE_SOFTWARE_SDL
|
||||
|
||||
SOFTWARE_SDL_SOURCES = evas_engine.c
|
||||
|
|
|
@ -8,8 +8,7 @@ AM_CPPFLAGS = \
|
|||
@FREETYPE_CFLAGS@ \
|
||||
@PIXMAN_CFLAGS@ \
|
||||
@EINA_CFLAGS@ \
|
||||
@EVIL_CFLAGS@ \
|
||||
@WIN32_CPPFLAGS@
|
||||
@EVIL_CFLAGS@
|
||||
|
||||
if BUILD_LOADER_BMP
|
||||
if !EVAS_STATIC_BUILD_BMP
|
||||
|
|
|
@ -10,8 +10,6 @@ AM_CPPFLAGS = \
|
|||
@evas_image_loader_eet_cflags@ \
|
||||
@EINA_CFLAGS@
|
||||
|
||||
AM_CFLAGS = @WIN32_CFLAGS@
|
||||
|
||||
|
||||
if BUILD_LOADER_EET
|
||||
if !EVAS_STATIC_BUILD_EET
|
||||
|
|
|
@ -9,10 +9,7 @@ AM_CPPFLAGS = \
|
|||
@PIXMAN_CFLAGS@ \
|
||||
@evas_image_loader_generic_cflags@ \
|
||||
@EINA_CFLAGS@ \
|
||||
@EVIL_CFLAGS@ \
|
||||
@WIN32_CPPFLAGS@
|
||||
|
||||
AM_CFLAGS = @WIN32_CFLAGS@
|
||||
@EVIL_CFLAGS@
|
||||
|
||||
|
||||
if BUILD_LOADER_GENERIC
|
||||
|
|
|
@ -10,8 +10,6 @@ AM_CPPFLAGS = \
|
|||
@evas_image_loader_gif_cflags@ \
|
||||
@EINA_CFLAGS@
|
||||
|
||||
AM_CFLAGS = @WIN32_CFLAGS@
|
||||
|
||||
if BUILD_LOADER_GIF
|
||||
if !EVAS_STATIC_BUILD_GIF
|
||||
|
||||
|
|
|
@ -8,8 +8,7 @@ AM_CPPFLAGS = \
|
|||
@FREETYPE_CFLAGS@ \
|
||||
@PIXMAN_CFLAGS@ \
|
||||
@EINA_CFLAGS@ \
|
||||
@EVIL_CFLAGS@ \
|
||||
@WIN32_CPPFLAGS@
|
||||
@EVIL_CFLAGS@
|
||||
|
||||
if BUILD_LOADER_ICO
|
||||
if !EVAS_STATIC_BUILD_ICO
|
||||
|
|
|
@ -9,10 +9,7 @@ AM_CPPFLAGS = \
|
|||
@PIXMAN_CFLAGS@ \
|
||||
@EINA_CFLAGS@ \
|
||||
@evas_image_loader_jpeg_cflags@ \
|
||||
@EVIL_CFLAGS@ \
|
||||
@WIN32_CPPFLAGS@
|
||||
|
||||
AM_CFLAGS = @WIN32_CFLAGS@
|
||||
@EVIL_CFLAGS@
|
||||
|
||||
if BUILD_LOADER_JPEG
|
||||
if !EVAS_STATIC_BUILD_JPEG
|
||||
|
|
|
@ -9,10 +9,7 @@ AM_CPPFLAGS = \
|
|||
@PIXMAN_CFLAGS@ \
|
||||
@EINA_CFLAGS@ \
|
||||
@evas_image_loader_pmaps_cflags@ \
|
||||
@EVIL_CFLAGS@ \
|
||||
@WIN32_CPPFLAGS@
|
||||
|
||||
AM_CFLAGS = @WIN32_CFLAGS@
|
||||
@EVIL_CFLAGS@
|
||||
|
||||
if BUILD_LOADER_PMAPS
|
||||
if !EVAS_STATIC_BUILD_PMAPS
|
||||
|
|
|
@ -9,8 +9,7 @@ AM_CPPFLAGS = \
|
|||
@PIXMAN_CFLAGS@ \
|
||||
@EINA_CFLAGS@ \
|
||||
@evas_image_loader_png_cflags@ \
|
||||
@EVIL_CFLAGS@ \
|
||||
@WIN32_CPPFLAGS@
|
||||
@EVIL_CFLAGS@
|
||||
|
||||
if BUILD_LOADER_PNG
|
||||
if !EVAS_STATIC_BUILD_PNG
|
||||
|
|
|
@ -8,8 +8,7 @@ AM_CPPFLAGS = \
|
|||
@FREETYPE_CFLAGS@ \
|
||||
@PIXMAN_CFLAGS@ \
|
||||
@EINA_CFLAGS@ \
|
||||
@EVIL_CFLAGS@ \
|
||||
@WIN32_CPPFLAGS@
|
||||
@EVIL_CFLAGS@
|
||||
|
||||
if BUILD_LOADER_PSD
|
||||
if !EVAS_STATIC_BUILD_PSD
|
||||
|
|
|
@ -10,8 +10,6 @@ AM_CPPFLAGS = \
|
|||
@EINA_CFLAGS@ \
|
||||
@evas_image_loader_svg_cflags@
|
||||
|
||||
AM_CFLAGS = @WIN32_CFLAGS@
|
||||
|
||||
if BUILD_LOADER_SVG
|
||||
if !EVAS_STATIC_BUILD_SVG
|
||||
|
||||
|
|
|
@ -8,8 +8,7 @@ AM_CPPFLAGS = \
|
|||
@FREETYPE_CFLAGS@ \
|
||||
@PIXMAN_CFLAGS@ \
|
||||
@EINA_CFLAGS@ \
|
||||
@EVIL_CFLAGS@ \
|
||||
@WIN32_CPPFLAGS@
|
||||
@EVIL_CFLAGS@
|
||||
|
||||
if BUILD_LOADER_TGA
|
||||
if !EVAS_STATIC_BUILD_TGA
|
||||
|
|
|
@ -9,10 +9,7 @@ AM_CPPFLAGS = \
|
|||
@PIXMAN_CFLAGS@ \
|
||||
@EINA_CFLAGS@ \
|
||||
@evas_image_loader_tiff_cflags@ \
|
||||
@EVIL_CFLAGS@ \
|
||||
@WIN32_CPPFLAGS@
|
||||
|
||||
AM_CFLAGS = @WIN32_CFLAGS@
|
||||
@EVIL_CFLAGS@
|
||||
|
||||
if BUILD_LOADER_TIFF
|
||||
if !EVAS_STATIC_BUILD_TIFF
|
||||
|
|
|
@ -8,8 +8,7 @@ AM_CPPFLAGS = \
|
|||
@FREETYPE_CFLAGS@ \
|
||||
@PIXMAN_CFLAGS@ \
|
||||
@EINA_CFLAGS@ \
|
||||
@EVIL_CFLAGS@ \
|
||||
@WIN32_CPPFLAGS@
|
||||
@EVIL_CFLAGS@
|
||||
|
||||
if BUILD_LOADER_WBMP
|
||||
if !EVAS_STATIC_BUILD_WBMP
|
||||
|
|
|
@ -9,10 +9,7 @@ AM_CPPFLAGS = \
|
|||
@PIXMAN_CFLAGS@ \
|
||||
@EINA_CFLAGS@ \
|
||||
@evas_image_loader_xpm_cflags@ \
|
||||
@EVIL_CFLAGS@ \
|
||||
@WIN32_CPPFLAGS@
|
||||
|
||||
AM_CFLAGS = @WIN32_CFLAGS@
|
||||
@EVIL_CFLAGS@
|
||||
|
||||
if BUILD_LOADER_XPM
|
||||
if !EVAS_STATIC_BUILD_XPM
|
||||
|
|
|
@ -10,8 +10,6 @@ AM_CPPFLAGS = \
|
|||
@EINA_CFLAGS@ \
|
||||
@evas_image_loader_eet_cflags@
|
||||
|
||||
AM_CFLAGS = @WIN32_CFLAGS@
|
||||
|
||||
if BUILD_LOADER_EET
|
||||
if !EVAS_STATIC_BUILD_EET
|
||||
|
||||
|
|
|
@ -10,8 +10,6 @@ AM_CPPFLAGS= \
|
|||
@EINA_CFLAGS@ \
|
||||
@evas_image_loader_jpeg_cflags@
|
||||
|
||||
AM_CFLAGS = @WIN32_CFLAGS@
|
||||
|
||||
if BUILD_SAVER_JPEG
|
||||
if !EVAS_STATIC_BUILD_JPEG
|
||||
|
||||
|
|
|
@ -9,10 +9,7 @@ AM_CPPFLAGS = \
|
|||
@PIXMAN_CFLAGS@ \
|
||||
@EINA_CFLAGS@ \
|
||||
@evas_image_loader_png_cflags@ \
|
||||
@EVIL_CFLAGS@ \
|
||||
@WIN32_CPPFLAGS@
|
||||
|
||||
AM_CFLAGS = @WIN32_CFLAGS@
|
||||
@EVIL_CFLAGS@
|
||||
|
||||
if BUILD_LOADER_PNG
|
||||
if !EVAS_STATIC_BUILD_PNG
|
||||
|
|
|
@ -10,8 +10,6 @@ AM_CPPFLAGS = \
|
|||
@EINA_CFLAGS@ \
|
||||
@evas_image_loader_tiff_cflags@
|
||||
|
||||
AM_CFLAGS = @WIN32_CFLAGS@
|
||||
|
||||
if BUILD_LOADER_TIFF
|
||||
if !EVAS_STATIC_BUILD_TIFF
|
||||
|
||||
|
|
Loading…
Reference in New Issue