forked from enlightenment/efl
First part of the renaming 'quartz' -> 'cocoa'
Quartz is the name of the graphic library Cocoa is the Objective C API to build applications I can't test this so maybe I have forgotten some modifications to do. Please report any problem in that thread SVN revision: 47339
This commit is contained in:
parent
d1c0ea07fc
commit
0b168c9813
|
@ -75,7 +75,7 @@ EXTRA_DIST = AUTHORS COPYING COPYING-PLAIN \
|
|||
ecore-x.pc.in \
|
||||
ecore-win32.pc.in \
|
||||
ecore-sdl.pc.in \
|
||||
ecore-quartz.pc.in \
|
||||
ecore-cocoa.pc.in \
|
||||
ecore-input.pc.in \
|
||||
ecore-wince.pc.in \
|
||||
ecore.spec.in ecore.spec
|
||||
|
@ -144,7 +144,7 @@ pkgconfig_DATA += ecore-sdl.pc
|
|||
endif
|
||||
|
||||
if BUILD_ECORE_QUARTZ
|
||||
pkgconfig_DATA += ecore-quartz.pc
|
||||
pkgconfig_DATA += ecore-cocoa.pc
|
||||
endif
|
||||
|
||||
.PHONY: doc
|
||||
|
|
|
@ -1318,7 +1318,7 @@ ecore-directfb.pc
|
|||
ecore-evas.pc
|
||||
ecore-fb.pc
|
||||
ecore-file.pc
|
||||
ecore-quartz.pc
|
||||
ecore-cocoa.pc
|
||||
ecore-imf.pc
|
||||
ecore-imf-evas.pc
|
||||
ecore-ipc.pc
|
||||
|
|
|
@ -44,7 +44,7 @@ endif
|
|||
|
||||
if BUILD_ECORE_QUARTZ
|
||||
ECORE_QUARTZ_INC = -I$(top_srcdir)/src/lib/ecore_quartz -xobjective-c
|
||||
ECORE_QUARTZ_LIB = $(top_builddir)/src/lib/ecore_quartz/libecore_quartz.la
|
||||
ECORE_QUARTZ_LIB = $(top_builddir)/src/lib/ecore_quartz/libecore_cocoa.la
|
||||
else
|
||||
ECORE_QUARTZ_INC =
|
||||
ECORE_QUARTZ_LIB =
|
||||
|
@ -97,7 +97,7 @@ ecore_evas_buffer.c \
|
|||
ecore_evas_directfb.c \
|
||||
ecore_evas_win32.c \
|
||||
ecore_evas_sdl.c \
|
||||
ecore_evas_quartz.c \
|
||||
ecore_evas_cocoa.c \
|
||||
ecore_evas_wince.c
|
||||
|
||||
libecore_evas_la_LIBADD = \
|
||||
|
|
|
@ -19,7 +19,7 @@
|
|||
#include "Ecore_Evas.h"
|
||||
|
||||
#ifdef BUILD_ECORE_EVAS_QUARTZ
|
||||
#include "Ecore_Quartz.h"
|
||||
#include "Ecore_Cocoa.h"
|
||||
#include "Evas_Engine_Quartz.h"
|
||||
|
||||
// FIXME: this engine has lots of problems. only 1 window at a time, drawRect looks wrong, doesnt handle resizes and more
|
|
@ -10,22 +10,22 @@ AM_CPPFLAGS = \
|
|||
|
||||
if BUILD_ECORE_QUARTZ
|
||||
|
||||
lib_LTLIBRARIES = libecore_quartz.la
|
||||
lib_LTLIBRARIES = libecore_cocoa.la
|
||||
include_HEADERS = \
|
||||
Ecore_Quartz.h \
|
||||
Ecore_Quartz_Keys.h
|
||||
Ecore_Cocoa.h \
|
||||
Ecore_Cocoa_Keys.h
|
||||
|
||||
libecore_quartz_la_SOURCES = \
|
||||
ecore_quartz.m \
|
||||
libecore_cocoa_la_SOURCES = \
|
||||
ecore_cocoa.m \
|
||||
ecore_cocoa_window.m
|
||||
|
||||
libecore_quartz_la_LIBADD = \
|
||||
libecore_cocoa_la_LIBADD = \
|
||||
$(top_builddir)/src/lib/ecore/libecore.la \
|
||||
$(top_builddir)/src/lib/ecore_input/libecore_input.la \
|
||||
@EVAS_LIBS@ \
|
||||
@EINA_LIBS@
|
||||
|
||||
libecore_quartz_la_LDFLAGS = @quartz_ldflags@ -version-info @version_info@ @ecore_quartz_release_info@
|
||||
libecore_cocoa_la_LDFLAGS = @quartz_ldflags@ -version-info @version_info@ @ecore_quartz_release_info@
|
||||
|
||||
endif
|
||||
|
||||
|
|
|
@ -10,8 +10,8 @@
|
|||
#include <ecore_private.h>
|
||||
#include <Ecore_Input.h>
|
||||
|
||||
#include "Ecore_Quartz.h"
|
||||
#include "Ecore_Quartz_Keys.h"
|
||||
#include "Ecore_Cocoa.h"
|
||||
#include "Ecore_Cocoa_Keys.h"
|
||||
|
||||
EAPI int ECORE_QUARTZ_EVENT_GOT_FOCUS = 0;
|
||||
EAPI int ECORE_QUARTZ_EVENT_LOST_FOCUS = 0;
|
|
@ -4,7 +4,7 @@
|
|||
|
||||
#include <Cocoa/Cocoa.h>
|
||||
|
||||
#include "Ecore_Quartz.h"
|
||||
#include "Ecore_Cocoa.h"
|
||||
|
||||
Ecore_Cocoa_Window *
|
||||
ecore_cocoa_window_new(int x,
|
||||
|
|
Loading…
Reference in New Issue