cocoa bridge file added
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_8_BRANCH@46176 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
50
Makefile.in
50
Makefile.in
@@ -70,7 +70,7 @@ wx_top_builddir = @wx_top_builddir@
|
||||
DESTDIR =
|
||||
WX_RELEASE = 2.8
|
||||
WX_RELEASE_NODOT = 28
|
||||
WX_VERSION = $(WX_RELEASE).3
|
||||
WX_VERSION = $(WX_RELEASE).4
|
||||
LIBDIRNAME = $(wx_top_builddir)/lib
|
||||
WXREGEX_CFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(____SHARED) \
|
||||
$(CPPFLAGS) $(CFLAGS)
|
||||
@@ -4556,9 +4556,12 @@ COND_TOOLKIT_WINCE___GUI_SRC_OBJECTS = \
|
||||
monodll_tbarwce.o \
|
||||
monodll_textctrlce.o
|
||||
@COND_TOOLKIT_WINCE@__GUI_SRC_OBJECTS = $(COND_TOOLKIT_WINCE___GUI_SRC_OBJECTS)
|
||||
@COND_PLATFORM_MACOSX_1@__MAC_OSX_SRC_OBJECTS = \
|
||||
@COND_PLATFORM_MACOSX_1@ monodll_webkit.o monodll_fontdlgosx.o \
|
||||
@COND_PLATFORM_MACOSX_1@ monodll_colordlgosx.o
|
||||
COND_PLATFORM_MACOSX_1___MAC_OSX_SRC_OBJECTS = \
|
||||
monodll_webkit.o \
|
||||
monodll_fontdlgosx.o \
|
||||
monodll_colordlgosx.o \
|
||||
monodll_utilscocoa.o
|
||||
@COND_PLATFORM_MACOSX_1@__MAC_OSX_SRC_OBJECTS = $(COND_PLATFORM_MACOSX_1___MAC_OSX_SRC_OBJECTS)
|
||||
@COND_TOOLKIT_COCOA@__LOWLEVEL_SRC_OBJECTS_1 = \
|
||||
@COND_TOOLKIT_COCOA@ monodll_gsockosx.o monodll_hid.o monodll_utilsexc_cf.o
|
||||
COND_TOOLKIT_DFB___LOWLEVEL_SRC_OBJECTS_1 = \
|
||||
@@ -6338,9 +6341,12 @@ COND_TOOLKIT_WINCE___GUI_SRC_OBJECTS_1 = \
|
||||
monolib_tbarwce.o \
|
||||
monolib_textctrlce.o
|
||||
@COND_TOOLKIT_WINCE@__GUI_SRC_OBJECTS_1 = $(COND_TOOLKIT_WINCE___GUI_SRC_OBJECTS_1)
|
||||
@COND_PLATFORM_MACOSX_1@__MAC_OSX_SRC_OBJECTS_1 = \
|
||||
@COND_PLATFORM_MACOSX_1@ monolib_webkit.o monolib_fontdlgosx.o \
|
||||
@COND_PLATFORM_MACOSX_1@ monolib_colordlgosx.o
|
||||
COND_PLATFORM_MACOSX_1___MAC_OSX_SRC_OBJECTS_1 = \
|
||||
monolib_webkit.o \
|
||||
monolib_fontdlgosx.o \
|
||||
monolib_colordlgosx.o \
|
||||
monolib_utilscocoa.o
|
||||
@COND_PLATFORM_MACOSX_1@__MAC_OSX_SRC_OBJECTS_1 = $(COND_PLATFORM_MACOSX_1___MAC_OSX_SRC_OBJECTS_1)
|
||||
@COND_TOOLKIT_COCOA@__LOWLEVEL_SRC_OBJECTS_3 = \
|
||||
@COND_TOOLKIT_COCOA@ monolib_gsockosx.o monolib_hid.o monolib_utilsexc_cf.o
|
||||
COND_TOOLKIT_DFB___LOWLEVEL_SRC_OBJECTS_3 = \
|
||||
@@ -8349,9 +8355,12 @@ COND_TOOLKIT_WINCE___GUI_SRC_OBJECTS_2 = \
|
||||
coredll_tbarwce.o \
|
||||
coredll_textctrlce.o
|
||||
@COND_TOOLKIT_WINCE@__GUI_SRC_OBJECTS_2 = $(COND_TOOLKIT_WINCE___GUI_SRC_OBJECTS_2)
|
||||
@COND_PLATFORM_MACOSX_1@__MAC_OSX_SRC_OBJECTS_2 = \
|
||||
@COND_PLATFORM_MACOSX_1@ coredll_webkit.o coredll_fontdlgosx.o \
|
||||
@COND_PLATFORM_MACOSX_1@ coredll_colordlgosx.o
|
||||
COND_PLATFORM_MACOSX_1___MAC_OSX_SRC_OBJECTS_2 = \
|
||||
coredll_webkit.o \
|
||||
coredll_fontdlgosx.o \
|
||||
coredll_colordlgosx.o \
|
||||
coredll_utilscocoa.o
|
||||
@COND_PLATFORM_MACOSX_1@__MAC_OSX_SRC_OBJECTS_2 = $(COND_PLATFORM_MACOSX_1___MAC_OSX_SRC_OBJECTS_2)
|
||||
@COND_TOOLKIT_COCOA@__LOWLEVEL_SRC_OBJECTS_5 = \
|
||||
@COND_TOOLKIT_COCOA@ coredll_gsockosx.o coredll_hid.o coredll_utilsexc_cf.o
|
||||
COND_TOOLKIT_DFB___LOWLEVEL_SRC_OBJECTS_5 = \
|
||||
@@ -9804,9 +9813,12 @@ COND_TOOLKIT_WINCE___GUI_SRC_OBJECTS_3 = \
|
||||
corelib_tbarwce.o \
|
||||
corelib_textctrlce.o
|
||||
@COND_TOOLKIT_WINCE@__GUI_SRC_OBJECTS_3 = $(COND_TOOLKIT_WINCE___GUI_SRC_OBJECTS_3)
|
||||
@COND_PLATFORM_MACOSX_1@__MAC_OSX_SRC_OBJECTS_3 = \
|
||||
@COND_PLATFORM_MACOSX_1@ corelib_webkit.o corelib_fontdlgosx.o \
|
||||
@COND_PLATFORM_MACOSX_1@ corelib_colordlgosx.o
|
||||
COND_PLATFORM_MACOSX_1___MAC_OSX_SRC_OBJECTS_3 = \
|
||||
corelib_webkit.o \
|
||||
corelib_fontdlgosx.o \
|
||||
corelib_colordlgosx.o \
|
||||
corelib_utilscocoa.o
|
||||
@COND_PLATFORM_MACOSX_1@__MAC_OSX_SRC_OBJECTS_3 = $(COND_PLATFORM_MACOSX_1___MAC_OSX_SRC_OBJECTS_3)
|
||||
@COND_TOOLKIT_COCOA@__LOWLEVEL_SRC_OBJECTS_7 = \
|
||||
@COND_TOOLKIT_COCOA@ corelib_gsockosx.o corelib_hid.o corelib_utilsexc_cf.o
|
||||
COND_TOOLKIT_DFB___LOWLEVEL_SRC_OBJECTS_7 = \
|
||||
@@ -12907,6 +12919,9 @@ monodll_fontdlgosx.o: $(srcdir)/src/mac/carbon/fontdlgosx.mm $(MONODLL_ODEP)
|
||||
monodll_colordlgosx.o: $(srcdir)/src/mac/carbon/colordlgosx.mm $(MONODLL_ODEP)
|
||||
$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/mac/carbon/colordlgosx.mm
|
||||
|
||||
monodll_utilscocoa.o: $(srcdir)/src/mac/carbon/utilscocoa.mm $(MONODLL_ODEP)
|
||||
$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/mac/carbon/utilscocoa.mm
|
||||
|
||||
monodll_NSBox.o: $(srcdir)/src/cocoa/NSBox.mm $(MONODLL_ODEP)
|
||||
$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/cocoa/NSBox.mm
|
||||
|
||||
@@ -17026,6 +17041,9 @@ monolib_fontdlgosx.o: $(srcdir)/src/mac/carbon/fontdlgosx.mm $(MONOLIB_ODEP)
|
||||
monolib_colordlgosx.o: $(srcdir)/src/mac/carbon/colordlgosx.mm $(MONOLIB_ODEP)
|
||||
$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/mac/carbon/colordlgosx.mm
|
||||
|
||||
monolib_utilscocoa.o: $(srcdir)/src/mac/carbon/utilscocoa.mm $(MONOLIB_ODEP)
|
||||
$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/mac/carbon/utilscocoa.mm
|
||||
|
||||
monolib_NSBox.o: $(srcdir)/src/cocoa/NSBox.mm $(MONOLIB_ODEP)
|
||||
$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/cocoa/NSBox.mm
|
||||
|
||||
@@ -22144,6 +22162,9 @@ coredll_fontdlgosx.o: $(srcdir)/src/mac/carbon/fontdlgosx.mm $(COREDLL_ODEP)
|
||||
coredll_colordlgosx.o: $(srcdir)/src/mac/carbon/colordlgosx.mm $(COREDLL_ODEP)
|
||||
$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/mac/carbon/colordlgosx.mm
|
||||
|
||||
coredll_utilscocoa.o: $(srcdir)/src/mac/carbon/utilscocoa.mm $(COREDLL_ODEP)
|
||||
$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/mac/carbon/utilscocoa.mm
|
||||
|
||||
coredll_NSBox.o: $(srcdir)/src/cocoa/NSBox.mm $(COREDLL_ODEP)
|
||||
$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/cocoa/NSBox.mm
|
||||
|
||||
@@ -25099,6 +25120,9 @@ corelib_fontdlgosx.o: $(srcdir)/src/mac/carbon/fontdlgosx.mm $(CORELIB_ODEP)
|
||||
corelib_colordlgosx.o: $(srcdir)/src/mac/carbon/colordlgosx.mm $(CORELIB_ODEP)
|
||||
$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/mac/carbon/colordlgosx.mm
|
||||
|
||||
corelib_utilscocoa.o: $(srcdir)/src/mac/carbon/utilscocoa.mm $(CORELIB_ODEP)
|
||||
$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/mac/carbon/utilscocoa.mm
|
||||
|
||||
corelib_NSBox.o: $(srcdir)/src/cocoa/NSBox.mm $(CORELIB_ODEP)
|
||||
$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/cocoa/NSBox.mm
|
||||
|
||||
|
Reference in New Issue
Block a user